]> granicus.if.org Git - apache/commit
Merge r1829513 from trunk:
authorYann Ylavic <ylavic@apache.org>
Tue, 29 May 2018 21:27:15 +0000 (21:27 +0000)
committerYann Ylavic <ylavic@apache.org>
Tue, 29 May 2018 21:27:15 +0000 (21:27 +0000)
commit946f1e6b974e96802d89bd98db59bf6887bca1d2
tree417dde552b0ebe77f8c6d9724e701607bfa0787d
parent977ba104263821c380d66da76360466841027674
Merge r1829513 from trunk:

* modules/ssl/ssl_engine_init.c (ssl_init_Module): Don't enable SSL
  for a vhost if SSLEnable is not used and no certs are configured,
  even if the Listen protocol is "https".  Restores behaviour to that
  prior to r1809303 for configs which would now otherwise fail at
  startup.

Submitted by: jorton
Reviewed by: jorton, jim, ylavic

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1832495 13f79535-47bb-0310-9956-ffa450edef68
CHANGES
modules/ssl/ssl_engine_init.c