From: wessels <>
Date: Sun, 28 Jun 1998 09:24:34 +0000 (+0000)
Subject: handle STORE_ABORTED case
X-Git-Tag: SQUID_3_0_PRE1~3131
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0597ba3985ab5d6115da5f2efd45c47b55b23c8a;p=thirdparty%2Fsquid.git

handle STORE_ABORTED case
---

diff --git a/src/forward.cc b/src/forward.cc
index 17decafba2..6f17e4f72a 100644
--- a/src/forward.cc
+++ b/src/forward.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: forward.cc,v 1.10 1998/06/26 21:54:48 wessels Exp $
+ * $Id: forward.cc,v 1.11 1998/06/28 03:24:34 wessels Exp $
  *
  * DEBUG: section 17    Request Forwarding
  * AUTHOR: Duane Wessels
@@ -53,7 +53,9 @@ fwdStateFree(FwdState * fwdState)
     static int loop_detect = 0;
     assert(loop_detect++ == 0);
     assert(e->mem_obj);
-    if (e->mem_obj->inmem_hi == 0) {
+    if (e->store_status == STORE_ABORTED) {
+	;
+    } else if (e->mem_obj->inmem_hi == 0) {
 	assert(fwdState->fail.err_code);
 	err = errorCon(fwdState->fail.err_code, fwdState->fail.http_code);
 	err->request = requestLink(fwdState->request);
@@ -396,6 +398,7 @@ fwdAbort(void *data)
 void
 fwdUnregister(int fd, FwdState *fwdState)
 {
+	debug(17,1)("fwdUnregister: %s\n", storeUrl(fwdState->entry));
 	assert(fd = fwdState->server_fd);
 	comm_remove_close_handler(fd, fwdServerClosed, fwdState);
 	fwdState->server_fd = -1;