get_client_block() returns wrong length if policy is REQUEST_CHUNKED_DECHUNK

PR:	815
Submitted by:	Kenichi Hori <ken@d2.bs1.fc.nec.co.jp>
Reviewed by:	Dean Gaudet, Ralf S. Engelschall, Jim Jagielski

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/1.3@78817 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/APACHE_1_2_X/src/CHANGES b/APACHE_1_2_X/src/CHANGES
index 2118a568ec8b5f911af3498c26c553d66d3de972..101337fb61a34b1e66fc6474d0069e44fd684975 100644 (file)
--- a/APACHE_1_2_X/src/CHANGES
+++ b/APACHE_1_2_X/src/CHANGES
@@ -1,5 +1,9 @@
 Changes with Apache 1.2.2
 
+  *) get_client_block() returns wrong length if policy is 
+     REQUEST_CHUNKED_DECHUNK.
+     [Kenichi Hori <ken@d2.bs1.fc.nec.co.jp>] PR#815
+
   *) Properly treat <files> container like other containers in mod_info.
      [Marc Slemko] PR#848
 

diff --git a/APACHE_1_2_X/src/main/http_protocol.c b/APACHE_1_2_X/src/main/http_protocol.c
index 822ad68c6ccdf29108cd2facbf8ef2a46221c9e8..a797c703a6ee502be9b77a7b2ccd31def838b14f 100644 (file)
--- a/APACHE_1_2_X/src/main/http_protocol.c
+++ b/APACHE_1_2_X/src/main/http_protocol.c
@@ -1444,7 +1444,11 @@ long get_client_block (request_rec *r, char *buffer, int bufsiz)
             buffer[chunk_start++] = LF;
             buffer += chunk_start;       /* and pass line on to caller   */
             bufsiz -= chunk_start;
-        }
+        } else {
+           /* REQUEST_CHUNKED_DECHUNK -- do not include the length of
+            * the header in the return value */
+           chunk_start = 0;
+       }
     }
                                      /* When REQUEST_CHUNKED_PASS, we are */
     if (r->remaining == -1) {        /* reading footers until empty line  */