Commit 1ddf815e authored by William A. Rowe Jr's avatar William A. Rowe Jr
Browse files

ap_rgetline_core() now pulls from r->proto_input_filters 

for better input filtering behavior during chunked trailer
processing by ap_http_filter().
Backports: r1446421
Submitted by: joes



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x-merge-http-strict@1768093 13f79535-47bb-0310-9956-ffa450edef68
parent bd6a3d15

CHANGES

+2 −0
Original line number Diff line number Diff line
@@ -2,6 +2,8 @@ 


Changes with Apache 2.4.24



  *) core: ap_rgetline_core now pulls from r->proto_input_filters.



  *) core, http: Extend HttpProtocol with an option to enforce stricter HTTP

     conformance or to only log the found problems. [Stefan Fritsch]

server/protocol.c

+6 −2
Original line number Diff line number Diff line
@@ -192,6 +192,10 @@ AP_DECLARE(apr_time_t) ap_rationalize_mtime(request_rec *r, apr_time_t mtime) 
 * caused by MIME folding (or broken clients) if fold != 0, and place it

 * in the buffer s, of size n bytes, without the ending newline.

 * 

 * Pulls from r->proto_input_filters instead of r->input_filters for

 * stricter protocol adherence and better input filter behavior during

 * chunked trailer processing (for http).

 *

 * If s is NULL, ap_rgetline_core will allocate necessary memory from r->pool.

 *

 * Returns APR_SUCCESS if there are no problems and sets *read to be
@@ -229,7 +233,7 @@ AP_DECLARE(apr_status_t) ap_rgetline_core(char **s, apr_size_t n, 


    for (;;) {

        apr_brigade_cleanup(bb);

        rv = ap_get_brigade(r->input_filters, bb, AP_MODE_GETLINE,

        rv = ap_get_brigade(r->proto_input_filters, bb, AP_MODE_GETLINE,

                            APR_BLOCK_READ, 0);

        if (rv != APR_SUCCESS) {

            return rv;
@@ -343,7 +347,7 @@ AP_DECLARE(apr_status_t) ap_rgetline_core(char **s, apr_size_t n, 
            apr_brigade_cleanup(bb);



            /* We only care about the first byte. */

            rv = ap_get_brigade(r->input_filters, bb, AP_MODE_SPECULATIVE,

            rv = ap_get_brigade(r->proto_input_filters, bb, AP_MODE_SPECULATIVE,

                                APR_BLOCK_READ, 1);

            if (rv != APR_SUCCESS) {

                return rv;