From: Amos Jeffries <squid3@treenet.co.nz>
Date: Fri, 23 Jan 2009 02:39:22 +0000 (+1300)
Subject: Regression Fix: rollback bug 2395 fix.
X-Git-Tag: SQUID_3_1_0_4~3
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e72d6b2f697c7685ae5297b3c377d99da8819850;p=thirdparty%2Fsquid.git

Regression Fix: rollback bug 2395 fix.

Fixing bug 2395 uncovered a much more serious bug 2558.
It was not found earlier due to bug 2558 being a slow incremental affect
hidden by already-cached objects.

This rollback is intended as a temporary measure until a good fix can be
found for both bugs.
---

diff --git a/src/forward.cc b/src/forward.cc
index 87efed8b29..7d20e19bdd 100644
--- a/src/forward.cc
+++ b/src/forward.cc
@@ -332,10 +332,8 @@ FwdState::complete()
         startComplete(servers);
     } else {
         debugs(17, 3, "fwdComplete: server FD " << server_fd << " not re-forwarding status " << entry->getReply()->sline.status);
-        if (entry->isEmpty() && !err) {
-            EBIT_CLR(entry->flags, ENTRY_FWD_HDR_WAIT);
-            entry->complete();
-        }
+        EBIT_CLR(entry->flags, ENTRY_FWD_HDR_WAIT);
+        entry->complete();
 
         if (server_fd < 0)
             completed();