From: Jeff Trawick <trawick@apache.org>
Date: Wed, 15 Aug 2012 11:46:40 +0000 (+0000)
Subject: Merge r1301111 from trunk:
X-Git-Tag: 2.2.23~50
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=48ac418848844c08a8545cdd59a1dec8effe1438;p=thirdparty%2Fapache%2Fhttpd.git

Merge r1301111 from trunk:

mod_dumpio: Return an error code from a previous input filter

PR: 52914
Submitted by: sf
Reviewed by: rjung, trawick


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

diff --git a/CHANGES b/CHANGES
index ad14c507289..12eff640f2e 100644
--- a/CHANGES
+++ b/CHANGES
@@ -5,6 +5,9 @@ Changes with Apache 2.2.23
      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]
+
   *) mpm_worker: Fix cases where the spawn rate wasn't reduced after child
      process resource shortages.  [Jeff Trawick]
 
diff --git a/STATUS b/STATUS
index fce0228d62f..360954c4481 100644
--- a/STATUS
+++ b/STATUS
@@ -93,12 +93,6 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
-  * mod_dumpio: Return an error code from a previous input filter
-    PR 52914
-    Trunk patch: http://svn.apache.org/viewvc?rev=1301111&view=rev
-    2.2.x patch: http://people.apache.org/~sf/PR52914-2.2.diff
-    +1: sf, rjung, trawick
-
   * mod_ssl: Add SSLProxyMachineCertificateChainFile directive
     Uses openssl to construct a chain for each proxy cert. When a remote server requests
     a client certificate that is NOT the direct issuer of any available client
diff --git a/modules/debug/mod_dumpio.c b/modules/debug/mod_dumpio.c
index f4fdbba0aab..2399197fea8 100644
--- a/modules/debug/mod_dumpio.c
+++ b/modules/debug/mod_dumpio.c
@@ -126,6 +126,7 @@ static int dumpio_input_filter (ap_filter_t *f, apr_bucket_brigade *bb,
     } else {
         ap_log_error(APLOG_MARK, ptr->loglevel, 0, c->base_server,
         "mod_dumpio: %s - %d", f->frec->name, ret) ;
+        return ret;
     }
 
     return APR_SUCCESS ;