vote, promote

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

diff --git a/STATUS b/STATUS
index 869e3155409c07475a4e7230de89ff08e6e13098..6d4d6b61d9f6b3c7f26a388d319ad51e8b2ee040 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -98,6 +98,23 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
+  * mod_ssl: Add support for OpenSSL configuration commands (SSLOpenSSLConfCmd)
+    trunk patches: https://svn.apache.org/r1421323
+                   https://svn.apache.org/r1534754
+                   https://svn.apache.org/r1546693
+                   https://svn.apache.org/r1555464
+    2.4.x patch: https://people.apache.org/~kbrand/mod_ssl-2.4.x-confcmd.diff
+    +1: kbrand, drh, trawick
+
+  * mod_cache_disk hangs on windows reading from closed files
+    trunk patch: http://svn.apache.org/r1547845
+    2.4.x patch: trunk works
+    +1 covener, jim, trawick
+  
+  * mod_ldap: restrict a recent WIN32 change to only apply when the MS SDK is used
+    trunk patch: http://svn.apache.org/r1551802
+    2.4.x patch: trunk works
+    +1 covener, jim, trawick
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
@@ -138,35 +155,17 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
     2.4.x patch: http://people.apache.org/~jim/patches/proxy-port-scheme.patch
     +1: jim
 
-  * mod_cache_disk hangs on windows reading from closed files
-    trunk patch: http://svn.apache.org/r1547845
-    2.4.x patch: trunk works
-    +1 covener, jim
-  
   * mod_cache invalidates cached responses when reval returns 304+Expires
     trunk patch: http://svn.apache.org/r1518269
     2.4.x patch: trunk works
     +1 covener, jim
   
-  * mod_ldap: restrict a recent WIN32 change to only apply when the MS SDK is used
-    trunk patch: http://svn.apache.org/r1551802
-    2.4.x patch: trunk works
-    +1 covener, jim
-
   * mod_authn_core: allow <AuthnProviderAlias>'es to be seen from auth 
     stanzas under virtual hosts. PR55622.
     trunk patch: http://svn.apache.org/r1554995
     2.4.x patch: trunk works, + CHANGES
     +1: covener 
 
-  * mod_ssl: Add support for OpenSSL configuration commands (SSLOpenSSLConfCmd)
-    trunk patches: https://svn.apache.org/r1421323
-                   https://svn.apache.org/r1534754
-                   https://svn.apache.org/r1546693
-                   https://svn.apache.org/r1555464
-    2.4.x patch: https://people.apache.org/~kbrand/mod_ssl-2.4.x-confcmd.diff
-    +1: kbrand, drh
-
   * mod_ssl: drop unnecessary EVP_PKEY_copy_parameters cruft
     trunk patch: https://svn.apache.org/r1546692
     2.4.x patch: trunk patch works
@@ -175,7 +174,7 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   * mod_ssl: drop obsolete SGC log message (strong crypto for the 1990ies)
     trunk patch: https://svn.apache.org/r1546805
     2.4.x patch: trunk patch works
-    +1: kbrand
+    +1: kbrand, trawick
 
   * mod_ssl: drop the (undocumented) SSLPKCS7CertificateFile directive,
     for the reasons listed in the trunk commit message
@@ -186,7 +185,7 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   * configure: Look for config*.m4 files only in the correct directories.
     trunk patch: https://svn.apache.org/r1542615
     2.4.x patch: trunk patch works
-    +1: sf
+    +1: sf, trawick
 
   * prefork: PR: 54852. Only use a dummy_connection for idle processes
     trunk patch: http://svn.apache.org/viewvc?view=revision&revision=1542379