From: Joe Orton <jorton@apache.org>
Date: Sat, 23 May 2015 10:10:22 +0000 (+0000)
Subject: Vote, promote.
X-Git-Tag: 2.4.13~57
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=64d450ed2215c346d52a821d03c595ae93671653;p=thirdparty%2Fapache%2Fhttpd.git

Vote, promote.

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

diff --git a/STATUS b/STATUS
index 7776cb2bff5..b2e234ecfad 100644
--- a/STATUS
+++ b/STATUS
@@ -106,6 +106,20 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
 
+  *) mod_authz_dbm, mod_authz_owner: Retrieve the optional
+     authz_owner_get_file_group function in a hook. This fixes crash when
+     mod_authz_dbm is loaded before mod_authz_owner and
+     "Require dbm-file-group" is used.
+     trunk patch: http://svn.apache.org/r1420184
+     2.4.x patch: trunk works
+     +1: jkaluza, wrowe, jorton
+
+  *) OCSP stapling: Don't block initial handshakes while refreshing the OCSP 
+     response for a different certificate plus additional minor changes
+     trunk patch: r1679032 + r1679192 + r1680276
+     2.4.x patch: trunk works with the usual CHANGES manipulation, or grab
+     http://people.apache.org/~trawick/OCSP-stapling-1679032-1679192-1680276.txt
+     +1: trawick, jim, jorton
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
@@ -231,21 +245,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
              ints added at the end of core_server_config, the proposed merge
              does a minor bump only.
 
-  *) mod_authz_dbm, mod_authz_owner: Retrieve the optional
-     authz_owner_get_file_group function in a hook. This fixes crash when
-     mod_authz_dbm is loaded before mod_authz_owner and
-     "Require dbm-file-group" is used.
-     trunk patch: http://svn.apache.org/r1420184
-     2.4.x patch: trunk works
-     +1: jkaluza, wrowe
-
-  *) OCSP stapling: Don't block initial handshakes while refreshing the OCSP 
-     response for a different certificate plus additional minor changes
-     trunk patch: r1679032 + r1679192 + r1680276
-     2.4.x patch: trunk works with the usual CHANGES manipulation, or grab
-     http://people.apache.org/~trawick/OCSP-stapling-1679032-1679192-1680276.txt
-     +1: trawick, jim
-
 
 PATCHES/ISSUES THAT ARE BEING WORKED