Commit 51286596 authored by Jim Jagielski's avatar Jim Jagielski
Browse files

Merge r434483 from trunk: 

* Close connection to backend if reading of request body fails.

PR: 40310
Submitted by: Ian Abel <ianabel mxtelecom.com>
Reviewed by: rpluem

Submitted by: rpluem
Reviewed by: jim


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

CHANGES

+3 −0
Changes for CHANGES: 3 added lines, 0 removed lines.
Original line number Diff line number Diff line 
                                                        -*- coding: utf-8 -*-

Changes with Apache 2.2.4









  *) mod_proxy_ajp: Close connection to backend if reading of request body









     fails. PR 40310. [Ian Abel <ianabel mxtelecom.com>]

















  *) mod_proxy_balancer: Retry worker chosen by route / redirect worker if









     it is in error state before sending "Service Temporarily Unavailable".









     PR 38962. [Christian Boitel <cboitel lfdj.com>]


































STATUS



+0
−9



























Changes for STATUS: 0 added lines, 9 removed lines.



Original line number
Diff line number
Diff line







@@ -86,15 +86,6 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:







        http://people.apache.org/~wrowe/mod_isapi-416293-to-httpd-2.2.patch









      +1 wrowe , fielding, jerenkrantz



















    * mod_proxy_ajp: Close connection to backend if reading of request body









      fails.









        PR: 40310









      Trunk version of patch:









        http://svn.apache.org/viewvc?view=rev&revision=434483









      2.2.x version of patch:









        Trunk version works









      +1 rpluem, sctemme, jim, mturk



















PATCHES PROPOSED TO BACKPORT FROM TRUNK:



















    * mpm_winnt: Fix return values from wait_for_many_objects.


































modules/proxy/mod_proxy_ajp.c



+2
−0



























Changes for modules/proxy/mod_proxy_ajp.c: 2 added lines, 0 removed lines.



Original line number
Diff line number
Diff line







@@ -175,6 +175,8 @@ static int ap_proxy_ajp_request(apr_pool_t *p, request_rec *r,







                                AJP13_MAX_SEND_BODY_SZ);



















        if (status != APR_SUCCESS) {









            /* We had a failure: Close connection to backend */









            conn->close++;









            ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, r->server,









                         "proxy: ap_get_brigade failed");









            apr_brigade_destroy(input_brigade);