Mercurial > hg > nginx

comparison src/http/modules/ngx_http_uwsgi_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 b6eb6ec4fbd9
children a93345ee8f52
comparison
equal deleted inserted replaced
6156:a88e309f839b 6157:b2899e7d0ef8
1722 1722
1723 ngx_conf_merge_value(conf->upstream.ssl_session_reuse, 1723 ngx_conf_merge_value(conf->upstream.ssl_session_reuse,
1724 prev->upstream.ssl_session_reuse, 1); 1724 prev->upstream.ssl_session_reuse, 1);
1725 1725
1726 ngx_conf_merge_bitmask_value(conf->ssl_protocols, prev->ssl_protocols, 1726 ngx_conf_merge_bitmask_value(conf->ssl_protocols, prev->ssl_protocols,
1727 (NGX_CONF_BITMASK_SET|NGX_SSL_SSLv3 1727 (NGX_CONF_BITMASK_SET|NGX_SSL_TLSv1
1728 |NGX_SSL_TLSv1|NGX_SSL_TLSv1_1 1728 |NGX_SSL_TLSv1_1|NGX_SSL_TLSv1_2));
1729 |NGX_SSL_TLSv1_2));
1730 1729
1731 ngx_conf_merge_str_value(conf->ssl_ciphers, prev->ssl_ciphers, 1730 ngx_conf_merge_str_value(conf->ssl_ciphers, prev->ssl_ciphers,
1732 "DEFAULT"); 1731 "DEFAULT");
1733 1732
1734 if (conf->upstream.ssl_name == NULL) { 1733 if (conf->upstream.ssl_name == NULL) {