From: Luca Toscano <elukey@apache.org>
Date: Fri, 22 Dec 2017 12:40:43 +0000 (+0000)
Subject: vote + promote
X-Git-Tag: 2.4.30~199
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1dc0773697f3e549ee1cff1be56629d34bcde29a;p=apache

vote + promote

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

diff --git a/STATUS b/STATUS
index 3979e7861f..59e3569569 100644
--- a/STATUS
+++ b/STATUS
@@ -124,6 +124,12 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
      2.4.x patch: https://svn.apache.org/repos/asf/httpd/httpd/patches/2.4.x/mod_ssl_minimal_md.diff
      +1: icing, jorton, jim
 
+  *) mod_proxy_html: Add HTML5 FPI, fix typo in handling legacy FPIs,
+     process parsed comments immediately.  Fix PR 56457
+     trunk patch: http://svn.apache.org/r1442409
+                  http://svn.apache.org/r1816458
+     2.4.x patch: svn merge -c r1442409,r1816458 ^/httpd/httpd/trunk .
+     +1: niq, covener, elukey
 
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
@@ -232,13 +238,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      2.4.x patch: svn merge -c r1818278  ^/httpd/httpd/trunk . 
      +1:  covener, jim
 
-  *) mod_proxy_html: Add HTML5 FPI, fix typo in handling legacy FPIs,
-     process parsed comments immediately.  Fix PR 56457
-     trunk patch: http://svn.apache.org/r1442409
-                  http://svn.apache.org/r1816458
-     2.4.x patch: svn merge -c r1442409,r1816458 ^/httpd/httpd/trunk .
-     +1: niq, covener
-
   *) mod_proxy_html: skip documents < 4 bytes. PR 56286
      trunk patch: http://svn.apache.org/r1599012
                   http://svn.apache.org/r1601559