From: Nick Kew <niq@apache.org>
Date: Fri, 13 Jan 2006 13:08:33 +0000 (+0000)
Subject: Votes, and promote fixes with 3 * +1
X-Git-Tag: 2.2.1~145
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=344a4042b1090003cb7a0a0343345ef6e07e3c31;p=thirdparty%2Fapache%2Fhttpd.git

Votes, and promote fixes with 3 * +1


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

diff --git a/STATUS b/STATUS
index f3007d09b2e..e0622d01bc7 100644
--- a/STATUS
+++ b/STATUS
@@ -99,13 +99,23 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
       Message-ID: <4395A056.2070000@web.turner.com>
       +1: jerenkrantz, jim, wrowe
 
+    * proxy_util: Fix case where a shared keepalive connection results in
+      different (and incorrect) workers from being accessed.
+      http://svn.apache.org/viewcvs.cgi/httpd/httpd/trunk/modules/proxy/proxy_util.c?rev=356030&view=diff&r1=356030&r2=332306
+      +1: jim, rpluem, mturk
+
+    * mod_proxy: Call ap_proxy_http_cleanup after ap_log_rerror
+      because it resets backend->hostname to NULL.
+      http://svn.apache.org/viewcvs.cgi?rev=366279&view=rev
+      +1: rpluem, mturk, niq
+
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
 
     * mod_proxy: Fix Cookie2 header problems that originates back
       from mod_jk. Cookie2 was always sent as Cookie.
       http://svn.apache.org/viewcvs.cgi?rev=358769&view=rev
-      +1: mturk
+      +1: mturk, niq
 
     * mod_dbd: When threaded, create a private pool in child_init
       so we're not using the process pool later.  Also improve
@@ -149,11 +159,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
                    As it is fundamentally different from the first approach I
                    would suggest to restart the voting.
 
-    * proxy_util: Fix case where a shared keepalive connection results in
-      different (and incorrect) workers from being accessed.
-      http://svn.apache.org/viewcvs.cgi/httpd/httpd/trunk/modules/proxy/proxy_util.c?rev=356030&view=diff&r1=356030&r2=332306
-      +1: jim, rpluem, mturk
-
     * mod_ssl: Fix PR37791 (CVEID: CAN-2005-3357) (SEGV if the client is
       connection plain to a SSL enabled port)
       Trunk version of patch:
@@ -170,11 +175,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
         URL: http://svn.apache.org/viewcvs?rev=358040&view=rev
       +1: wrowe, mturk
 
-    * mod_proxy: Call ap_proxy_http_cleanup after ap_log_rerror
-      because it resets backend->hostname to NULL.
-      http://svn.apache.org/viewcvs.cgi?rev=366279&view=rev
-      +1: rpluem, mturk
-
     * mod_cache: Fix PR38017 (mod_cache not working in reverse proxy setup?)
       Trunk version of patch:
          http://svn.apache.org/viewcvs.cgi?rev=367798&view=rev