---------------------
PatchSet 1910 
Date: 2005/09/30 22:57:21
Author: dwsquid
Branch: squid3-icap
Tag: (none) 
Log:
Move clientInterpretRequestHeaders call to doCallouts().  Call it when
we're done and just about to hand off control to processRequest()

Members: 
	src/client_side_request.cc:1.34.4.8->1.34.4.9 

Index: squid3/src/client_side_request.cc
===================================================================
RCS file: /cvsroot/squid-sf//squid3/src/client_side_request.cc,v
retrieving revision 1.34.4.8
retrieving revision 1.34.4.9
diff -u -r1.34.4.8 -r1.34.4.9
--- squid3/src/client_side_request.cc	29 Sep 2005 18:00:44 -0000	1.34.4.8
+++ squid3/src/client_side_request.cc	30 Sep 2005 22:57:21 -0000	1.34.4.9
@@ -1,6 +1,6 @@
 
 /*
- * $Id: client_side_request.cc,v 1.34.4.8 2005/09/29 18:00:44 dwsquid Exp $
+ * $Id: client_side_request.cc,v 1.34.4.9 2005/09/30 22:57:21 dwsquid Exp $
  * 
  * DEBUG: section 85    Client-side Request Routines
  * AUTHOR: Robert Collins (Originally Duane Wessels in client_side.c)
@@ -812,11 +812,6 @@
         http->request = requestLink(new_request);
     }
 
-    clientInterpretRequestHeaders(http);
-#if HEADERS_LOG
-
-    headersLog(0, 1, request->method, request);
-#endif
     /* FIXME PIPELINE: This is innacurate during pipelining */
 
     if (http->getConn().getRaw() != NULL)
@@ -1020,6 +1015,12 @@
     cbdataReferenceDone(calloutContext->http);
     delete calloutContext;
     calloutContext = NULL;
+    clientInterpretRequestHeaders(this);
+#if HEADERS_LOG
+
+    headersLog(0, 1, request->method, request);
+#endif
+
     processRequest();
 }
 
@@ -1077,12 +1078,6 @@
     setLogUri(this, urlCanonicalClean(request));
     assert(request->method);
 
-    clientInterpretRequestHeaders(this);
-#if HEADERS_LOG
-
-    headersLog(0, 1, request->method, request);
-#endif
-
     doCallouts();
 
     debug(85,3)("ClientHttpRequest::takeAdaptedHeaders() finished\n");