Backport from trunk:

 EBCDIC: Handle chunked input from client or, with proxy, origin
         server.

Reviewed by: wrowe, nd

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

diff --git a/CHANGES b/CHANGES
index 331b423682e6b41b653ae2769648d022a78f0b8d..45a9b9c3ff51e758219b4b2ea343a18e49237dc0 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,9 @@
                                                          -*- coding: utf-8 -*-
 Changes with Apache 2.0.55
 
+  *) EBCDIC: Handle chunked input from client or, with proxy, origin
+     server.  [Jeff Trawick]
+
   *) Fix bad globbing comparison which could result in getting
      a directory listing when a file was requested. PR 34512.
      [sean <infamous41md hotmail.com>]

diff --git a/STATUS b/STATUS
index 201192d5fea2f6e425c939ea8af242d830190fbb..7b6e55b1f5deabacd50aaddf05ca7edf31356c0b 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -276,13 +276,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
         PR: 34452
         +1: jorton
 
-     *) EBCDIC: Handle chunked input from client or, with proxy, origin
-        server.
-        http://svn.apache.org/viewcvs?rev=178262&view=rev
-        (With 2.0.x it is the same code in the same function, but in 
-        a different source file.)
-        +1: trawick, wrowe, nd
-
      *) Support the suppress-error-charset setting, as with Apache 1.3.x.
         PR 31274. (current docs say it works with Apache from 2.0.40 ;) )
         http://svn.apache.org/viewcvs?rev=170354&view=rev

diff --git a/modules/http/http_protocol.c b/modules/http/http_protocol.c
index 849ddfb1eab94214c27600687053ef785e62f2d4..09063528bb6986d4071c1c773d32d85df6c7756c 100644 (file)
--- a/modules/http/http_protocol.c
+++ b/modules/http/http_protocol.c
@@ -1816,6 +1816,8 @@ static long get_chunk_size(char *b)
     long chunksize = 0;
     size_t chunkbits = sizeof(long) * 8;
 
+    ap_xlate_proto_from_ascii(b, strlen(b));
+
     /* Skip leading zeros */
     while (*b == '0') {
         ++b;