From: Yann Ylavic <ylavic@apache.org>
Date: Wed, 11 Mar 2015 10:21:02 +0000 (+0000)
Subject: Revert r1665109 and comment.
X-Git-Tag: 2.4.13~344
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=135e6e266a26f6e65119aa3d64015a34117c565f;p=apache

Revert r1665109 and comment.

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

diff --git a/STATUS b/STATUS
index 1081c39c14..644b4b4551 100644
--- a/STATUS
+++ b/STATUS
@@ -246,9 +246,13 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      to a local URL-path with the INCLUDES filter active, introduced
      in 2.4.11. PR 57531. [Yann Ylavic]
      trunk patch: http://svn.apache.org/r1664205
-                  http://svn.apache.org/r1664576
      2.4.x patch: trunk works
-     +1 covener, ylavic
+     +1 covener, jim, ylavic
+     ylavic: I removed r1664576 which is trunk only since HttpProtocol
+             directive (conformance) is not in 2.4.x, consequently not
+             a failing path in read_request_line()... Hence I also
+             restored Jim's vote (removed in r1665109 when r1664576 was
+             added), and kept Eric's mine. Good to go?
 
   *) mod_proxy_balancer: Fix HTML of balancer-manager. Bugz: 55466
      trunk patch: http://svn.apache.org/r1664356