]> git.ipfire.org Git - thirdparty/apache/httpd.git/commitdiff
Propose.
authorJacob Champion <jchampion@apache.org>
Tue, 30 May 2017 20:45:42 +0000 (20:45 +0000)
committerJacob Champion <jchampion@apache.org>
Tue, 30 May 2017 20:45:42 +0000 (20:45 +0000)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1796941 13f79535-47bb-0310-9956-ffa450edef68

STATUS

diff --git a/STATUS b/STATUS
index 5e029fec4f2c9d6c1dbbf1d36949c9b40069b098..02174dc25124b175ae4152c4226c4e39440d6341 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -108,6 +108,11 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
 
+  *) core: Terminate token processing on NULL.
+     trunk patch: https://svn.apache.org/r1796350
+     2.2.x patch: svn merge -c 1796350 ^/httpd/httpd/trunk .
+     +1: jchampion
+
 
 PATCHES/ISSUES THAT ARE STALLED: