From: adrian <>
Date: Wed, 13 Sep 2006 21:54:21 +0000 (+0000)
Subject: Fix a bug which resulted in objects being released after forwarding was complete.
X-Git-Tag: SQUID_3_0_PRE5~93
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=792725ad30547016e998425973af1edb9132ede8;p=thirdparty%2Fsquid.git

Fix a bug which resulted in objects being released after forwarding was complete.

This may have been my fault; but the forward code is all a bit weird at
the present time. Bring the forward logic back into line with squid-2.6.
This does need to be verified to be sure its doing the right thing.
It is, at least, resulting in cachable objects once again and hasn't
broken the FTP error page generation.
---

diff --git a/src/forward.cc b/src/forward.cc
index 0d0582185b..a8b31ce5bd 100644
--- a/src/forward.cc
+++ b/src/forward.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: forward.cc,v 1.150 2006/09/02 10:03:20 adrian Exp $
+ * $Id: forward.cc,v 1.151 2006/09/13 15:54:21 adrian Exp $
  *
  * DEBUG: section 17    Request Forwarding
  * AUTHOR: Duane Wessels
@@ -327,7 +327,9 @@ FwdState::complete()
         debug(17, 3) ("fwdComplete: not re-forwarding status %d\n",
                       entry->getReply()->sline.status);
         EBIT_CLR(entry->flags, ENTRY_FWD_HDR_WAIT);
-	completed();
+	entry->complete();
+	if (server_fd < 0)
+		completed();
     }
 }