From: Stefan Fritsch <sf@apache.org>
Date: Fri, 16 Mar 2012 18:39:29 +0000 (+0000)
Subject: Merge r1301111:
X-Git-Tag: 2.4.2~167
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e95dbfcf35e972fb7e6f6033b2e71b3ac80837eb;p=apache

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 936ea39eec..5f3316ebdf 100644
--- 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 7969d81a92..11d2b573e3 100644
--- 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 a56fa162c5..e02127b80d 100644
--- 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 ;