From: Paul Querna <pquerna@apache.org>
Date: Fri, 31 Mar 2006 06:38:30 +0000 (+0000)
Subject: Move up accepted backports.
X-Git-Tag: 2.2.1~46
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4e5ca58234b80c0671465bdebad6c8efb14baf01;p=thirdparty%2Fapache%2Fhttpd.git

Move up accepted backports.


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

diff --git a/STATUS b/STATUS
index 5f11282194a..e19650fd8e4 100644
--- a/STATUS
+++ b/STATUS
@@ -97,6 +97,25 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
         URL: http://people.apache.org/~wrowe/fixldap_mask.patch
       +1: wrowe, pquerna, jim, jorton
 
+    * mod_proxy_http: Fix PR38602 (Keep Alive not workwing with mod_proxy (New
+      socket created for every request proxied))
+      Trunk version of patch:
+         http://svn.apache.org/viewcvs?rev=378032&view=rev
+      Backport version for 2.2.x of patch:
+         Trunk version of patch works
+      +1: rpluem, jim, pquerna
+
+    * Fix instdso.sh install error with some sed implementations (AIX et al)
+        http://issues.apache.org/bugzilla/attachment.cgi?id=17816
+        (http://svn.apache.org/viewcvs?rev=389797&view=rev on trunk)
+      PR: 38108
+      +1: jorton, rpluem, pquerna
+
+    * mod_ssl: Fix shmcb possible SIGBUS in shmcb on SPARC et al with gcc >= 4
+        http://svn.apache.org/viewcvs?rev=382799&view=rev
+      PR: 38838
+      +1: jorton, rpluem, pquerna
+
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
 
     * mod_dbd: When threaded, create a private pool in child_init
@@ -121,14 +140,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
         http://svn.apache.org/viewcvs?rev=382147&view=rev
       +1: wrowe, bnicholes
 
-    * mod_proxy_http: Fix PR38602 (Keep Alive not workwing with mod_proxy (New
-      socket created for every request proxied))
-      Trunk version of patch:
-         http://svn.apache.org/viewcvs?rev=378032&view=rev
-      Backport version for 2.2.x of patch:
-         Trunk version of patch works
-      +1: rpluem, jim, pquerna
-
     * mod_proxy: Fix PR38403 (Child-Thread uses 100%CPU usage, mod_proxy ?)
       Trunk version of patch:
          http://svn.apache.org/viewcvs?rev=377738&view=rev
@@ -163,17 +174,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
          http://people.apache.org/~bnicholes/util_ldap.c.patch
       +1: bnicholes
     
-    * Fix instdso.sh install error with some sed implementations (AIX et al)
-        http://issues.apache.org/bugzilla/attachment.cgi?id=17816
-        (http://svn.apache.org/viewcvs?rev=389797&view=rev on trunk)
-      PR: 38108
-      +1: jorton, rpluem, pquerna
-
-    * mod_ssl: Fix shmcb possible SIGBUS in shmcb on SPARC et al with gcc >= 4
-        http://svn.apache.org/viewcvs?rev=382799&view=rev
-      PR: 38838
-      +1: jorton, rpluem, pquerna
-
     * mod_proxy_ajp: Remove the Flushing Bandaid from compile time
       to a more admin-friendly runtime setting.
          http://svn.apache.org/viewcvs?rev=384580&view=rev