Mercurial > hg > nginx-vendor-current

comparison src/mail/ngx_mail_ssl_module.c @ 658:5a4401b9551b NGINX_1_1_13

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
nginx 1.1.13 *) Feature: the "TLSv1.1" and "TLSv1.2" parameters of the "ssl_protocols" directive. *) Bugfix: the "limit_req" directive parameters were not inherited correctly; the bug had appeared in 1.1.12. *) Bugfix: the "proxy_redirect" directive incorrectly processed "Refresh" header if regular expression were used. *) Bugfix: the "proxy_cache_use_stale" directive with "error" parameter did not return answer from cache if there were no live upstreams. *) Bugfix: the "worker_cpu_affinity" directive might not work. *) Bugfix: nginx could not be built on Solaris; the bug had appeared in 1.1.12. *) Bugfix: in the ngx_http_mp4_module.
author Igor Sysoev <http://sysoev.ru>
date Mon, 16 Jan 2012 00:00:00 +0400
parents d3cf6c6b0043
children d0f7a625f27c
comparison
equal deleted inserted replaced
657:e1296af53cc0 658:5a4401b9551b
35 35
36 static ngx_conf_bitmask_t ngx_mail_ssl_protocols[] = { 36 static ngx_conf_bitmask_t ngx_mail_ssl_protocols[] = {
37 { ngx_string("SSLv2"), NGX_SSL_SSLv2 }, 37 { ngx_string("SSLv2"), NGX_SSL_SSLv2 },
38 { ngx_string("SSLv3"), NGX_SSL_SSLv3 }, 38 { ngx_string("SSLv3"), NGX_SSL_SSLv3 },
39 { ngx_string("TLSv1"), NGX_SSL_TLSv1 }, 39 { ngx_string("TLSv1"), NGX_SSL_TLSv1 },
40 { ngx_string("TLSv1.1"), NGX_SSL_TLSv1_1 },
41 { ngx_string("TLSv1.2"), NGX_SSL_TLSv1_2 },
40 { ngx_null_string, 0 } 42 { ngx_null_string, 0 }
41 }; 43 };
42 44
43 45
44 static ngx_command_t ngx_mail_ssl_commands[] = { 46 static ngx_command_t ngx_mail_ssl_commands[] = {
204 206
205 ngx_conf_merge_value(conf->prefer_server_ciphers, 207 ngx_conf_merge_value(conf->prefer_server_ciphers,
206 prev->prefer_server_ciphers, 0); 208 prev->prefer_server_ciphers, 0);
207 209
208 ngx_conf_merge_bitmask_value(conf->protocols, prev->protocols, 210 ngx_conf_merge_bitmask_value(conf->protocols, prev->protocols,
209 (NGX_CONF_BITMASK_SET|NGX_SSL_SSLv3|NGX_SSL_TLSv1)); 211 (NGX_CONF_BITMASK_SET|NGX_SSL_SSLv3|NGX_SSL_TLSv1
212 |NGX_SSL_TLSv1_1|NGX_SSL_TLSv1_2));
210 213
211 ngx_conf_merge_str_value(conf->certificate, prev->certificate, ""); 214 ngx_conf_merge_str_value(conf->certificate, prev->certificate, "");
212 ngx_conf_merge_str_value(conf->certificate_key, prev->certificate_key, ""); 215 ngx_conf_merge_str_value(conf->certificate_key, prev->certificate_key, "");
213 216
214 ngx_conf_merge_str_value(conf->dhparam, prev->dhparam, ""); 217 ngx_conf_merge_str_value(conf->dhparam, prev->dhparam, "");