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 0d0582185b458152e12b747239b8c1380d5203e2..a8b31ce5bdc34d99d355e4a983363a364e425c6f 100644 (file)
--- 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();
     }
 }