Commit a97c1079 authored by Yann Ylavic's avatar Yann Ylavic
Browse files

Merge r1685339 from trunk. 

Follow up to 2.4.x's r1684515.

Follow up to r1684513: apply missing changes voted on security@.
 
Submitted by: minfrin, ylavic
Reviewed by: ylavic, wrowe, jim
Reported by: regilero <regis.leroy makina-corpus.com>


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

modules/http/http_filters.c

+2 −3
Changes for modules/http/http_filters.c: 2 added lines, 3 removed lines.
Original line number Diff line number Diff line
@@ -452,7 +452,6 @@ apr_status_t ap_http_filter(ap_filter_t *f, apr_bucket_brigade *b, 
                APR_BRIGADE_INSERT_TAIL(bb, e);



                rv = ap_pass_brigade(f->c->output_filters, bb);

                apr_brigade_cleanup(bb);

                if (rv != APR_SUCCESS) {

                    return AP_FILTER_ERROR;

                }
@@ -506,7 +505,7 @@ apr_status_t ap_http_filter(ap_filter_t *f, apr_bucket_brigade *b, 
                    rv = apr_bucket_read(e, &buffer, &len, APR_BLOCK_READ);

                    if (rv != APR_SUCCESS) {

                        ap_log_rerror(APLOG_MARK, APLOG_INFO, rv, f->r, APLOGNO(01590)

                                      "Error reading chunk %s ",

                                      "Error reading/parsing chunk %s ",

                                      (APR_ENOSPC == rv) ? "(overflow)" : "");

                        return rv;

                    }
@@ -632,7 +631,7 @@ apr_status_t ap_http_filter(ap_filter_t *f, apr_bucket_brigade *b, 
        }

        default: {

            /* Should not happen */

            ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, f->r, APLOGNO(02901)

            ap_log_rerror(APLOG_MARK, APLOG_INFO, 0, f->r, APLOGNO(02901)

                          "Unexpected body state (%i)", (int)ctx->state);

            return APR_EGENERAL;

        }