From: Stefan Fritsch <sf@apache.org>
Date: Tue, 3 Jul 2012 19:08:50 +0000 (+0000)
Subject: promote
X-Git-Tag: 2.4.3~351
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6676cd14ffff4028a1a9b46ce0533ff811b07f4a;p=apache

promote


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

diff --git a/STATUS b/STATUS
index ab9c7490e8..85bf300c3c 100644
--- a/STATUS
+++ b/STATUS
@@ -108,6 +108,17 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
     2.4 patch: trunk works => http://people.apache.org/~jorton/httpd-2.4.2-dummytls.patch
     +1: jorton, jim, covener
 
+  * htdbm/htpasswd: fix handling of crypt() failures.
+    trunk patch: http://svn.apache.org/viewvc?rev=1346905&view=rev
+    2.4.x patch: trunk patch (ex CHANGES) works
+    +1: jorton, covener, sf
+
+  * mod_negotiation: CVE-2012-2687 XSS in mod_negotiation
+    trunk patch: http://svn.apache.org/viewvc?view=revision&revision=1349905
+    2.4.x patch: trunk works
+    +1: covener, jorton, sf
+
+
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
 
@@ -148,16 +159,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      2.4.x patch: trunk patch works
      +1: jorton, covener
 
-   * htdbm/htpasswd: fix handling of crypt() failures.
-     trunk patch: http://svn.apache.org/viewvc?rev=1346905&view=rev
-     2.4.x patch: trunk patch (ex CHANGES) works
-     +1: jorton, covener, sf
-
-   * mod_negotiation: CVE-2012-2687 XSS in mod_negotiation
-     trunk patch: http://svn.apache.org/viewvc?view=revision&revision=1349905
-     2.4.x patch: trunk works
-     +1: covener, jorton, sf
-
    * mod_rewrite: add "AllowAnyURI" option.
      trunk patch: http://svn.apache.org/viewvc?rev=1356115&view=rev
      2.4.x patch: trunk patch works