Commit 1bab729e authored by Jeff Trawick's avatar Jeff Trawick
Browse files

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
parent ffa1e88c

CHANGES

+3 −0
Original line number Diff line number Diff line
@@ -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]

STATUS

+0 −6
Original line number Diff line number Diff line
@@ -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

modules/debug/mod_dumpio.c

+1 −0
Original line number Diff line number Diff line
@@ -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 ;