]> granicus.if.org Git - apache/commitdiff
Revert r1665109 and comment.
authorYann Ylavic <ylavic@apache.org>
Wed, 11 Mar 2015 10:21:02 +0000 (10:21 +0000)
committerYann Ylavic <ylavic@apache.org>
Wed, 11 Mar 2015 10:21:02 +0000 (10:21 +0000)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1665831 13f79535-47bb-0310-9956-ffa450edef68

STATUS

diff --git a/STATUS b/STATUS
index 1081c39c14261cc4cb5ea10266baf5bc372c00b4..644b4b4551f4db818ed2e7e4cb453cbff96eec3f 100644 (file)
--- 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