---------------------
PatchSet 8148 
Date: 2006/06/04 13:42:53
Author: chtsanti
Branch: icap-2_6
Tag: (none) 
Log:
copy some fields to the new request_t structure from the old one

Members: 
	src/icap_reqmod.c:1.1.14.4->1.1.14.5 

Index: squid/src/icap_reqmod.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/Attic/icap_reqmod.c,v
retrieving revision 1.1.14.4
retrieving revision 1.1.14.5
diff -u -r1.1.14.4 -r1.1.14.5
--- squid/src/icap_reqmod.c	26 May 2006 19:24:02 -0000	1.1.14.4
+++ squid/src/icap_reqmod.c	4 Jun 2006 13:42:53 -0000	1.1.14.5
@@ -1,6 +1,6 @@
 
 /*
- * $Id: icap_reqmod.c,v 1.1.14.4 2006/05/26 19:24:02 chtsanti Exp $
+ * $Id: icap_reqmod.c,v 1.1.14.5 2006/06/04 13:42:53 chtsanti Exp $
  *
  * DEBUG: section 81    Internet Content Adaptation Protocol (ICAP) Client
  * AUTHOR: Geetha Manjunath, Hewlett Packard Company
@@ -109,8 +109,8 @@
     http->request = requestLink(request ? request : icap->request);
     http->flags.did_icap_reqmod = 1;
     http->start = icap->reqmod.start;
-    if(request)
-	 http->http_ver=request->http_ver;
+    if (request)
+	http->http_ver = request->http_ver;
 #if ICAP_PROXY_KEEP_ALIVE
     /*
      * Here it is possible becouse we are using as client_cookie the original http->conn
@@ -333,14 +333,23 @@
 	("icapReqModParseHttpRequest: successfully parsed the HTTP request\n");
     request->http_ver = http_ver;
     request->client_addr = icap->request->client_addr;
+    request->client_port = icap->request->client_port;
     request->my_addr = icap->request->my_addr;
     request->my_port = icap->request->my_port;
     request->class = icap->request->class;
-    if (icap->request->auth_user_request != NULL) {
+    if (icap->request->auth_user_request) {
 	/* Copy authentification info in new request */
 	request->auth_user_request = icap->request->auth_user_request;
 	authenticateAuthUserRequestLock(request->auth_user_request);
     }
+    request->content_length = httpHeaderGetSize(&request->header,
+	HDR_CONTENT_LENGTH);
+    if (strBuf(icap->request->extacl_log))
+	request->extacl_log = stringDup(&icap->request->extacl_log);
+    if (icap->request->extacl_user)
+	request->extacl_user = xstrdup(icap->request->extacl_user);
+    if (icap->request->extacl_passwd)
+	request->extacl_passwd = xstrdup(icap->request->extacl_passwd);
 #if ICAP_PROXY_KEEP_ALIVE
     /*
      * Copy the proxy_keepalive flag from the original request