From: Amos Jeffries <squid3@treenet.co.nz>
Date: Mon, 20 Dec 2010 11:41:54 +0000 (-0700)
Subject: Bug 3113: additional: handleRequestBodyData must return false on closure.
X-Git-Tag: SQUID_3_1_10~15
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a92ed30cc50efb33ec4573b533091a4f0fbbb2ef;p=thirdparty%2Fsquid.git

Bug 3113: additional: handleRequestBodyData must return false on closure.
---

diff --git a/src/client_side.cc b/src/client_side.cc
index 9546aed09e..a086faf3dc 100644
--- a/src/client_side.cc
+++ b/src/client_side.cc
@@ -2788,7 +2788,7 @@ ConnStateData::handleReadData(char *buf, size_t size)
  * called when new request body data has been buffered in in.buf
  * may close the connection if we were closing and piped everything out
  */
-void
+bool
 ConnStateData::handleRequestBodyData()
 {
     assert(bodyPipe != NULL);
@@ -2874,8 +2874,10 @@ ConnStateData::handleRequestBodyData()
              * because mayNeedMoreData is true if request size is not known.
              */
             comm_close(fd);
+            return false;
         }
     }
+    return true;
 }
 
 void
diff --git a/src/client_side.h b/src/client_side.h
index 97ce655a4d..6fa187b11a 100644
--- a/src/client_side.h
+++ b/src/client_side.h
@@ -222,7 +222,7 @@ public:
     virtual void noteBodyConsumerAborted(BodyPipe::Pointer);
 
     void handleReadData(char *buf, size_t size);
-    void handleRequestBodyData();
+    bool handleRequestBodyData();
 
     /**
      * Correlate the current ConnStateData object with the pinning_fd socket descriptor.