Merge r1301111:

Properly handle errors from subsequent input filters.

PR 52914.

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

diff --git a/CHANGES b/CHANGES
index 936ea39eec06890b6dbfa49cff0ff92cc6b2a2b7..5f3316ebdf4f2aa3da731fd1fa29de2991c178e5 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -6,6 +6,9 @@ Changes with Apache 2.4.2
      envvars: Fix insecure handling of LD_LIBRARY_PATH that could lead to the
      current working directory to be searched for DSOs. [Stefan Fritsch]
 
+  *) mod_dumpio: Properly handle errors from subsequent input filters.
+     PR 52914. [Stefan Fritsch]
+
   *) Unix MPMs: Fix small memory leak in parent process if connect()
      failed when waking up children.  [Joe Orton]
 

diff --git a/STATUS b/STATUS
index 7969d81a926b0975cdbf4fb1ef07c23d18d82429..11d2b573e3b40e2321c84a6b0b079793fab6a8e0 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -94,15 +94,6 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
     2.4.x patch: trunk works
     +1: covener, jorton, trawick
 
-  * mod_dumpio: Return an error code from a previous input filter
-    (likely fixes PR 52914)
-    Trunk patch: http://svn.apache.org/viewvc?rev=1301111&view=rev
-    2.4.x patch: trunk works, plus CHANGES entry:
-       mod_dumpio: Properly handle errors from subsequent input filters.
-       PR 52914. [Stefan Fritsch]
-    +1: covener, trawick, sf
-
-
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
 

diff --git a/modules/debugging/mod_dumpio.c b/modules/debugging/mod_dumpio.c
index a56fa162c56f89950896996d8fd20cae310473c7..e02127b80d31b11bee0cb6782ef30a9f962c2268 100644 (file)
--- a/modules/debugging/mod_dumpio.c
+++ b/modules/debugging/mod_dumpio.c
@@ -146,6 +146,7 @@ static int dumpio_input_filter (ap_filter_t *f, apr_bucket_brigade *bb,
     } else {
         ap_log_cerror(APLOG_MARK, APLOG_TRACE7, 0, c,
                       "mod_dumpio: %s - %d", f->frec->name, ret) ;
+        return ret;
     }
 
     return APR_SUCCESS ;