--- modules/http/http_filters.c.v4	2015-05-31 21:33:11.171969433 +0200
+++ modules/http/http_filters.c.v5	2015-05-31 21:32:27.399135390 +0200
@@ -452,7 +452,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;
                 }
@@ -503,21 +502,26 @@ apr_status_t ap_http_filter(ap_filter_t
                 apr_size_t len;
 
                 if (!APR_BUCKET_IS_METADATA(e)) {
+                    int parsing = 0;
+
                     rv = apr_bucket_read(e, &buffer, &len, APR_BLOCK_READ);
+
+                    if (rv == APR_SUCCESS) {
+                        parsing = 1;
+                        rv = parse_chunk_size(ctx, buffer, len,
+                                f->r->server->limit_req_fieldsize);
+                    }
                     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;
-                    }
-
-                    rv = parse_chunk_size(ctx, buffer, len,
-                                          f->r->server->limit_req_fieldsize);
-                    if (rv != APR_SUCCESS) {
-                        if (rv != APR_ENOSPC) {
-                            http_error = HTTP_BAD_REQUEST;
+                        if (parsing) {
+                            if (rv != APR_ENOSPC) {
+                                http_error = HTTP_BAD_REQUEST;
+                            }
+                            return bail_out_on_error(ctx, f, http_error);
                         }
-                        return bail_out_on_error(ctx, f, http_error);
+                        return rv;
                     }
                 }
 
@@ -632,7 +636,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;
         }