From: Jim Jagielski Date: Fri, 5 Oct 2018 11:51:45 +0000 (+0000) Subject: Backport votes X-Git-Tag: 2.4.36~24 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=725691682dae9cbbbba27fa2dc159c681623ebd3;p=thirdparty%2Fapache%2Fhttpd.git Backport votes git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1842895 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/STATUS b/STATUS index 29e9667c436..dd23feaf646 100644 --- a/STATUS +++ b/STATUS @@ -187,13 +187,13 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK: trunk: http://svn.apache.org/r1841446 trunk: http://svn.apache.org/r1841455 2.4.x branch: svn merge -c 1841446,1841455 ^/httpd/httpd/trunk . - +1: icing, minfrin + +1: icing, minfrin, jim *) 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 + +1: minfrin, jim PATCHES/ISSUES THAT ARE BEING WORKED