From: Jim Jagielski <jim@apache.org>
Date: Wed, 18 Nov 2015 16:12:46 +0000 (+0000)
Subject: promote
X-Git-Tag: 2.4.18~60
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=de6564dd3f3316a1275aefbd1a9829747149e148;p=thirdparty%2Fapache%2Fhttpd.git

promote



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

diff --git a/STATUS b/STATUS
index 1b2781e7769..a14b76a829b 100644
--- a/STATUS
+++ b/STATUS
@@ -111,7 +111,28 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
+   * mod_ssl: Make the output filter more friendly with deferred write and
+              response pipelining.
+     trunk patch: http://svn.apache.org/r1705194
+                  http://svn.apache.org/r1705823
+                  http://svn.apache.org/r1705826
+                  http://svn.apache.org/r1705828
+                  http://svn.apache.org/r1705833
+                  http://svn.apache.org/r1706275
+                  http://svn.apache.org/r1707230
+                  http://svn.apache.org/r1707231
+     2.4.x patch: http://people.apache.org/~ylavic/httpd-2.4.x-mod_ssl-deferred_friendly-v3.patch
+     +1: ylavic, icing, jim
 
+  *) synch 2.4.x with trunk
+        mod_authn_anon: Constify + save a few bytes in conf pool
+        core: Save a few bytes in conf pool when processing 'AllowOverrideList'
+        mod_authnz_ldap: Save a few bytes in conf pool
+     trunk patch: http://svn.apache.org/r1711553
+                  http://svn.apache.org/r1713040
+                  http://svn.apache.org/r1683881
+     2.4.x patch: trunk works
+     +1: jailletc36, icing, jim
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
@@ -127,19 +148,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      2.4.x patch: https://people.apache.org/~minfrin/httpd-mod_alias-expr2.patch
      +1: minfrin
 
-   * mod_ssl: Make the output filter more friendly with deferred write and
-              response pipelining.
-     trunk patch: http://svn.apache.org/r1705194
-                  http://svn.apache.org/r1705823
-                  http://svn.apache.org/r1705826
-                  http://svn.apache.org/r1705828
-                  http://svn.apache.org/r1705833
-                  http://svn.apache.org/r1706275
-                  http://svn.apache.org/r1707230
-                  http://svn.apache.org/r1707231
-     2.4.x patch: http://people.apache.org/~ylavic/httpd-2.4.x-mod_ssl-deferred_friendly-v3.patch
-     +1: ylavic, icing, jim
-
    * core: Fix crash in ap_mpm_pod_check call caused by NULL dereference of
           its parameter when starting httpd as single process (httpd -X).
      trunk patch: http://svn.apache.org/r1711479
@@ -191,15 +199,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      2.4.x patch: trunk works (modulo CHANGES)
      +1: kbrand, icing
     
-  *) synch 2.4.x with trunk
-        mod_authn_anon: Constify + save a few bytes in conf pool
-        core: Save a few bytes in conf pool when processing 'AllowOverrideList'
-        mod_authnz_ldap: Save a few bytes in conf pool
-     trunk patch: http://svn.apache.org/r1711553
-                  http://svn.apache.org/r1713040
-                  http://svn.apache.org/r1683881
-     2.4.x patch: trunk works
-     +1: jailletc36, icing, jim
 
 PATCHES/ISSUES THAT ARE BEING WORKED