From: Eric Covener <covener@apache.org>
Date: Mon, 6 Jun 2016 18:21:38 +0000 (+0000)
Subject: one more promo, fix whitespace
X-Git-Tag: 2.4.21~82
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f7895c6c43f7a9f5aa67b82e95f9d2e00a19722a;p=thirdparty%2Fapache%2Fhttpd.git

one more promo, fix whitespace


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

diff --git a/STATUS b/STATUS
index cb4f445faba..1016c7f5798 100644
--- a/STATUS
+++ b/STATUS
@@ -125,6 +125,12 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
      2.4.x patch: trunk works
      +1: jailletc36, icing, covener
 
+ *) mod_rewrite: support new h2:// and h2c:// proxy url schemes in detection
+     of absolute urls:
+     trunk patch: http://svn.apache.org/r1744206
+     2.4.x patch: trunk works
+     +1: icing, jim, covener
+   
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
@@ -155,7 +161,7 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      +1: trawick
      ylavic: there may be missing bits, see thread for commit r1736510.
 
-    *) 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
@@ -163,12 +169,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      2.4.x patch: trunk works (modulo CHANGES)
      +1: ylavic, jim
 
-  *) mod_rewrite: support new h2:// and h2c:// proxy url schemes in detection
-     of absolute urls:
-     trunk patch: http://svn.apache.org/r1744206
-     2.4.x patch: trunk works
-     +1: icing, jim, covener
-   
   *) authz_host,authz_ldap: log messages fix
      trunk patch: 
                   http://svn.apache.org/r1745034