Backed out Bugzilla #164 patch. It is not complete.

diff --git a/src/client_side.cc b/src/client_side.cc
index cb2bc41f249dc161742e06f1dff03df1b087b183..c1d759f0904f77f8cd424541d962843d501cfe29 100644 (file)
--- a/src/client_side.cc
+++ b/src/client_side.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: client_side.cc,v 1.574 2002/04/14 13:58:01 hno Exp $
+ * $Id: client_side.cc,v 1.575 2002/04/14 21:51:36 hno Exp $
  *
  * DEBUG: section 33    Client-side Routines
  * AUTHOR: Duane Wessels
@@ -213,7 +213,7 @@ clientCreateStoreEntry(clientHttpRequest * h, method_t m, request_flags flags)
     e = storeCreateEntry(h->uri, h->log_uri, flags, m);
     h->sc = storeClientListAdd(e, h);
 #if DELAY_POOLS
-    delaySetStoreClient(h->sc, delayClient(h));
+    delaySetStoreClient(h->sc, delayClient(h->request));
 #endif
     h->reqofs = 0;
     h->reqsize = 0;
@@ -402,7 +402,7 @@ clientProcessExpired(void *data)
     http->sc = storeClientListAdd(entry, http);
 #if DELAY_POOLS
     /* delay_id is already set on original store client */
-    delaySetStoreClient(http->sc, delayClient(http));
+    delaySetStoreClient(http->sc, delayClient(http->request));
 #endif
     http->request->lastmod = http->old_entry->lastmod;
     debug(33, 5) ("clientProcessExpired: lastmod %ld\n", (long int) entry->lastmod);
@@ -1966,7 +1966,7 @@ clientProcessRequest(clientHttpRequest * http)
        http->entry->mem_obj->method = r->method;
        http->sc = storeClientListAdd(http->entry, http);
 #if DELAY_POOLS
-       delaySetStoreClient(http->sc, delayClient(http));
+       delaySetStoreClient(http->sc, delayClient(r));
 #endif
        assert(http->log_type == LOG_TCP_HIT);
        http->reqofs = 0;

diff --git a/src/delay_pools.cc b/src/delay_pools.cc
index 059f7f022ce3ea7d128521213e40f44d0d352c18..a3099c221410d562bbe92ec2ed5662a4438b8ae7 100644 (file)
--- a/src/delay_pools.cc
+++ b/src/delay_pools.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: delay_pools.cc,v 1.22 2002/04/14 13:58:01 hno Exp $
+ * $Id: delay_pools.cc,v 1.23 2002/04/14 21:51:36 hno Exp $
  *
  * DEBUG: section 77    Delay Pools
  * AUTHOR: David Luyer <david@luyer.net>
@@ -305,23 +305,19 @@ delayId(unsigned short pool, unsigned short position)
 }
 
 delay_id
-delayClient(clientHttpRequest * http)
+delayClient(request_t * r)
 {
-    request_t *r;
     aclCheck_t ch;
     int i;
     int j;
     unsigned int host;
     unsigned short pool, position;
     unsigned char class, net;
-    assert(http);
-    r = http->request;
 
     memset(&ch, '\0', sizeof(ch));
     ch.src_addr = r->client_addr;
     ch.my_addr = r->my_addr;
     ch.my_port = r->my_port;
-    ch.conn = http->conn;
     ch.request = r;
     if (r->client_addr.s_addr == INADDR_BROADCAST) {
        debug(77, 2) ("delayClient: WARNING: Called with 'allones' address, ignoring\n");

diff --git a/src/protos.h b/src/protos.h
index 0caf3a22f8676d8a90185072140568eb6d0e287a..d82368e3f89c37e0c74d88049b1cf12ba5513dc8 100644 (file)
--- a/src/protos.h
+++ b/src/protos.h
@@ -1,6 +1,6 @@
 
 /*
- * $Id: protos.h,v 1.434 2002/04/14 13:58:01 hno Exp $
+ * $Id: protos.h,v 1.435 2002/04/14 21:51:36 hno Exp $
  *
  *
  * SQUID Web Proxy Cache          http://www.squid-cache.org/
@@ -1234,7 +1234,7 @@ extern void delayPoolsReconfigure(void);
 extern void delaySetNoDelay(int fd);
 extern void delayClearNoDelay(int fd);
 extern int delayIsNoDelay(int fd);
-extern delay_id delayClient(clientHttpRequest *);
+extern delay_id delayClient(request_t *);
 extern EVH delayPoolsUpdate;
 extern int delayBytesWanted(delay_id d, int min, int max);
 extern void delayBytesIn(delay_id, int qty);