Cancel the defer check for persistent connections

diff --git a/src/http.cc b/src/http.cc
index f06a8225861e2a9bf4d470518d55cab9cc4127eb..a4c4d4c4b27bad336983c5352b1d08c431410c8e 100644 (file)
--- a/src/http.cc
+++ b/src/http.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: http.cc,v 1.195 1997/10/23 16:38:11 wessels Exp $
+ * $Id: http.cc,v 1.196 1997/10/23 20:42:18 wessels Exp $
  *
  * DEBUG: section 11    Hypertext Transfer Protocol (HTTP)
  * AUTHOR: Harvest Derived
@@ -249,6 +249,7 @@ httpTimeout(int fd, void *data)
     StoreEntry *entry = httpState->entry;
     ErrorState *err;
     debug(11, 4) ("httpTimeout: FD %d: '%s'\n", fd, entry->url);
+    assert(entry->store_status == STORE_PENDING);
     if (entry->mem_obj->inmem_hi == 0) {
        err = xcalloc(1, sizeof(ErrorState));
        err->type = ERR_READ_TIMEOUT;
@@ -672,9 +673,10 @@ httpReadReply(int fd, void *data)
            httpProcessReplyHeader(httpState, buf, len);
        storeAppend(entry, buf, len);
        if (httpPconnTransferDone(httpState)) {
-           pconnPush(fd, request->host, request->port);
+           commSetDefer(fd, NULL, NULL);
            comm_remove_close_handler(fd, httpStateFree, httpState);
            storeComplete(entry);       /* deallocates mem_obj->request */
+           pconnPush(fd, request->host, request->port);
            httpState->fd = -1;
            httpStateFree(-1, httpState);
        } else {