---------------------
PatchSet 5935 
Date: 2003/09/14 02:17:36
Author: dwsquid
Branch: icap-2_5
Tag: (none) 
Log:
make icap.c compile again.  With merge from s2_5, MemObject->fd went
away, and so id client FD arg to httpBuildRequestPrefix().

Members: 
	src/icap.c:1.1.16.19->1.1.16.20 

Index: squid/src/icap.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/Attic/icap.c,v
retrieving revision 1.1.16.19
retrieving revision 1.1.16.20
diff -u -r1.1.16.19 -r1.1.16.20
--- squid/src/icap.c	21 Aug 2003 23:45:35 -0000	1.1.16.19
+++ squid/src/icap.c	14 Sep 2003 02:17:36 -0000	1.1.16.20
@@ -1,5 +1,5 @@
 /*
- * $Id: icap.c,v 1.1.16.19 2003/08/21 23:45:35 dwsquid Exp $
+ * $Id: icap.c,v 1.1.16.20 2003/09/14 02:17:36 dwsquid Exp $
  *
  * DEBUG: section 81    Internet Content Adaptation Protocol (ICAP) Client
  * AUTHOR: Geetha Manjunath, Hewlett Packard Company
@@ -402,7 +402,6 @@
     request_t *proxy_req;
     StoreEntry *entry = httpState->entry;
     char *client_addr;
-    int cfd;
     int blen = 0;
     void *b = NULL;
     int icap_fd = icap->icap_fd;
@@ -429,12 +428,6 @@
 		blen = 0;	/* make sure this goes together */
 	}
     }
-    /* cfd = client fd */
-    if (entry->mem_obj)
-	cfd = entry->mem_obj->fd;
-    else
-	cfd = -1;
-    assert(-1 == cfd || FD_SOCKET == fd_table[cfd].type);
 
     memBufDefInit(&mb);
     memBufDefInit(&mb_hdr);
@@ -442,7 +435,7 @@
     proxy_req = requestCreate(req->method, PROTO_NONE, storeUrl(httpState->entry));
     requestLink(proxy_req);
     httpBuildRequestPrefix(proxy_req,
-	req, entry, &mb_hdr, cfd, httpState->flags);
+	req, entry, &mb_hdr, httpState->flags);
     requestUnlink(proxy_req);
 
     service = icap->current_service;
@@ -977,7 +970,7 @@
 	len);
     /* Copy request header */
     memBufDefInit(&mb_hdr);
-    httpBuildRequestPrefix(req, httpState->orig_request, entry, &mb_hdr, -1,
+    httpBuildRequestPrefix(req, httpState->orig_request, entry, &mb_hdr,
 	httpState->flags);
     o2 = mb_hdr.size;