1
0
mirror of https://github.com/apache/httpd.git synced 2025-08-08 15:02:10 +03:00

On the trunk:

mod_ssl: Extending SSLEngine to alternatively get a list of add:port spec as used in VirtualHost.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1807709 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Stefan Eissing
2017-09-08 10:29:53 +00:00
parent 4cc2782389
commit 55956ee619
6 changed files with 162 additions and 36 deletions

View File

@@ -269,6 +269,13 @@ apr_status_t ssl_init_Module(apr_pool_t *p, apr_pool_t *plog,
if (sc->enabled == SSL_ENABLED_UNSET) {
sc->enabled = SSL_ENABLED_FALSE;
}
/* Check if conditions to enable apply to this server at all. Conditions
* might be inherited from base server and never match a vhost. */
if (sc->enabled_on && sc->enabled == SSL_ENABLED_TRUE) {
if (!ssl_server_addr_overlap(sc->enabled_on, s->addrs)) {
sc->enabled = SSL_ENABLED_FALSE;
}
}
if (sc->session_cache_timeout == UNSET) {
sc->session_cache_timeout = SSL_SESSION_CACHE_TIMEOUT;