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

Merge r988038 from trunk: 

Prevent race condition
See http://www.mail-archive.com/dev@httpd.apache.org/msg47171.html

Submitted by: jfclere
Reviewed/backported by: jim


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

STATUS

+0 −5
Changes for STATUS: 0 added lines, 5 removed lines.
Original line number Diff line number Diff line
@@ -87,11 +87,6 @@ RELEASE SHOWSTOPPERS: 
PATCHES ACCEPTED TO BACKPORT FROM TRUNK:

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



 * mod_proxy: Prevent race condition.

     Trunk version of patch:

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

   +1: jfclere, sf, rpluem, jim



  *) mod_headers: support global replace in Header Edit

     PR 46594 (not 47066 as incorrectly recorded in change log)

     trunk: http://svn.eu.apache.org/viewvc?view=revision&revision=894036

modules/proxy/proxy_util.c

+1 −1
Changes for modules/proxy/proxy_util.c: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -2509,8 +2509,8 @@ PROXY_DECLARE(int) ap_proxy_connect_backend(const char *proxy_function, 
     */

    if (!connected && PROXY_WORKER_IS_USABLE(worker) &&

        !(worker->s->status & PROXY_WORKER_IGNORE_ERRORS)) {

        worker->s->status |= PROXY_WORKER_IN_ERROR;

        worker->s->error_time = apr_time_now();

        worker->s->status |= PROXY_WORKER_IN_ERROR;

        ap_log_error(APLOG_MARK, APLOG_ERR, 0, s,

            "ap_proxy_connect_backend disabling worker for (%s)",

            worker->hostname);