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

mod_ssl: revert r1653906, will commit an alternative just after.

The issue with r1653906 is that existing configurations like
"SSLProtocol -SSLv3" (where the default is assumed to be ALL)
won't work anymore.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1653993 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Yann Ylavic
2015-01-22 18:27:46 +00:00
parent 7e120c114b
commit 4c52577a7f
4 changed files with 8 additions and 21 deletions

View File

@@ -209,19 +209,10 @@ 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;
}