]> git.ipfire.org Git - thirdparty/squid.git/commitdiff
The HttpStateData::abortAdapting() method should always free up
authorwessels <>
Tue, 10 Jan 2006 03:42:35 +0000 (03:42 +0000)
committerwessels <>
Tue, 10 Jan 2006 03:42:35 +0000 (03:42 +0000)
the HttpStateData, not just when entry is empty.

src/http.cc

index 6e0748c714e88235c2a1eb35628e57f9af060227..47e238d9d4d8ba7f7894a1ae2ffed5ed6d9e60a9 100644 (file)
@@ -1,6 +1,6 @@
 
 /*
- * $Id: http.cc,v 1.480 2006/01/04 18:00:18 wessels Exp $
+ * $Id: http.cc,v 1.481 2006/01/09 20:42:35 wessels Exp $
  *
  * DEBUG: section 11    Hypertext Transfer Protocol (HTTP)
  * AUTHOR: Harvest Derived
@@ -2158,17 +2158,13 @@ HttpStateData::abortAdapting()
         fwd->fail( err);
         fwd->dontRetry(true);
         flags.do_next_read = 0;
-
-        if (fd >= 0) {
-            comm_close(fd);
-        } else {
-            httpStateFree(-1, this);   // deletes this
-        }
-
-        return;
     }
 
-
+    if (fd >= 0) {
+        comm_close(fd);
+    } else {
+        httpStateFree(-1, this);       // deletes this
+    }
 }
 
 #endif