---------------------
PatchSet 4595 
Date: 2007/05/18 18:02:27
Author: amosjeffries
Branch: squid3-ipv6
Tag: (none) 
Log:
Fix bad conflict resolution after code merged from HEAD

Members: 
	src/client_side.cc:1.68.2.26->1.68.2.27 

Index: squid3/src/client_side.cc
===================================================================
RCS file: /cvsroot/squid-sf//squid3/src/client_side.cc,v
retrieving revision 1.68.2.26
retrieving revision 1.68.2.27
diff -u -r1.68.2.26 -r1.68.2.27
--- squid3/src/client_side.cc	18 May 2007 17:40:59 -0000	1.68.2.26
+++ squid3/src/client_side.cc	18 May 2007 18:02:27 -0000	1.68.2.27
@@ -1,6 +1,6 @@
 
 /*
- * $Id: client_side.cc,v 1.68.2.26 2007/05/18 17:40:59 amosjeffries Exp $
+ * $Id: client_side.cc,v 1.68.2.27 2007/05/18 18:02:27 amosjeffries Exp $
  *
  * DEBUG: section 33    Client-side Routines
  * AUTHOR: Duane Wessels
@@ -2193,7 +2193,6 @@
             http->flags.internal = 1;
         } else if (Config.onoff.global_internal_static && internalStaticCheck(request->urlpath.c_str())) {
             request->SetHost(internalHostname());
-                     SQUIDHOSTNAMELEN);
             request->port = getMyPort();
             http->flags.internal = 1;
         }