From: Eric Covener <covener@apache.org>
Date: Mon, 6 Jun 2016 18:08:21 +0000 (+0000)
Subject: promote
X-Git-Tag: 2.4.21~83
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8f2d99a4a44d33cf9fed77af18a4a49c3012f456;p=thirdparty%2Fapache%2Fhttpd.git

promote


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

diff --git a/STATUS b/STATUS
index 27a88d44e04..cb4f445faba 100644
--- a/STATUS
+++ b/STATUS
@@ -114,6 +114,17 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
+ *) mod_include: add the <!--#comment ...> syntax in order to include comments
+     in a SSI file.
+     Trunk patch: http://svn.apache.org/r1737476
+     2.4.x patch: trunk patch works (compatibility note to be adjusted)
+     +1: jailletc36, gsmith, covener
+
+ *) core: save a few bytes in conf pool.
+     trunk patch: http://svn.apache.org/r1744980
+     2.4.x patch: trunk works
+     +1: jailletc36, icing, covener
+
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
@@ -144,13 +155,7 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      +1: trawick
      ylavic: there may be missing bits, see thread for commit r1736510.
 
-  *) mod_include: add the <!--#comment ...> syntax in order to include comments
-     in a SSI file.
-     Trunk patch: http://svn.apache.org/r1737476
-     2.4.x patch: trunk patch works (compatibility note to be adjusted)
-     +1: jailletc36, gsmith, covener
-
-  *) mpm_event, mpm_worker: Fix computation of MinSpareThreads' lower bound
+    *) mpm_event, mpm_worker: Fix computation of MinSpareThreads' lower bound
      according the number of listeners buckets.
      trunk patch: http://svn.apache.org/r1737447
                   http://svn.apache.org/r1737449
@@ -170,11 +175,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      2.4.x patch: trunk works
      +1: covener, jailletc36
 
-  *) core: save a few bytes in conf pool.
-     trunk patch: http://svn.apache.org/r1744980
-     2.4.x patch: trunk works
-     +1: jailletc36, icing, covener
-
   *) mod_proxy_(fcgi|scgi|http): save a few bytes in the request pool when this
      handler is not able to process the URL.
      trunk patch: http://svn.apache.org/r1744458