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 2A944C3BD for ; Fri, 21 Jun 2013 15:26:26 +0000 (UTC) Received: (qmail 78169 invoked by uid 500); 21 Jun 2013 15:26:22 -0000 Delivered-To: apmail-httpd-cvs-archive@httpd.apache.org Received: (qmail 77878 invoked by uid 500); 21 Jun 2013 15:26:20 -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 77871 invoked by uid 99); 21 Jun 2013 15:26:18 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 21 Jun 2013 15:26:18 +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; Fri, 21 Jun 2013 15:26:17 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 4BE0223888FE; Fri, 21 Jun 2013 15:25:58 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1495476 - /httpd/httpd/branches/2.2.x/STATUS Date: Fri, 21 Jun 2013 15:25:58 -0000 To: cvs@httpd.apache.org From: wrowe@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130621152558.4BE0223888FE@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: wrowe Date: Fri Jun 21 15:25:57 2013 New Revision: 1495476 URL: http://svn.apache.org/r1495476 Log: votes, promote 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=1495476&r1=1495475&r2=1495476&view=diff ============================================================================== --- httpd/httpd/branches/2.2.x/STATUS (original) +++ httpd/httpd/branches/2.2.x/STATUS Fri Jun 21 15:25:57 2013 @@ -106,6 +106,17 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK: (20130412 - updated to not use static var - thx, wrowe) +1: druggeri, minfrin. wrowe + * mod_ssl: Catch missing, mismatched or encrypted client cert/key pairs + with SSLProxyMachineCertificateFile/Path directives. PR 52212, PR 54698. + (check at startup, to prevent segfaults at proxy request time) + trunk patches: https://svn.apache.org/r1374214 + https://svn.apache.org/r1374216 + https://svn.apache.org/r1375445 + https://svn.apache.org/r1467593 + 2.4.x patch: https://people.apache.org/~kbrand/PR52212_54698_2.4.x.patch + 2.2.x patch: https://people.apache.org/~kbrand/PR52212_54698_2.2.x.patch + +1: kbrand, minfrin, wrowe + PATCHES PROPOSED TO BACKPORT FROM TRUNK: [ New proposals should be added at the end of the list ] @@ -177,18 +188,7 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK: trunk patch: http://svn.apache.org/viewvc?view=revision&revision=1465839 2.4.x patch: http://people.apache.org/~druggeri/patches/httpd-2.4.x-failontimeout.patch 2.2.x patch: http://people.apache.org/~druggeri/patches/httpd-2.2.x-failontimeout.patch - +1: druggeri - - * mod_ssl: Catch missing, mismatched or encrypted client cert/key pairs - with SSLProxyMachineCertificateFile/Path directives. PR 52212, PR 54698. - (check at startup, to prevent segfaults at proxy request time) - trunk patches: https://svn.apache.org/r1374214 - https://svn.apache.org/r1374216 - https://svn.apache.org/r1375445 - https://svn.apache.org/r1467593 - 2.4.x patch: https://people.apache.org/~kbrand/PR52212_54698_2.4.x.patch - 2.2.x patch: https://people.apache.org/~kbrand/PR52212_54698_2.2.x.patch - +1: kbrand, minfrin + +1: druggeri, wrowe * mod_dav: Make sure that when we prepare an If URL for Etag comparison, we compare unencoded paths. PR 53910