---------------------
PatchSet 6752 
Date: 2008/02/09 00:35:10
Author: rousskov
Branch: ssl-bump
Tag: (none) 
Log:
Fixed http_port address printing after merging IPv6 changes from HEAD.

Members: 
	src/cache_cf.cc:1.92.6.8->1.92.6.9 
	src/client_side.cc:1.139.6.11->1.139.6.12 

Index: squid3/src/cache_cf.cc
===================================================================
RCS file: /cvsroot/squid-sf//squid3/src/cache_cf.cc,v
retrieving revision 1.92.6.8
retrieving revision 1.92.6.9
diff -u -r1.92.6.8 -r1.92.6.9
--- squid3/src/cache_cf.cc	27 Jan 2008 20:47:20 -0000	1.92.6.8
+++ squid3/src/cache_cf.cc	9 Feb 2008 00:35:10 -0000	1.92.6.9
@@ -1,6 +1,6 @@
 
 /*
- * $Id: cache_cf.cc,v 1.92.6.8 2008/01/27 20:47:20 rousskov Exp $
+ * $Id: cache_cf.cc,v 1.92.6.9 2008/02/09 00:35:10 rousskov Exp $
  *
  * DEBUG: section 3     Configuration File Parsing
  * AUTHOR: Harvest Derived
@@ -671,9 +671,7 @@
             if (!s->cert && !s->key)
                 continue;
 
-            debugs(3, 1, "Initializing http_port " <<
-                   inet_ntoa(s->http.s.sin_addr) << ":" <<
-                   ntohs(s->http.s.sin_port) << " SSL context");
+            debugs(3, 1, "Initializing http_port " << s->http.s << " SSL context");
 
             s->sslContext = sslCreateServerContext(s->cert, s->key, s->version, s->cipher, s->options, s->sslflags, s->clientca, s->cafile, s->capath, s->crlfile, s->dhfile, s->sslcontext);
         }
Index: squid3/src/client_side.cc
===================================================================
RCS file: /cvsroot/squid-sf//squid3/src/client_side.cc,v
retrieving revision 1.139.6.11
retrieving revision 1.139.6.12
diff -u -r1.139.6.11 -r1.139.6.12
--- squid3/src/client_side.cc	27 Jan 2008 20:47:20 -0000	1.139.6.11
+++ squid3/src/client_side.cc	9 Feb 2008 00:35:11 -0000	1.139.6.12
@@ -1,6 +1,6 @@
 
 /*
- * $Id: client_side.cc,v 1.139.6.11 2008/01/27 20:47:20 rousskov Exp $
+ * $Id: client_side.cc,v 1.139.6.12 2008/02/09 00:35:11 rousskov Exp $
  *
  * DEBUG: section 33    Client-side Routines
  * AUTHOR: Duane Wessels
@@ -3055,9 +3055,7 @@
 #if USE_SSL
         if (s->sslBump && s->sslContext == NULL) {
             debugs(1, 1, "Will not bump SSL at http_port " <<
-                   inet_ntoa(s->http.s.sin_addr) << ':' <<
-                   (int) ntohs(s->http.s.sin_port) <<
-                   " due to SSL initialization failure.");
+                   s->http.s << " due to SSL initialization failure.");
             s->sslBump = 0;
         }
 #endif