From: wessels <>
Date: Wed, 13 Jan 1999 12:54:48 +0000 (+0000)
Subject: storeAppend() might abort an entry in httpReadReply()
X-Git-Tag: SQUID_3_0_PRE1~2413
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d96279792b8cba2ef3a8511ff9de9f76b2a1b2ac;p=thirdparty%2Fsquid.git

storeAppend() might abort an entry in httpReadReply()
---

diff --git a/src/http.cc b/src/http.cc
index 8c093bf408..e30920a1e8 100644
--- a/src/http.cc
+++ b/src/http.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: http.cc,v 1.338 1999/01/12 23:37:46 wessels Exp $
+ * $Id: http.cc,v 1.339 1999/01/13 05:54:48 wessels Exp $
  *
  * DEBUG: section 11    Hypertext Transfer Protocol (HTTP)
  * AUTHOR: Harvest Derived
@@ -503,7 +503,6 @@ httpReadReply(int fd, void *data)
 	    }
 	}
 	storeAppend(entry, buf, len);
-#ifdef OPTIMISTIC_IO
 	if (EBIT_TEST(entry->flags, ENTRY_ABORTED)) {
 	    /*
 	     * the above storeAppend() call could ABORT this entry,
@@ -511,9 +510,7 @@ httpReadReply(int fd, void *data)
 	     * there's nothing for us to do.
 	     */
 	    (void) 0;
-	} else
-#endif
-	if (httpPconnTransferDone(httpState)) {
+	} else if (httpPconnTransferDone(httpState)) {
 	    /* yes we have to clear all these! */
 	    commSetDefer(fd, NULL, NULL);
 	    commSetTimeout(fd, -1, NULL, NULL);