From: Yann Ylavic <ylavic@apache.org>
Date: Wed, 31 Aug 2016 19:28:36 +0000 (+0000)
Subject: Vote, promote, but the second proposal does not apply cleanly...
X-Git-Tag: 2.2.32~84
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=66397b850ef9be10288c5b876870f7b9008e81a7;p=thirdparty%2Fapache%2Fhttpd.git

Vote, promote, but the second proposal does not apply cleanly...

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

diff --git a/STATUS b/STATUS
index 88395963d56..003ab7a7630 100644
--- a/STATUS
+++ b/STATUS
@@ -103,6 +103,19 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
+  *) core: Reject requests containing (invalid) NULL characters in request line
+     or request headers. (Including embedded %00 in URL).
+     (Use APR_STATUS_IS_... in some more cases.)
+     Trunk version of patch
+         http://svn.apache.org/r892678
+         http://svn.apache.org/r1100511
+         http://svn.apache.org/r1102124
+     Backport: (trunk works as well)
+         https://raw.githubusercontent.com/wrowe/patches/master/backport-2.2.x-r892678.patch
+     Submitted by niq, status legibility fixes by covener, sf
+     PR: 43039
+     +1: wrowe, covener, ylavic
+
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
@@ -154,22 +167,9 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
       Backport version for 2.4.x of patch:
          http://svn.apache.org/r1756562
       Backport version for 2.2.x of patch:
-	 http://home.apache.org/~ylavic/patches/httpd-2.2.x-r1753592.patch
+         http://home.apache.org/~ylavic/patches/httpd-2.2.x-r1753592.patch
       +1: ylavic
 
-  *) core: Reject requests containing (invalid) NULL characters in request line
-     or request headers. (Including embedded %00 in URL).
-     (Use APR_STATUS_IS_... in some more cases.)
-     Trunk version of patch
-         http://svn.apache.org/r892678
-         http://svn.apache.org/r1100511
-         http://svn.apache.org/r1102124
-     Backport: (trunk works as well)
-         https://raw.githubusercontent.com/wrowe/patches/master/backport-2.2.x-r892678.patch
-     Submitted by niq, status legibility fixes by covener, sf
-     PR: 43039
-     +1: wrowe, covener
-
   *) Enforce LimitRequestFieldSize after multiple headers with the same
      name have been merged, Ensure LimitRequestFieldSize is always logged.
      Downgrade some more log messages indicating client errors from level error
@@ -192,6 +192,8 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      Backport: (Adjustments dodging 2.4'isms such as APLOGNO's)
          https://raw.githubusercontent.com/wrowe/patches/master/backport-2.2.x-r951900-r1178566-r1185385-r1188745-r1352911-r1433613.patch 
      +1: wrowe, covener
+     ylavic: the patch does not apply cleanly? (I tried both w/ and w/o
+             backport-2.2.x-r892678.patch first, conflicts in protocol.c)
 
   *) core: ErrorDocument now works for requests without a Host header.
      Support custom ErrorDocuments for HTTP 501 and 414 status codes.