Mercurial > hg > nginx

comparison src/http/modules/ngx_http_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 a84267233877
children 257b51c37c5a
comparison
equal deleted inserted replaced
6156:a88e309f839b 6157:b2899e7d0ef8
559 559
560 ngx_conf_merge_value(conf->prefer_server_ciphers, 560 ngx_conf_merge_value(conf->prefer_server_ciphers,
561 prev->prefer_server_ciphers, 0); 561 prev->prefer_server_ciphers, 0);
562 562
563 ngx_conf_merge_bitmask_value(conf->protocols, prev->protocols, 563 ngx_conf_merge_bitmask_value(conf->protocols, prev->protocols,
564 (NGX_CONF_BITMASK_SET|NGX_SSL_SSLv3|NGX_SSL_TLSv1 564 (NGX_CONF_BITMASK_SET|NGX_SSL_TLSv1
565 |NGX_SSL_TLSv1_1|NGX_SSL_TLSv1_2)); 565 |NGX_SSL_TLSv1_1|NGX_SSL_TLSv1_2));
566 566
567 ngx_conf_merge_size_value(conf->buffer_size, prev->buffer_size, 567 ngx_conf_merge_size_value(conf->buffer_size, prev->buffer_size,
568 NGX_SSL_BUFSIZE); 568 NGX_SSL_BUFSIZE);
569 569