From: Amos Jeffries <squid3@treenet.co.nz>
Date: Sun, 31 Jan 2010 09:47:16 +0000 (+1300)
Subject: Author: Marko <mr_4u2@yahoo.com>
X-Git-Tag: SQUID_3_1_0_16~6
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c36fcc1361f6733d4ccd9f2c917c9fae9a17a98d;p=thirdparty%2Fsquid.git

Author: Marko <mr_4u2@yahoo.com>
Bug 2496: Downloading some variants in full before relaying

AKA, assertion failed: comm.cc:115: "ccb->active == false"
if the client disconnected before download finished arriving.
---

diff --git a/src/http.cc b/src/http.cc
index fc11d6d0c4..559fceb640 100644
--- a/src/http.cc
+++ b/src/http.cc
@@ -835,8 +835,9 @@ HttpStateData::haveParsedReplyHeaders()
 
         if (!vary) {
             entry->makePrivate();
+            if (!fwd->reforwardableStatus(rep->sline.status))
+                EBIT_CLR(entry->flags, ENTRY_FWD_HDR_WAIT);
             goto no_cache;
-
         }
 
         entry->mem_obj->vary_headers = xstrdup(vary);