Commit 87d84d2f authored by Jim Jagielski's avatar Jim Jagielski
Browse files

Merge r1685345, r1685347, r1685349, r1685350 from trunk: 

Follow up to r1684513: allow spaces before and after chunk-size.
Slightly modified version of trawick's proposal.

Follow up to r1685345: don't accept spaces *before* the chunk-size.

Follow up to r1685345: CHANGES entry.

Follow up to r1685349: remove a tab.
Submitted by: ylavic
Reviewed/backported by: jim


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1686271 13f79535-47bb-0310-9956-ffa450edef68
parent 8e2d0d1f

CHANGES

+3 −0
Changes for CHANGES: 3 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -2,6 +2,9 @@ 


Changes with Apache 2.4.15



  *) core: Allow spaces after chunk-size for compatibility with implementations

     using a pre-filled buffer.  [Yann Ylavic, Jeff Trawick]



  *) mod_ssl: Remove deprecated SSLCertificateChainFile warning.

     [Yann Ylavic]

STATUS

+0 −9
Changes for STATUS: 0 added lines, 9 removed lines.
Original line number Diff line number Diff line
@@ -107,15 +107,6 @@ RELEASE SHOWSTOPPERS: 
PATCHES ACCEPTED TO BACKPORT FROM TRUNK:

  [ start all new proposals below, under PATCHES PROPOSED. ]



  *) core: Allow spaces after chunk-size for compatibility with implementations

     using a pre-filled buffer, and log parsing failures at level INFO.

     trunk patch: http://svn.apache.org/r1685345

                  http://svn.apache.org/r1685347

                  http://svn.apache.org/r1685349

                  http://svn.apache.org/r1685350

     2.4.x patch: http://people.apache.org/~ylavic/httpd-2.4.x-ap_http_filter_chunked-v3.patch

     +1: ylavic, trawick (v3), wrowe (v3)



  *) mod_charset_lite, mod_ext_filter:  Avoid inadvertent filtering of protocol

     data during read of chunked request bodies. PR 58049.

     trunk patch: http://svn.apache.org/r1686085

modules/http/http_filters.c

+12 −2
Changes for modules/http/http_filters.c: 12 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -71,10 +71,11 @@ typedef struct http_filter_ctx 
        BODY_CHUNK, /* chunk expected */

        BODY_CHUNK_PART, /* chunk digits */

        BODY_CHUNK_EXT, /* chunk extension */

        BODY_CHUNK_LF, /* got CR, expect LF after digits/extension */

        BODY_CHUNK_CR, /* got space(s) after digits, expect [CR]LF or ext */

        BODY_CHUNK_LF, /* got CR after digits or ext, expect LF */

        BODY_CHUNK_DATA, /* data constrained by chunked encoding */

        BODY_CHUNK_END, /* chunked data terminating CRLF */

        BODY_CHUNK_END_LF, /* got CR, expect LF after data */

        BODY_CHUNK_END_LF, /* got CR after data, expect LF */

        BODY_CHUNK_TRAILER /* trailers */

    } state;

    unsigned int eos_sent :1;
@@ -204,6 +205,15 @@ static apr_status_t parse_chunk_size(http_ctx_t *ctx, const char *buffer, 
                return APR_EINVAL;

            }

        }

        else if (c == ' ' || c == '\t') {

            ctx->state = BODY_CHUNK_CR;

        }

        else if (ctx->state == BODY_CHUNK_CR) {

            /*

             * ';', CR or LF expected.

             */

            return APR_EINVAL;

        }

        else if (ctx->state == BODY_CHUNK_PART) {

            int xvalue;