From: Jacob Champion <jchampion@apache.org>
Date: Tue, 30 May 2017 20:45:42 +0000 (+0000)
Subject: Propose.
X-Git-Tag: 2.2.33~17
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3544f2edbb9d4c4e285b4f0da0291a029ae12246;p=thirdparty%2Fapache%2Fhttpd.git

Propose.

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

diff --git a/STATUS b/STATUS
index 5e029fec4f2..02174dc2512 100644
--- 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: