From: Yann Ylavic <ylavic@apache.org>
Date: Sat, 13 Jun 2015 22:24:22 +0000 (+0000)
Subject: Follow up to r1684513: apply missing changes voted on security@.
X-Git-Tag: 2.5.0-alpha~3083
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3515c0c8d1f1e51ac4f221cafebeba6888d3a363;p=apache

Follow up to r1684513: apply missing changes voted on security@.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1685339 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/modules/http/http_filters.c b/modules/http/http_filters.c
index 3ad3dced4c..8a628b9078 100644
--- a/modules/http/http_filters.c
+++ b/modules/http/http_filters.c
@@ -407,7 +407,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;
                 }
@@ -466,7 +465,7 @@ apr_status_t ap_http_filter(ap_filter_t *f, apr_bucket_brigade *b,
                     }
                     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;
                     }
@@ -583,7 +582,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;
         }