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

Approvd 


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

STATUS

+1 −7
Original line number Diff line number Diff line
@@ -86,13 +86,6 @@ RELEASE SHOWSTOPPERS: 
PATCHES ACCEPTED TO BACKPORT FROM TRUNK:

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



 * mod_proxy_balancer: Try first if we find any "recoverable" workers before

   we force them to recover.

   Trunk version of patch:

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

   Backport version for 2.2.x of patch:

      Trunk version of patch works

   +1: rpluem, pgollucci, jim



PATCHES PROPOSED TO BACKPORT FROM TRUNK:

  [ New proposals should be added at the end of the list ]
@@ -105,6 +98,7 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK: 
      http://svn.apache.org/viewvc?view=rev&revision=739854

   Backport version for 2.2.x of patch:

      http://people.apache.org/~jim/patches/httpd-2.2-lbset.patch

   +1: jim



PATCHES/ISSUES THAT ARE STALLED

modules/proxy/mod_proxy_balancer.c

+9 −1
Original line number Diff line number Diff line
@@ -408,6 +408,14 @@ static void force_recovery(proxy_balancer *balancer, server_rec *s) 
            ok = 1;

            break;

        }

        else {

            /* Try if we can recover */

            ap_proxy_retry_worker("BALANCER", worker, s);

            if (!(worker->s->status & PROXY_WORKER_IN_ERROR)) {

                ok = 1;

                break;

            }

        }

    }

    if (!ok) {

        /* If all workers are in error state force the recovery.