From: Jim Jagielski <jim@apache.org>
Date: Tue, 28 Aug 2007 13:22:17 +0000 (+0000)
Subject: promote 2 accepted backports
X-Git-Tag: 2.2.6~97
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=962de70356d18a50b77365a602aa5e1491b982a3;p=thirdparty%2Fapache%2Fhttpd.git

promote 2 accepted backports


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

diff --git a/STATUS b/STATUS
index adca2f682f3..47c73c722aa 100644
--- a/STATUS
+++ b/STATUS
@@ -79,6 +79,23 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
+    * mod_proxy: Improve traces in ap_proxy_http_process_response()
+      to investigate PR37770.
+      Trunk version of patch:
+        http://svn.apache.org/viewvc?view=rev&rev=549420
+        http://svn.apache.org/viewvc?view=rev&rev=561778
+      +1: jfclere, rpluem, jim
+
+    * mod_ssl: Version reporting update; displays 'compiled against'
+      Apache and build-time SSL Library versions at loglevel [info],
+      while reporting the run-time SSL Library version in the server
+      info tags.  Helps to identify a mod_ssl built against one flavor
+      of OpenSSL but running against another (also adds SSL-C version
+      number reporting.)  [William Rowe]
+        http://svn.apache.org/viewvc?view=rev&revision=520701
+      Backported to 2.2;
+        http://people.apache.org/~wrowe/r520701-backport-2.2.patch
+      +1: wrowe, rpluem, jim
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
 
@@ -133,13 +150,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
        http://people.apache.org/~chrisd/patches/mod_dbd_pools_groups/mpm_child_init-beos-2.2.x.patch
      +0: chrisd (abstaining; unable to test)
 
-    * mod_proxy: Improve traces in ap_proxy_http_process_response()
-      to investigate PR37770.
-      Trunk version of patch:
-        http://svn.apache.org/viewvc?view=rev&rev=549420
-        http://svn.apache.org/viewvc?view=rev&rev=561778
-      +1: jfclere, rpluem, jim
-
     * multiple files,	Trivial cleanups
       PR: 39518 - Christophe JAILLET
       http://svn.apache.org/viewvc?view=rev&revision=557837
@@ -208,17 +218,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
         http://people.apache.org/~wrowe/r569535-backport-2.2-r2.patch
       +1: wrowe, jim
 
-    * mod_ssl: Version reporting update; displays 'compiled against'
-      Apache and build-time SSL Library versions at loglevel [info],
-      while reporting the run-time SSL Library version in the server
-      info tags.  Helps to identify a mod_ssl built against one flavor
-      of OpenSSL but running against another (also adds SSL-C version
-      number reporting.)  [William Rowe]
-        http://svn.apache.org/viewvc?view=rev&revision=520701
-      Backported to 2.2;
-        http://people.apache.org/~wrowe/r520701-backport-2.2.patch
-      +1: wrowe, rpluem, jim
-
 
 PATCHES/ISSUES THAT ARE STALLED