You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by yl...@apache.org on 2015/06/14 00:24:23 UTC

svn commit: r1685339 - /httpd/httpd/trunk/modules/http/http_filters.c

Author: ylavic
Date: Sat Jun 13 22:24:22 2015
New Revision: 1685339

URL: http://svn.apache.org/r1685339
Log:
Follow up to r1684513: apply missing changes voted on security@.

Modified:
    httpd/httpd/trunk/modules/http/http_filters.c

Modified: httpd/httpd/trunk/modules/http/http_filters.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/http/http_filters.c?rev=1685339&r1=1685338&r2=1685339&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/http/http_filters.c (original)
+++ httpd/httpd/trunk/modules/http/http_filters.c Sat Jun 13 22:24:22 2015
@@ -407,7 +407,6 @@ apr_status_t ap_http_filter(ap_filter_t
                 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
                     }
                     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
         }
         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;
         }