From: Christos Tsantilas <chtsanti@users.sourceforge.net>
Date: Sat, 9 May 2015 11:40:55 +0000 (-0700)
Subject: Fix assertion errorpage.cc:600: "entry->isEmpty()"
X-Git-Tag: SQUID_3_5_5~20
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f2e1ea85a32caec2d7eb043436d2d9552f92faed;p=thirdparty%2Fsquid.git

Fix assertion errorpage.cc:600: "entry->isEmpty()"

While squid shuting down, aborted transactions, for which body data already
downloaded, can cause this bug.

This is a Measurement Factory project
---

diff --git a/src/FwdState.cc b/src/FwdState.cc
index e25f3d449e..7fea9e259c 100644
--- a/src/FwdState.cc
+++ b/src/FwdState.cc
@@ -625,7 +625,7 @@ FwdState::retryOrBail()
 
     request->hier.stopPeerClock(false);
 
-    if (self != NULL && !err && shutting_down) {
+    if (self != NULL && !err && shutting_down && entry->isEmpty()) {
         ErrorState *anErr = new ErrorState(ERR_SHUTTING_DOWN, Http::scServiceUnavailable, request);
         errorAppendEntry(entry, anErr);
     }