---------------------
PatchSet 1273 
Date: 2001/01/10 23:29:16
Author: adri
Branch: modio
Tag: (none) 
Log:


Bring back httpMemFree, lost in the merge.

Members: 
	src/client_side.c:1.2.2.14->1.2.2.15 

Index: squid/src/client_side.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/client_side.c,v
retrieving revision 1.2.2.14
retrieving revision 1.2.2.15
diff -u -r1.2.2.14 -r1.2.2.15
--- squid/src/client_side.c	10 Jan 2001 22:49:55 -0000	1.2.2.14
+++ squid/src/client_side.c	10 Jan 2001 23:29:16 -0000	1.2.2.15
@@ -1,6 +1,6 @@
 
 /*
- * $Id: client_side.c,v 1.2.2.14 2001/01/10 22:49:55 adri Exp $
+ * $Id: client_side.c,v 1.2.2.15 2001/01/10 23:29:16 adri Exp $
  *
  * DEBUG: section 33    Client-side Routines
  * AUTHOR: Duane Wessels
@@ -116,19 +116,18 @@
 static log_type clientProcessRequest2(clientHttpRequest * http, StoreEntry *e);
 static int clientReplyBodyTooLarge(int clen);
 static int clientRequestBodyTooLarge(int clen);
-static void httpMemFree(void *, int);
+static void httpMemFree(void *);
 static STGETDONE clientPurgeRequest;
 static STGETDONE clientLookupDone;
 static STGETDONE clientLookupHeadDone;
 static void clientProcessRequestDone(clientHttpRequest *http);
 static void clientProcessBody(ConnStateData * conn);
 
-static void httpMemFree(void *data, int notused)
+static void httpMemFree(void *data)
 {
     clientHttpRequest *h = data;
 
     memFree(h->buf, MEM_CLIENT_SOCK_BUF);
-    memFree(h, MEM_CLIENTHTTPREQUEST);
 }
 
 
@@ -2318,7 +2317,7 @@
 parseHttpRequestAbort(ConnStateData * conn, const char *uri)
 {
     clientHttpRequest *http;
-    http = CBDATA_ALLOC(clientHttpRequest, NULL);
+    http = CBDATA_ALLOC(clientHttpRequest, httpMemFree);
     http->conn = conn;
     http->start = current_time;
     http->req_sz = conn->in.offset;
@@ -2458,7 +2457,7 @@
     assert(prefix_sz <= conn->in.offset);
 
     /* Ok, all headers are received */
-    http = CBDATA_ALLOC(clientHttpRequest, NULL);
+    http = CBDATA_ALLOC(clientHttpRequest, httpMemFree);
     http->http_ver = http_ver;
     http->conn = conn;
     http->start = current_time;