Merge r644391 from trunk:

close PR 44381

Reviewed by: jim

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@649116 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/CHANGES b/CHANGES
index b14e7d71dc5f8cdc6b3f511defd682922f44b25e..2963c47bb570c510a3ec79c6626d2c0834058acd 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,9 @@
                                                          -*- coding: utf-8 -*-
 Changes with Apache 2.2.9
 
+  *) http_filters: Don't spin if get an error when reading the
+     next chunk. PR 44381 [Ruediger Pluem]
+
   *) ab: Do not try to read non existing response bodies of HEAD requests.
      PR 34275 [Takashi Sato <serai lans-tv.com>]
 

diff --git a/STATUS b/STATUS
index 06080e12e6cff030171728b4bad4f1c7f0239fee..2d4affcf8d2acfe7dcba08be25f9d99687af847a 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -88,15 +88,6 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
-  * http_filter: Don't spin if we get an error when reading
-    (the next) chunk.
-    PR: 44381
-   Trunk version of patch: 
-       http://svn.apache.org/viewvc?view=rev&revision=644391
-   Backport version for 2.2.x of patch:
-       Trunk version of patch works
-   +1: jim, rpluem, covener
-
  * mod_substitute: Make default behavior flattening of buckets. Allow
    for people to specifically set "quick" mode.
       Trunk version of patch:

diff --git a/modules/http/http_filters.c b/modules/http/http_filters.c
index 83e2f784261ac0d0755db7a284ddcdfc938514b4..83e8fb34328f5ec0ac36dc4696540e9652c1570d 100644 (file)
--- a/modules/http/http_filters.c
+++ b/modules/http/http_filters.c
@@ -425,6 +425,10 @@ apr_status_t ap_http_filter(ap_filter_t *f, apr_bucket_brigade *b,
                           (APR_STATUS_IS_EAGAIN(rv)) )) {
                         return APR_EAGAIN;
                     }
+                    /* If we get an error, then leave */
+                    if (rv != APR_SUCCESS) {
+                        return rv;
+                    }
                     /*
                      * We really don't care whats on this line. If it is RFC
                      * compliant it should be only \r\n. If there is more