From: Ruediger Pluem Date: Thu, 18 Oct 2018 09:47:02 +0000 (+0000) Subject: * Vote X-Git-Tag: 2.4.37~7 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7a749c698274fdd02c0ed8bae38e7473ad49dca4;p=thirdparty%2Fapache%2Fhttpd.git * Vote git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1844221 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/STATUS b/STATUS index e1261eee6ac..5b6a2c57375 100644 --- a/STATUS +++ b/STATUS @@ -178,7 +178,7 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK: *) mod_ssl: We need to get the SSL_CTX for further processing down below. trunk patch: http://svn.apache.org/r1828793 2.4.x patch: svn merge -c 1828793 ^/httpd/httpd/trunk . - +1: rjung + +1: rjung, rpluem *) mod_ssl: Correctly merge configurations that have client certificates set by SSLProxyMachineCertificate{File|Path}. @@ -188,7 +188,7 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK: This fixes a regression likely introduced in r1740928 (backported in r1824187). trunk patch: http://svn.apache.org/r1844002 2.4.x patch: svn merge -c 1844002 ^/httpd/httpd/trunk . - +1: rjung + +1: rjung, rpluem PATCHES/ISSUES THAT ARE BEING WORKED