Commit 1dc5a73d authored by Jim Jagielski's avatar Jim Jagielski
Browse files

Merge r431339 from trunk: 

PR#37770: Don't try to use dead backend connection in proxy
(Patch from Olivier BOEL)

Submitted by: niq
Reviewed by: jim


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

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: Don't try to use dead backend connection. PR 37770.









     [Olivier BOEL <ob dorrboel.com>] 

















  *) mod_proxy_balancer: Extract stickysession routing information contained as









     parameter in the URL correctly. PR 40400.









     [Ruediger Pluem, Tomokazu Harada <harada sysrdc.ns-sol.co.jp>]


































STATUS



+0
−6



























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



Original line number
Diff line number
Diff line







@@ -77,12 +77,6 @@ RELEASE SHOWSTOPPERS:







PATCHES ACCEPTED TO BACKPORT FROM TRUNK:









  [ start all new proposals below, under PATCHES PROPOSED. ]



















  * mod_proxy: Don't try to use dead backend connection in proxy









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









     PR#37770.  Patch by Olivier Boel









    +1: niq, rpluem, mturk









    +1/emeritus: jwooley (in a comment today on PR#37770)



















PATCHES PROPOSED TO BACKPORT FROM TRUNK:



















    * mpm_winnt: Fix return values from wait_for_many_objects.


































modules/proxy/proxy_util.c



+2
−1



























Changes for modules/proxy/proxy_util.c: 2 added lines, 1 removed line.



Original line number
Diff line number
Diff line







@@ -1969,7 +1969,8 @@ static int is_socket_connected(apr_socket_t *sock)







    socket_status = apr_socket_recv(sock, test_buffer, &buffer_len);









    /* put back old timeout */









    apr_socket_timeout_set(sock, current_timeout);









    if (APR_STATUS_IS_EOF(socket_status))









    if (APR_STATUS_IS_EOF(socket_status) || 









        APR_STATUS_IS_ECONNRESET(socket_status))









        return 0;









    else









        return 1;