mem_obj->fd fixes; set it in protoDispatch()

diff --git a/src/asn.cc b/src/asn.cc
index 08a055d89e4b7835e7bc302ac5bd5078cbc46994..11831ec09be17770d98664376063a672269adb06 100644 (file)
--- a/src/asn.cc
+++ b/src/asn.cc
@@ -1,5 +1,5 @@
 /*
- * $Id: asn.cc,v 1.33 1998/05/08 23:29:25 wessels Exp $
+ * $Id: asn.cc,v 1.34 1998/05/09 04:49:08 wessels Exp $
  *
  * DEBUG: section 53    AS Number handling
  * AUTHOR: Duane Wessels, Kostas Anagnostakis
@@ -189,7 +189,7 @@ asnCacheStart(int as)
     if ((e = storeGet(k)) == NULL) {
        e = storeCreateEntry(asres, asres, 0, METHOD_GET);
        storeClientListAdd(e, asState);
-       protoDispatch(0, e, asState->request);
+       protoDispatch(-1, e, asState->request);
     } else {
        storeLockObject(e);
        storeClientListAdd(e, asState);

diff --git a/src/client_side.cc b/src/client_side.cc
index 8e2bf5f270de49e061e28454d69e2cd541f18383..b5aae24305f8bb9e5788880735bf43468a6b7bcf 100644 (file)
--- a/src/client_side.cc
+++ b/src/client_side.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: client_side.cc,v 1.299 1998/05/05 23:04:04 wessels Exp $
+ * $Id: client_side.cc,v 1.300 1998/05/09 04:49:09 wessels Exp $
  *
  * DEBUG: section 33    Client-side Routines
  * AUTHOR: Duane Wessels
@@ -1655,7 +1655,6 @@ clientProcessMiss(clientHttpRequest * http)
     }
     assert(http->out.offset == 0);
     http->entry = clientCreateStoreEntry(http, r->method, r->flags);
-    http->entry->mem_obj->fd = http->conn->fd;
     http->entry->refcount++;
     if (http->flags.internal)
        r->protocol = PROTO_INTERNAL;

diff --git a/src/http.cc b/src/http.cc
index 8918ebcd8acd04bcaf9a81d96b381a1f3af2e19e..334c82a425a8b01c8e25c742971bbb1e0a62c6da 100644 (file)
--- a/src/http.cc
+++ b/src/http.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: http.cc,v 1.268 1998/04/27 20:03:55 wessels Exp $
+ * $Id: http.cc,v 1.269 1998/05/09 04:49:10 wessels Exp $
  *
  * DEBUG: section 11    Hypertext Transfer Protocol (HTTP)
  * AUTHOR: Harvest Derived
@@ -781,6 +781,7 @@ httpSendRequest(int fd, void *data)
        cfd = -1;
     else
        cfd = entry->mem_obj->fd;
+    assert(-1 == cfd || FD_SOCKET == fd_table[cfd].type);
     if (p != NULL)
        EBIT_SET(httpState->flags, HTTP_PROXYING);
     /*

diff --git a/src/peer_digest.cc b/src/peer_digest.cc
index 45005a771439fa57edaf5b4fb19ffc8d7aca1ef9..7c61d8cbf3e34f0260de8763c4c23d2a18621d1e 100644 (file)
--- a/src/peer_digest.cc
+++ b/src/peer_digest.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: peer_digest.cc,v 1.23 1998/05/05 23:08:14 wessels Exp $
+ * $Id: peer_digest.cc,v 1.24 1998/05/09 04:49:11 wessels Exp $
  *
  * DEBUG: section 72    Peer Digest Routines
  * AUTHOR: Alex Rousskov
@@ -287,7 +287,7 @@ peerDigestRequest(peer * p)
     fetch->offset = 0;
     debug(72, 3) ("peerDigestRequest: forwarding to protoDispatch...\n");
     /* push towards peer cache */
-    protoDispatch(0, e, req);
+    protoDispatch(-1, e, req);
     storeClientCopy(e, 0, 0, SM_PAGE_SIZE, memAllocate(MEM_4K_BUF),
        peerDigestFetchReply, fetch);
 }

diff --git a/src/urn.cc b/src/urn.cc
index 091bcec4b7955eefd32e8cb23ded98428675af7f..709ef3609de2030a505374ca3e18fcf4491be75e 100644 (file)
--- a/src/urn.cc
+++ b/src/urn.cc
@@ -1,7 +1,7 @@
 
 /*
  *
- * $Id: urn.cc,v 1.31 1998/05/08 23:29:32 wessels Exp $
+ * $Id: urn.cc,v 1.32 1998/05/09 04:49:12 wessels Exp $
  *
  * DEBUG: section 52    URN Parsing
  * AUTHOR: Kostas Anagnostakis
@@ -139,7 +139,7 @@ urnStart(request_t * r, StoreEntry * e)
     if ((urlres_e = storeGet(k)) == NULL) {
        urlres_e = storeCreateEntry(urlres, urlres, 0, METHOD_GET);
        storeClientListAdd(urlres_e, urnState);
-       protoDispatch(0, urlres_e, urlres_r);
+       protoDispatch(-1, urlres_e, urlres_r);
     } else {
        storeLockObject(urlres_e);
        storeClientListAdd(urlres_e, urnState);