promote

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

diff --git a/STATUS b/STATUS
index 73f64e6790c556223c0cc3651afe30023884575d..fc416beb9b09201fcc4c9ecee37247e06a60b710 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -106,6 +106,22 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
+   * mod_ssl: Add the SSL_CLIENT_CERT_RFC4523_CEA variable, which provides
+     a combination of certificate serialNumber and issuer as defined by
+     CertificateExactMatch in RFC4523.
+     trunk patch: http://svn.apache.org/r1661258
+     2.4.x patch: trunk works
+     +1: minfrin, ylavic, jim
+
+  *) mpm_event: Clear and restore sbh in notify_suspend() and notify_resume()
+     respectively.  This merges a missing fix from r1545736 (sbh = NULL before
+     notify_suspend() for write completion, near line 1068 in 2.4.12) which was
+     missed between r1541207 and r1642858.
+     trunk patch: http://svn.apache.org/r1663017
+     2.4.x patch: http://people.apache.org/~ylavic/httpd-2.4.x-mpm_event-notify_suspend_sbh.patch
+                  (trunk works, but the above contains the CHANGES entry, which is 2.4.x only...)
+     +1 ylavic, covener, jim
+
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
@@ -219,13 +235,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      2.4.x patch: trunk works (modulo CHANGES, docs/log-message-tags)
      +1: ylavic
 
-   * mod_ssl: Add the SSL_CLIENT_CERT_RFC4523_CEA variable, which provides
-     a combination of certificate serialNumber and issuer as defined by
-     CertificateExactMatch in RFC4523.
-     trunk patch: http://svn.apache.org/r1661258
-     2.4.x patch: trunk works
-     +1: minfrin, ylavic, jim
-
   *) mod_deflate: A misplaced check prevents limiting small bodies with the
      new inflate limits.  PR56872.
      trunk patch: http://svn.apache.org/r1619383
@@ -242,15 +251,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      2.4.x patch: trunk works (modulo CHANGES)
      +1: ylavic
 
-  *) mpm_event: Clear and restore sbh in notify_suspend() and notify_resume()
-     respectively.  This merges a missing fix from r1545736 (sbh = NULL before
-     notify_suspend() for write completion, near line 1068 in 2.4.12) which was
-     missed between r1541207 and r1642858.
-     trunk patch: http://svn.apache.org/r1663017
-     2.4.x patch: http://people.apache.org/~ylavic/httpd-2.4.x-mpm_event-notify_suspend_sbh.patch
-                  (trunk works, but the above contains the CHANGES entry, which is 2.4.x only...)
-     +1 ylavic, covener, jim
-
   *) core: Add expression support to ErrorDocument. Switch from a fixed
      sized 664 byte array per merge to a hash table.
      trunk patch: http://svn.apache.org/r1661448