From: Yann Ylavic <ylavic@apache.org>
Date: Mon, 21 Mar 2016 12:25:48 +0000 (+0000)
Subject: Vote, promote.
X-Git-Tag: 2.4.19~9
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d4eebd05a1c679fc6b87526c96b999a0e78ed609;p=apache

Vote, promote.

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

diff --git a/STATUS b/STATUS
index 0d7ce1d479..fc4e344009 100644
--- a/STATUS
+++ b/STATUS
@@ -112,6 +112,14 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
+  *) DOCUMENT_ARGS, set by mod_include to represent args to SSI document;
+     unlike UNESCAPED_QUERY_STRING, not shell-escaped
+     trunk patch: r1734817, r1734955, r1734989 (but version compat and CHANGES
+                  need to be manipulated)
+     2.4.x patch: https://emptyhammock.com/media/downloads/DOCUMENT_ARGS-to-2.4.x.txt
+     +1: trawick, jim, ylavic
+     ylavic: The second CHANGES entry added in the patch should not be merged...
+
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
@@ -161,12 +169,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      updated patch with APLOGNOs by merging 1735931,1735935 from trunk
      updated patch with APLOGNOs by merging 1735942 from trunk
 
-  *) DOCUMENT_ARGS, set by mod_include to represent args to SSI document;
-     unlike UNESCAPED_QUERY_STRING, not shell-escaped
-     trunk patch: r1734817, r1734955, r1734989 (but version compat and CHANGES
-                  need to be manipulated)
-     2.4.x patch: https://emptyhammock.com/media/downloads/DOCUMENT_ARGS-to-2.4.x.txt
-     +1: trawick, jim
  
 PATCHES/ISSUES THAT ARE BEING WORKED