From: wessels <>
Date: Thu, 12 Sep 1996 06:31:22 +0000 (+0000)
Subject: - Fixed coredump-causing bugs in icpHandleIMSReply().
X-Git-Tag: SQUID_3_0_PRE1~5833
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=657266fee44de8d2e92149cab3fa749854c35180;p=thirdparty%2Fsquid.git

- Fixed coredump-causing bugs in icpHandleIMSReply().
---

diff --git a/src/client_side.cc b/src/client_side.cc
index eedc371322..91848d9452 100644
--- a/src/client_side.cc
+++ b/src/client_side.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: client_side.cc,v 1.19 1996/09/11 22:41:11 wessels Exp $
+ * $Id: client_side.cc,v 1.20 1996/09/12 00:31:22 wessels Exp $
  *
  * DEBUG: section 33    Client-side Routines
  * AUTHOR: Duane Wessels
@@ -435,22 +435,16 @@ int icpHandleIMSReply(fd, entry, data)
 	    fatal_dump("icpHandleIMSReply: failed to load headers, lost race");
 	httpParseHeaders(hbuf, entry->mem_obj->reply);
 	ttlSet(entry);
-	if (unlink_request)
+	if (unlink_request) {
 	    requestUnlink(entry->mem_obj->request);
+	    entry->mem_obj->request = NULL;
+	}
     } else {
 	/* the client can handle this reply, whatever it is */
 	icpState->log_type = LOG_TCP_EXPIRED_MISS;
 	storeUnlockObject(icpState->old_entry);
     }
-    /* done with old_entry */
-    icpState->old_entry = NULL;
-    /* switch the handler for incoming data */
-    if (entry->store_status != STORE_OK)
-	storeRegister(icpState->entry,
-	    fd,
-	    (PIF) icpHandleStore,
-	    (void *) icpState);
-    /* give it to the client */
-    icpSendMoreData(fd, icpState);
+    icpState->old_entry = NULL;		/* done with old_entry */
+    icpSendMoreData(fd, icpState);	/* give data to the client */
     return 1;
 }