reset erroronstatus^H^H^H...failonstatus vote to reflect trunk changes and new 2...

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

diff --git a/STATUS b/STATUS
index 24deff195de3052be4b9a645a312eb4d199032e5..eac507f4c9bef6fdc7bd4bf5a63fae2a7d09ab99 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -145,14 +145,17 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   * mod_proxy_balancer: Force workers into PROXY_WORKER_IN_ERROR when configured
     statuses are found
     PR: 48939
-    Trunk patch: http://svn.apache.org/viewvc?rev=930125&view=rev
-    2.2.x patch: https://issues.apache.org/bugzilla/attachment.cgi?id=25153
-    Submitted by: Daniel Ruggeri <DRuggeri primary.net>
-    +1: niq, jim
-    trawick suggests:
-      1. somebody write doc (Daniel volunteers)
-      2. somebody create new patch which includes r962972, any
-          subsequent changes, and doc (Daniel volunteers)
+    Trunk patches: http://svn.apache.org/viewvc?rev=930125&view=rev
+                   http://svn.apache.org/viewvc?rev=930254&view=rev
+                   http://svn.apache.org/viewvc?rev=951900&view=rev
+                   http://svn.apache.org/viewvc?rev=987379&view=rev
+                   http://svn.apache.org/viewvc?rev=987359&view=rev
+    2.2.x patch: https://issues.apache.org/bugzilla/attachment.cgi?id=25923
+      plus this CHANGES entry:
+      *) Proxy balancer: support setting error status according to HTTP response
+         code from a backend.  PR 48939.  [Daniel Ruggeri <DRuggeri primary.net>]
+   Submitted by: Daniel Ruggeri <DRuggeri primary.net>
+   +1: trawick
 
   * mod_disk_cache: Decline the opportunity to cache if the response is
     a 206 Partial Content. This stops a reverse proxied partial response