From: wessels <>
Date: Fri, 12 May 2006 03:28:29 +0000 (+0000)
Subject: bug: clientAbortBody should not try to close the connection
X-Git-Tag: SQUID_3_0_PRE4~145
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=80f74203b704f736bf9feb6d48237fc72def9373;p=thirdparty%2Fsquid.git

bug: clientAbortBody should not try to close the connection
if it is already being closed.
---

diff --git a/src/client_side.cc b/src/client_side.cc
index c0de6c4f57..56666c1097 100644
--- a/src/client_side.cc
+++ b/src/client_side.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: client_side.cc,v 1.724 2006/05/10 20:34:18 hno Exp $
+ * $Id: client_side.cc,v 1.725 2006/05/11 21:28:29 wessels Exp $
  *
  * DEBUG: section 33    Client-side Routines
  * AUTHOR: Duane Wessels
@@ -2613,8 +2613,12 @@ clientAbortBody(void *data, size_t remaining)
         connNoteUseOfBuffer(conn, to_discard);
     }
 
-    if (conn->closing())
-        comm_close(conn->fd);
+    /*
+     * This assertion exists to make sure that there is never a
+     * case where this function should be responsible for closing
+     * the file descriptor.
+     */
+    assert(!conn->isOpen());
 }
 
 /* general lifetime handler for HTTP requests */