]> git.ipfire.org Git - thirdparty/apache/httpd.git/commitdiff
Merge r1301111 from trunk:
authorJeff Trawick <trawick@apache.org>
Wed, 15 Aug 2012 11:46:40 +0000 (11:46 +0000)
committerJeff Trawick <trawick@apache.org>
Wed, 15 Aug 2012 11:46:40 +0000 (11:46 +0000)
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

CHANGES
STATUS
modules/debug/mod_dumpio.c

diff --git a/CHANGES b/CHANGES
index ad14c507289ae519887cc0ce1c91f9d868ef4330..12eff640f2e9201e8fb9b9a13b96b3683ce1bcba 100644 (file)
--- 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 fce0228d62f1d879e7d49f0225546c6915cc4cd2..360954c448139bc3aab41c6c6957120e9b70adf6 100644 (file)
--- 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
index f4fdbba0aab2a0679e5857b7ca366cbd54ee1483..2399197fea8a82b7b3a5f106891fdc324d68bcfc 100644 (file)
@@ -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 ;