Mercurial > hg > nginx

comparison src/stream/ngx_stream_ssl_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 61d7ae76647d
children 68c106e6fa0a
comparison
equal deleted inserted replaced
6156:a88e309f839b 6157:b2899e7d0ef8
209 209
210 ngx_conf_merge_value(conf->prefer_server_ciphers, 210 ngx_conf_merge_value(conf->prefer_server_ciphers,
211 prev->prefer_server_ciphers, 0); 211 prev->prefer_server_ciphers, 0);
212 212
213 ngx_conf_merge_bitmask_value(conf->protocols, prev->protocols, 213 ngx_conf_merge_bitmask_value(conf->protocols, prev->protocols,
214 (NGX_CONF_BITMASK_SET|NGX_SSL_SSLv3|NGX_SSL_TLSv1 214 (NGX_CONF_BITMASK_SET|NGX_SSL_TLSv1
215 |NGX_SSL_TLSv1_1|NGX_SSL_TLSv1_2)); 215 |NGX_SSL_TLSv1_1|NGX_SSL_TLSv1_2));
216 216
217 ngx_conf_merge_str_value(conf->certificate, prev->certificate, ""); 217 ngx_conf_merge_str_value(conf->certificate, prev->certificate, "");
218 ngx_conf_merge_str_value(conf->certificate_key, prev->certificate_key, ""); 218 ngx_conf_merge_str_value(conf->certificate_key, prev->certificate_key, "");
219 219