Mercurial > hg > nginx

diff src/stream/ngx_stream_proxy_module.c @ 6157:b2899e7d0ef8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Disabled SSLv3 by default (ticket #653).
author Maxim Dounin <mdounin@mdounin.ru>
date Mon, 25 May 2015 17:58:20 +0300
parents f1f222db290b
children 68c106e6fa0a
line wrap: on
line diff
--- a/src/stream/ngx_stream_proxy_module.c
+++ b/src/stream/ngx_stream_proxy_module.c
@@ -1139,9 +1139,8 @@ ngx_stream_proxy_merge_srv_conf(ngx_conf
                               prev->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");