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 B2452EBC0 for ; Mon, 28 Jan 2013 14:31:56 +0000 (UTC) Received: (qmail 95183 invoked by uid 500); 28 Jan 2013 14:31:56 -0000 Delivered-To: apmail-httpd-cvs-archive@httpd.apache.org Received: (qmail 94964 invoked by uid 500); 28 Jan 2013 14:31:55 -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 94940 invoked by uid 99); 28 Jan 2013 14:31:55 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 28 Jan 2013 14:31:55 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 28 Jan 2013 14:31:52 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 225012388A32; Mon, 28 Jan 2013 14:31:33 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1439424 - /httpd/httpd/branches/2.4.x/STATUS Date: Mon, 28 Jan 2013 14:31:33 -0000 To: cvs@httpd.apache.org From: jim@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130128143133.225012388A32@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: jim Date: Mon Jan 28 14:31:32 2013 New Revision: 1439424 URL: http://svn.apache.org/viewvc?rev=1439424&view=rev Log: PPI patch from dev@ discussion 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=1439424&r1=1439423&r2=1439424&view=diff ============================================================================== --- httpd/httpd/branches/2.4.x/STATUS (original) +++ httpd/httpd/branches/2.4.x/STATUS Mon Jan 28 14:31:32 2013 @@ -95,6 +95,7 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK: trunk patch: https://svn.apache.org/viewvc/httpd/httpd/trunk/acinclude.m4?r1=1396440&r2=1429228 2.4.x patch: trunk patch works +1: kbrand, jorton, jerenkrantz + -1: jim: patch doesn't apply (2 out of 2 hunks FAILED -- saving rejects to file acinclude.m4.rej) PATCHES PROPOSED TO BACKPORT FROM TRUNK: [ New proposals should be added at the end of the list ] @@ -149,6 +150,12 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK: jim: are we OK with changing the 2.4.x docs async? druggeri: sure - just noting that as-applied it would be incorrect + * mod_proxy: Allow ProxyPass to also be server-specific. + trunk patch: http://svn.apache.org/viewvc?view=revision&revision=1439404 + 2.4.x patch: trunk patch works modulo ap_mmn and docs ("2.5.0") + Assumes BalancerInherit patch above. + +1: + * mod_ssl: Allow the SSLUserName to be used to control the username passed by the FakeBasicAuth option. PR52616. trunk patch: http://svn.apache.org/viewvc?rev=1432322&view=rev