---------------------
PatchSet 4238 
Date: 2007/04/12 22:56:31
Author: amosjeffries
Branch: squid3-ipv6
Tag: (none) 
Log:
more old rollback.

Members: 
	src/cache_cf.cc:1.40.2.19->1.40.2.20 
	src/client_side_request.cc:1.33.4.6->1.33.4.7 

Index: squid3/src/cache_cf.cc
===================================================================
RCS file: /cvsroot/squid-sf//squid3/src/cache_cf.cc,v
retrieving revision 1.40.2.19
retrieving revision 1.40.2.20
diff -u -r1.40.2.19 -r1.40.2.20
--- squid3/src/cache_cf.cc	12 Apr 2007 08:53:45 -0000	1.40.2.19
+++ squid3/src/cache_cf.cc	12 Apr 2007 22:56:31 -0000	1.40.2.20
@@ -1,6 +1,6 @@
 
 /*
- * $Id: cache_cf.cc,v 1.40.2.19 2007/04/12 08:53:45 amosjeffries Exp $
+ * $Id: cache_cf.cc,v 1.40.2.20 2007/04/12 22:56:31 amosjeffries Exp $
  *
  * DEBUG: section 3     Configuration File Parsing
  * AUTHOR: Harvest Derived
@@ -2735,7 +2735,7 @@
     s->s.sin_port = htons(port);
 
     if (NULL == host)
-        s->s.sin_addr  = any_addr;
+        s->s.sin_addr = any_addr;
     else if (1 == safe_inet_addr(host, &s->s.sin_addr))
         (void) 0;
     else if ((hp = gethostbyname(host))) {
Index: squid3/src/client_side_request.cc
===================================================================
RCS file: /cvsroot/squid-sf//squid3/src/client_side_request.cc,v
retrieving revision 1.33.4.6
retrieving revision 1.33.4.7
diff -u -r1.33.4.6 -r1.33.4.7
--- squid3/src/client_side_request.cc	6 Apr 2007 22:58:45 -0000	1.33.4.6
+++ squid3/src/client_side_request.cc	12 Apr 2007 22:56:31 -0000	1.33.4.7
@@ -1,6 +1,6 @@
 
 /*
- * $Id: client_side_request.cc,v 1.33.4.6 2007/04/06 22:58:45 amosjeffries Exp $
+ * $Id: client_side_request.cc,v 1.33.4.7 2007/04/12 22:56:31 amosjeffries Exp $
  * 
  * DEBUG: section 85    Client-side Request Routines
  * AUTHOR: Robert Collins (Originally Duane Wessels in client_side.c)
@@ -463,7 +463,7 @@
         assert (repContext);
         repContext->setReplyToError(page_id, status,
                                     http->request->method, NULL,
-                                    http->getConn().getRaw() != NULL ? &ADDR_FROM_SA(http->getConn()->peer) : &no_addr, http->request,
+                                    http->getConn().getRaw() != NULL ? &http->getConn()->peer.sin_addr : &no_addr, http->request,
                                     NULL, http->getConn().getRaw() != NULL
                                     && http->getConn()->auth_user_request ? http->getConn()->
                                     auth_user_request : http->request->auth_user_request);