From: Jim Jagielski <jim@apache.org>
Date: Mon, 7 Dec 2015 12:18:18 +0000 (+0000)
Subject: promotes
X-Git-Tag: 2.4.18~16
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4d2bbbcd4e81f30896b1db0d2279022023a1ea44;p=apache

promotes



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

diff --git a/STATUS b/STATUS
index debc0c308d..73c5da3350 100644
--- a/STATUS
+++ b/STATUS
@@ -111,6 +111,24 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
+  *) mod_ssl: for all ssl_engine_vars.c lookups, fall back to master connection
+     if conn_rec itself holds no valid SSLConnRec*. Fixes PR58666.
+     trunk patch: http://svn.apache.org/r1717958
+     2.4.x patch: trunk works apart from CHANGES
+     +1: icing, ylavic, jim
+
+  *) Easy patches: synch 2.4.x and trunk
+     - mod_auth_basic: Use 'ap_pbase64decode' to simplify code.
+     - mod_isapi: Silent a sparse Warning.
+     trunk patch: http://svn.apache.org/r1716940
+                  http://svn.apache.org/r1717086
+     2.4.x patch: trunk patches work
+     +1: jailletc36, ylavic, jim
+
+  *) mod_ssl: Save a few bytes in conf pool.
+     trunk patch: http://svn.apache.org/r1715273
+     2.4.x patch: trunk patches work
+     +1: jailletc36, ylavic, jim
 
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
@@ -154,26 +172,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      2.4.x patch: https://people.apache.org/~jailletc36/remove_return.patch
      +1: jailletc36, jim
 
-  *) mod_ssl: for all ssl_engine_vars.c lookups, fall back to master connection
-     if conn_rec itself holds no valid SSLConnRec*. Fixes PR58666.
-     trunk patch: http://svn.apache.org/r1717958
-     2.4.x patch: trunk works apart from CHANGES
-     +1: icing, ylavic, jim
-
-  *) Easy patches: synch 2.4.x and trunk
-     - mod_auth_basic: Use 'ap_pbase64decode' to simplify code.
-     - mod_isapi: Silent a sparse Warning.
-     trunk patch: http://svn.apache.org/r1716940
-                  http://svn.apache.org/r1717086
-     2.4.x patch: trunk patches work
-     +1: jailletc36, ylavic, jim
-
-  *) mod_ssl: Save a few bytes in conf pool.
-     trunk patch: http://svn.apache.org/r1715273
-     2.4.x patch: trunk patches work
-     +1: jailletc36, ylavic, jim
-
-
 PATCHES/ISSUES THAT ARE BEING WORKED
 
   *) http: Don't remove the Content-Length of zero from a HEAD response if