Commit 675d4876 authored by Rainer Jung's avatar Rainer Jung
Browse files

Another mod_ssl backport proposal. 


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

STATUS

+10 −0
Original line number Diff line number Diff line
@@ -180,6 +180,16 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK: 
     2.4.x patch: svn merge -c 1828793 ^/httpd/httpd/trunk .

     +1: rjung



  *) mod_ssl: Correctly merge configurations that have client certificates set

   by SSLProxyMachineCertificate{File|Path}.

   The certificates and keys loaded during configuration time got lost during

   runtime if e.g. SSLProxyMachineCertificate{File|Path} was set on virtual host

   level and there was an SSL directive at directory level, e.g. SSLRequire.

   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





PATCHES/ISSUES THAT ARE BEING WORKED

  [ New entries should be added at the START of the list ]