From: Jim Jagielski <jim@apache.org>
Date: Fri, 14 Sep 2007 14:48:22 +0000 (+0000)
Subject: Merge r572937, r574485, r574486 from trunk:
X-Git-Tag: 2.2.7~405
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ea9aa61ee0a8298312bf20d31ad6a6e947d90475;p=thirdparty%2Fapache%2Fhttpd.git

Merge r572937, r574485, r574486 from trunk:

Be proactively safe. A cheap check, but helps prevents badness :)


* Do not reset lbstatus, lbfactor and lbset if the shared proxy_worker_stat
  structure for a worker is already initialized by the same or another
  process.


* This check is now part of the PROXY_WORKER_IS_INITIALIZED macro.

Reviewed by: jim


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

diff --git a/STATUS b/STATUS
index a8f3871c7f1..7aa351e9857 100644
--- a/STATUS
+++ b/STATUS
@@ -79,16 +79,6 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
-    * mod_proxy_balancer: Do not reset lbstatus, lbfactor and lbset if the
-      shared proxy_worker_stat structure for a worker is already initialized
-      by the same or another process.
-        Trunk version of patch:
-          http://svn.apache.org/viewvc?view=rev&revision=572937
-          http://svn.apache.org/viewvc?view=rev&revision=574485
-          http://svn.apache.org/viewvc?view=rev&revision=574486
-        2.2.x version of patch:
-          Trunk works.
-      +1: rpluem, jim, niq
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]