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

Fix merge problem with SSLProtocol that made SSLProtocol ALL ignored

Browse Source 
in virtualhost context.

Submitted By: Michael Kaufmann <apache-bugzilla michael-kaufmann.ch>
Commited By: covener



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1653906 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Eric Covener
2015-01-22 15:19:39 +00:00
parent 09a7ffc55d
commit 6d6a8a16f1
4 changed files with 21 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
modules/ssl/ssl_engine_init.c
View File

@@ -209,10 +209,19 @@ 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;
}
if (sc->proxy_enabled == UNSET) {
sc->proxy_enabled = FALSE;
}
if (sc->server && sc->server->protocol == SSL_PROTOCOL_UNSET) {
sc->server->protocol = SSL_PROTOCOL_ALL;
}
if (sc->proxy && sc->proxy->protocol == SSL_PROTOCOL_UNSET) {
sc->proxy->protocol = SSL_PROTOCOL_ALL;
}
if (sc->session_cache_timeout == UNSET) {
sc->session_cache_timeout = SSL_SESSION_CACHE_TIMEOUT;
}