And promote

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

diff --git a/STATUS b/STATUS
index 2621b1951a95cc177fa17197d54ae2d4c7bbf043..21f9c75bb8b167278966f25a3cd220ad5122076f 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -126,6 +126,12 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
      [niq: I was about to backport along with the mod_proxy_html accepted
       patch, but I see this is on hold pending mod_md.h]
 
+  *) mod_proxy_html: Save a few bytes in the conf pool when handling
+     'ProxyHTMLDoctype' directive with a user defined  FPI
+     trunk patch: http://svn.apache.org/r1813991
+     2.4.x patch: svn merge -c r1813991 ^/httpd/httpd/trunk .
+     +1: jailletc36, niq, jim
+
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
@@ -240,12 +246,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      2.4.x patch: svn merge -c r1599012,r1601559,r1818624 ^/httpd/httpd/trunk .
      +1: niq, jim
 
-  *) mod_proxy_html: Save a few bytes in the conf pool when handling
-     'ProxyHTMLDoctype' directive with a user defined  FPI
-     trunk patch: http://svn.apache.org/r1813991
-     2.4.x patch: svn merge -c r1813991 ^/httpd/httpd/trunk .
-     +1: jailletc36, niq, jim
-
   *) mpm_event: close connections not reported as handled by any module to
      avoid losing track of them and leaking scoreboard entries.  PR 61551.
      trunk patch: http://svn.apache.org/r1818804