From: Graham Leggett <minfrin@apache.org>
Date: Sun, 23 Sep 2018 21:47:02 +0000 (+0000)
Subject: Propose.
X-Git-Tag: 2.4.36~30
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ab9b4a2157371035ec6cc312a5ae05e6e4ac7803;p=thirdparty%2Fapache%2Fhttpd.git

Propose.


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

diff --git a/STATUS b/STATUS
index e22e491e5ae..29e9667c436 100644
--- a/STATUS
+++ b/STATUS
@@ -189,6 +189,12 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      2.4.x branch: svn merge -c 1841446,1841455 ^/httpd/httpd/trunk .
      +1: icing, minfrin
 
+  *) ab: Add client certificate support.
+     trunk: http://svn.apache.org/r1841784
+     2.4.x: svn merge -c r1841784 ^/httpd/httpd/trunk .
+     (requires r1738415 and r1826930 above to resolve conflict)
+     +1: minfrin
+
 
 PATCHES/ISSUES THAT ARE BEING WORKED
   [ New entries should be added at the START of the list ]