Mercurial > hg > nginx
comparison src/stream/ngx_stream_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 | f1f222db290b |
children | 68c106e6fa0a |
comparison
equal
deleted
inserted
replaced
6156:a88e309f839b | 6157:b2899e7d0ef8 |
---|---|
1137 | 1137 |
1138 ngx_conf_merge_value(conf->ssl_session_reuse, | 1138 ngx_conf_merge_value(conf->ssl_session_reuse, |
1139 prev->ssl_session_reuse, 1); | 1139 prev->ssl_session_reuse, 1); |
1140 | 1140 |
1141 ngx_conf_merge_bitmask_value(conf->ssl_protocols, prev->ssl_protocols, | 1141 ngx_conf_merge_bitmask_value(conf->ssl_protocols, prev->ssl_protocols, |
1142 (NGX_CONF_BITMASK_SET|NGX_SSL_SSLv3 | 1142 (NGX_CONF_BITMASK_SET|NGX_SSL_TLSv1 |
1143 |NGX_SSL_TLSv1|NGX_SSL_TLSv1_1 | 1143 |NGX_SSL_TLSv1_1|NGX_SSL_TLSv1_2)); |
1144 |NGX_SSL_TLSv1_2)); | |
1145 | 1144 |
1146 ngx_conf_merge_str_value(conf->ssl_ciphers, prev->ssl_ciphers, "DEFAULT"); | 1145 ngx_conf_merge_str_value(conf->ssl_ciphers, prev->ssl_ciphers, "DEFAULT"); |
1147 | 1146 |
1148 ngx_conf_merge_str_value(conf->ssl_name, prev->ssl_name, ""); | 1147 ngx_conf_merge_str_value(conf->ssl_name, prev->ssl_name, ""); |
1149 | 1148 |