From: Kaspar Brand <kbrand@apache.org>
Date: Sat, 13 Apr 2013 11:25:02 +0000 (+0000)
Subject: propose, vote
X-Git-Tag: 2.2.25~89
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=95df17f5ecc9274a6acb6990fafaa65490969f5d;p=thirdparty%2Fapache%2Fhttpd.git

propose, vote

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

diff --git a/STATUS b/STATUS
index f3dc3ed1e3b..1e8fcc032f7 100644
--- a/STATUS
+++ b/STATUS
@@ -199,7 +199,7 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
     trunk patch: http://svn.apache.org/viewvc?view=revision&revision=1447993
     2.4.x patch: trunk patch applies.
     2.2.x patch: http://people.apache.org/~wrowe/httpd-2.2-quiet-fips.patch
-    +1: wrowe, druggeri
+    +1: wrowe, druggeri, kbrand
 
   * mod_proxy_balancer: Add failontimeout parameter. Timeout will put worker
     in error state if an IO timeout is detected.
@@ -214,6 +214,17 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
       https://issues.apache.org/bugzilla/attachment.cgi?id=30179&action=diff
     +1: wrowe, 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,
+
 PATCHES/ISSUES THAT ARE STALLED
 
   * core: Support wildcards in both the directory and file components of