Return-Path: X-Original-To: apmail-httpd-cvs-archive@www.apache.org Delivered-To: apmail-httpd-cvs-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 9FED010643 for ; Wed, 11 Mar 2015 10:21:03 +0000 (UTC) Received: (qmail 94843 invoked by uid 500); 11 Mar 2015 10:21:03 -0000 Delivered-To: apmail-httpd-cvs-archive@httpd.apache.org Received: (qmail 94779 invoked by uid 500); 11 Mar 2015 10:21:03 -0000 Mailing-List: contact cvs-help@httpd.apache.org; run by ezmlm Precedence: bulk Reply-To: dev@httpd.apache.org list-help: list-unsubscribe: List-Post: List-Id: Delivered-To: mailing list cvs@httpd.apache.org Received: (qmail 94770 invoked by uid 99); 11 Mar 2015 10:21:03 -0000 Received: from eris.apache.org (HELO hades.apache.org) (140.211.11.105) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 11 Mar 2015 10:21:03 +0000 Received: from hades.apache.org (localhost [127.0.0.1]) by hades.apache.org (ASF Mail Server at hades.apache.org) with ESMTP id E8D8EAC0163 for ; Wed, 11 Mar 2015 10:21:02 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1665831 - /httpd/httpd/branches/2.4.x/STATUS Date: Wed, 11 Mar 2015 10:21:02 -0000 To: cvs@httpd.apache.org From: ylavic@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20150311102102.E8D8EAC0163@hades.apache.org> Author: ylavic Date: Wed Mar 11 10:21:02 2015 New Revision: 1665831 URL: http://svn.apache.org/r1665831 Log: Revert r1665109 and comment. Modified: httpd/httpd/branches/2.4.x/STATUS Modified: httpd/httpd/branches/2.4.x/STATUS URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/STATUS?rev=1665831&r1=1665830&r2=1665831&view=diff ============================================================================== --- httpd/httpd/branches/2.4.x/STATUS (original) +++ httpd/httpd/branches/2.4.x/STATUS Wed Mar 11 10:21:02 2015 @@ -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