Commit 2320a151 authored by Jeff Trawick's avatar Jeff Trawick
Browse files

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
parent 85815a96
Loading
Loading
Loading
Loading
+3 −0
Changes for CHANGES: 3 added lines, 0 removed lines.
Original line number Diff line number Diff line
                                                         -*- 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>]
+0 −7
Changes for STATUS: 0 added lines, 7 removed lines.
Original line number Diff line number Diff line
@@ -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
+2 −0
Changes for modules/http/http_protocol.c: 2 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -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;