addressed and promoted

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

diff --git a/STATUS b/STATUS
index 21b19e4f030dc0a4ae960c088516eb40f8369157..82ce4f94dd89249a4cac2f547f9e44bcf334b573 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -121,6 +121,22 @@ RELEASE SHOWSTOPPERS:
      2.4.x patch: trunk works (modulo CHANGES)
      +1: ylavic, jim
 
+PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
+  [ start all new proposals below, under PATCHES PROPOSED. ]
+
+  *) core: %{DOCUMENT_URI} used in nested SSI expressions should point to the
+     URI originally requsted by the user, not the nested documents URI. This
+     restores the behavior of this variable to match the "legacy" SSI parser.
+     PR60624. 
+     trunk patch: http://svn.apache.org/r1780095
+     2.4.x patch: trunk works
+     +1: covener, wrowe, ylavic
+
+  *) core: EBCDIC fixes for interim responses with additional headers.
+     trunk patch: http://svn.apache.org/r1777354
+     2.4.x patch: http://people.apache.org/~covener/patches/ebcdic-interim.diff
+     +1: covener, wrowe, ylavic (by inspection)
+
   *) PR 60576: 2.4.21 broke PHP-FPM with the patch to strip the bogus "proxy://"
      prefix from SCRIPT_FILENAME. We need to revert to the previous behavior
      ASAP to avoid any further hurdles with FCGI implementations while we figure
@@ -147,23 +163,6 @@ RELEASE SHOWSTOPPERS:
                 question regarding `ProxyFCGIBackendType PHP-FPM`
      covener: added http://svn.apache.org/r1788040
 
-PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
-  [ start all new proposals below, under PATCHES PROPOSED. ]
-
-  *) core: %{DOCUMENT_URI} used in nested SSI expressions should point to the
-     URI originally requsted by the user, not the nested documents URI. This
-     restores the behavior of this variable to match the "legacy" SSI parser.
-     PR60624. 
-     trunk patch: http://svn.apache.org/r1780095
-     2.4.x patch: trunk works
-     +1: covener, wrowe, ylavic
-
-  *) core: EBCDIC fixes for interim responses with additional headers.
-     trunk patch: http://svn.apache.org/r1777354
-     2.4.x patch: http://people.apache.org/~covener/patches/ebcdic-interim.diff
-     +1: covener, wrowe, ylavic (by inspection)
-
-
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]