Mercurial > hg > nginx
diff src/http/modules/ngx_http_proxy_module.c @ 6157:b2899e7d0ef8
Disabled SSLv3 by default (ticket #653).
author | Maxim Dounin <mdounin@mdounin.ru> |
---|---|
date | Mon, 25 May 2015 17:58:20 +0300 |
parents | 24ccec3c4a87 |
children | 4d5ac1a31d44 |
line wrap: on
line diff
--- a/src/http/modules/ngx_http_proxy_module.c +++ b/src/http/modules/ngx_http_proxy_module.c @@ -3168,9 +3168,8 @@ ngx_http_proxy_merge_loc_conf(ngx_conf_t prev->upstream.ssl_session_reuse, 1); ngx_conf_merge_bitmask_value(conf->ssl_protocols, prev->ssl_protocols, - (NGX_CONF_BITMASK_SET|NGX_SSL_SSLv3 - |NGX_SSL_TLSv1|NGX_SSL_TLSv1_1 - |NGX_SSL_TLSv1_2)); + (NGX_CONF_BITMASK_SET|NGX_SSL_TLSv1 + |NGX_SSL_TLSv1_1|NGX_SSL_TLSv1_2)); ngx_conf_merge_str_value(conf->ssl_ciphers, prev->ssl_ciphers, "DEFAULT");