Mailing-List: contact cvs-help@httpd.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@httpd.apache.org
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1758667 - /httpd/httpd/branches/2.2.x/STATUS
Date: Wed, 31 Aug 2016 19:28:36 -0000
To: cvs@httpd.apache.org
From: ylavic@apache.org
Message-Id: <20160831192837.B621D3A0D27@svn01-us-west.apache.org>
archived-at: Wed, 31 Aug 2016 19:28:44 -0000

Author: ylavic
Date: Wed Aug 31 19:28:36 2016
New Revision: 1758667

URL: http://svn.apache.org/viewvc?rev=1758667&view=rev
Log:
Vote, promote, but the second proposal does not apply cleanly...

Modified:
    httpd/httpd/branches/2.2.x/STATUS

Modified: httpd/httpd/branches/2.2.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/STATUS?rev=1758667&r1=1758666&r2=1758667&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/STATUS (original)
+++ httpd/httpd/branches/2.2.x/STATUS Wed Aug 31 19:28:36 2016
@@ -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.