From: wessels <>
Date: Wed, 18 Jun 1997 10:04:13 +0000 (+0000)
Subject: associate storeRegisterAbort calls with comm_add_close_handler calls
X-Git-Tag: SQUID_3_0_PRE1~4928
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5fbef0c91b6e6f32c4c2944ee2bde6ed0165493c;p=thirdparty%2Fsquid.git

associate storeRegisterAbort calls with comm_add_close_handler calls
---

diff --git a/src/ftp.cc b/src/ftp.cc
index e64277ab8b..532acb3482 100644
--- a/src/ftp.cc
+++ b/src/ftp.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: ftp.cc,v 1.123 1997/06/18 01:43:42 wessels Exp $
+ * $Id: ftp.cc,v 1.124 1997/06/18 04:04:13 wessels Exp $
  *
  * DEBUG: section 9     File Transfer Protocol (FTP)
  * AUTHOR: Harvest Derived
@@ -858,6 +858,7 @@ ftpStart(request_t * request, StoreEntry * entry)
     }
     ftpState->ctrl.fd = fd;
     comm_add_close_handler(fd, ftpStateFree, ftpState);
+    storeRegisterAbort(entry, ftpAbort, ftpState);
     commSetTimeout(fd, Config.Timeout.connect, ftpTimeout, ftpState);
     commConnectStart(ftpState->ctrl.fd,
 	request->host,
@@ -884,7 +885,6 @@ ftpConnectDone(int fd, int status, void *data)
     ftpState->data.buf = xmalloc(SQUID_TCP_SO_RCVBUF);
     ftpState->data.size = SQUID_TCP_SO_RCVBUF;
     ftpState->data.freefunc = xfree;
-    storeRegisterAbort(ftpState->entry, ftpAbort, ftpState);
     commSetSelect(fd, COMM_SELECT_READ, ftpReadControlReply, ftpState, 0);
 }
 
diff --git a/src/http.cc b/src/http.cc
index 684550b0fb..8a7f2e344d 100644
--- a/src/http.cc
+++ b/src/http.cc
@@ -1,5 +1,5 @@
 /*
- * $Id: http.cc,v 1.172 1997/06/18 01:43:44 wessels Exp $
+ * $Id: http.cc,v 1.173 1997/06/18 04:04:14 wessels Exp $
  *
  * DEBUG: section 11    Hypertext Transfer Protocol (HTTP)
  * AUTHOR: Harvest Derived
@@ -898,7 +898,6 @@ httpConnectDone(int fd, int status, void *data)
 	if (opt_no_ipcache)
 	    ipcacheInvalidate(request->host);
 	fd_note(fd, entry->url);
-	storeRegisterAbort(entry, httpAbort, httpState);
 	commSetSelect(fd, COMM_SELECT_WRITE, httpSendRequest, httpState, 0);
     }
 }
@@ -931,6 +930,7 @@ httpStart(request_t * request, StoreEntry * entry)
     comm_add_close_handler(httpState->fd,
 	httpStateFree,
 	httpState);
+    storeRegisterAbort(entry, httpAbort, httpState);
     commSetTimeout(fd, Config.Timeout.connect, httpTimeout, httpState);
     commConnectStart(httpState->fd,
 	request->host,