From: Christos Tsantilas <chtsanti@users.sourceforge.net>
Date: Tue, 5 May 2015 15:59:56 +0000 (+0300)
Subject: Squid Assertion errorpage.cc:600: "entry->isEmpty()"
X-Git-Tag: merge-candidate-3-v1~136
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8f01bdfbdb186f48df763b9b9876b6dbd0cf4692;p=thirdparty%2Fsquid.git

Squid 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 95c64fbfb8..78ce0c80ac 100644
--- a/src/FwdState.cc
+++ b/src/FwdState.cc
@@ -627,7 +627,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);
     }