From: Jeff Trawick <trawick@apache.org>
Date: Sat, 27 Aug 2005 13:22:00 +0000 (+0000)
Subject: Backport from trunk:
X-Git-Tag: 2.0.55~71
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1b0a6a7d5e9ef64d1984981627287965820ee7ba;p=thirdparty%2Fapache%2Fhttpd.git

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 331b423682e..45a9b9c3ff5 100644
--- 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 201192d5fea..7b6e55b1f5d 100644
--- 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 849ddfb1eab..09063528bb6 100644
--- 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;