From: serassio <>
Date: Sun, 12 Jun 2005 20:30:50 +0000 (+0000)
Subject: Bug #1312: assertion failed: client_side.cc:2663: "request == conn->body.request"
X-Git-Tag: SQUID_3_0_PRE4~723
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e323c737fbb89c12ffa40d1bacfff648d0774109;p=thirdparty%2Fsquid.git

Bug #1312: assertion failed: client_side.cc:2663: "request == conn->body.request"

The problem was originated during the forward port of patch for bug #890.
There is an obvious logical error, this patch should fix it.
---

diff --git a/src/client_side.cc b/src/client_side.cc
index 50d829427e..3c4de360ec 100644
--- a/src/client_side.cc
+++ b/src/client_side.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: client_side.cc,v 1.686 2005/06/09 16:04:30 serassio Exp $
+ * $Id: client_side.cc,v 1.687 2005/06/12 14:30:50 serassio Exp $
  *
  * DEBUG: section 33    Client-side Routines
  * AUTHOR: Duane Wessels
@@ -2646,10 +2646,10 @@ clientAbortBody(HttpRequest * request)
     char *buf;
     CBCB *callback;
 
-    if (conn.getRaw() == NULL || conn->body.size_left <= 0)
+    if (conn.getRaw() == NULL || conn->body.size_left <= 0 || conn->body.request != request)
         return 0;		/* No body to abort */
 
-    if (conn->body.callback != NULL || conn->body.request != request) {
+    if (conn->body.callback != NULL) {
         buf = conn->body.buf;
         callback = conn->body.callback;
         assert(request == conn->body.request);