From: Graham Leggett <minfrin@apache.org>
Date: Sat, 27 Feb 2010 20:31:25 +0000 (+0000)
Subject: Vote and promote.
X-Git-Tag: 2.2.15~42
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=559ce615458c8cbaae82f3d5cd65800aa3016afe;p=thirdparty%2Fapache%2Fhttpd.git

Vote and promote.


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

diff --git a/STATUS b/STATUS
index 532fd0c7a10..485c58b2bbf 100644
--- a/STATUS
+++ b/STATUS
@@ -96,6 +96,19 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
          Trunk version of patch works
       +1: rpluem, sf, minfrin
 
+  * mod_ssl: Add SSLInsecureRenegotiation directive.
+      Trunk version of patch:
+        http://svn.apache.org/viewcvs.cgi?rev=906039&view=rev
+        http://svn.apache.org/viewcvs.cgi?rev=906057&view=rev
+        http://svn.apache.org/viewcvs.cgi?rev=906485&view=rev
+        http://svn.apache.org/viewcvs.cgi?rev=906491&view=rev
+        http://svn.apache.org/viewcvs.cgi?rev=908015&view=rev
+        http://svn.apache.org/viewcvs.cgi?rev=916733&view=rev
+        http://svn.apache.org/viewcvs.cgi?rev=916817&view=rev
+      Backport version for 2.2.x of patch:
+        http://people.apache.org/~jorton/ms_reneg22_v2.diff
+      +1: jorton, trawick, minfrin
+
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
@@ -165,19 +178,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
     sf: +1, but would like a world readable pid file even better
     minfrin: r917005 gives you a world readable pid files
 
-  * mod_ssl: Add SSLInsecureRenegotiation directive.
-      Trunk version of patch:
-        http://svn.apache.org/viewcvs.cgi?rev=906039&view=rev
-        http://svn.apache.org/viewcvs.cgi?rev=906057&view=rev
-        http://svn.apache.org/viewcvs.cgi?rev=906485&view=rev
-        http://svn.apache.org/viewcvs.cgi?rev=906491&view=rev
-        http://svn.apache.org/viewcvs.cgi?rev=908015&view=rev
-        http://svn.apache.org/viewcvs.cgi?rev=916733&view=rev
-        http://svn.apache.org/viewcvs.cgi?rev=916817&view=rev
-      Backport version for 2.2.x of patch:
-        http://people.apache.org/~jorton/ms_reneg22_v2.diff
-      +1: jorton, trawick
-
   * mod_ssl: Fix potential SSL I/O filter hang if a long list of 
     trusted CAs is configured for client cert auth.  PR 46952
       Trunk version of patch: