Mercurial > hg > nginx-vendor-1-0
comparison src/mail/ngx_mail_ssl_module.c @ 644:ad25218fd14b NGINX_1_0_12
nginx 1.0.12
*) Feature: the "TLSv1.1" and "TLSv1.2" parameters of the
"ssl_protocols" directive.
*) Feature: the "if" SSI command supports captures in regular
expressions.
*) Bugfix: the "if" SSI command did not work inside the "block" command.
*) Bugfix: in AIO error handling on FreeBSD.
*) Bugfix: in the OpenSSL library initialization.
*) Bugfix: the "worker_cpu_affinity" directive might not work.
*) Bugfix: the "limit_conn_log_level" and "limit_req_log_level"
directives might not work.
*) Bugfix: the "read_ahead" directive might not work combined with
"try_files" and "open_file_cache".
*) Bugfix: the "proxy_cache_use_stale" directive with "error" parameter
did not return answer from cache if there were no live upstreams.
*) Bugfix: a segmentation fault might occur in a worker process if small
time was used in the "inactive" parameter of the "proxy_cache_path"
directive.
*) Bugfix: responses from cache might hang.
*) Bugfix: in error handling while connecting to a backend.
Thanks to Piotr Sikora.
*) Bugfix: in the "epoll" event method.
Thanks to Yichun Zhang.
*) Bugfix: the $sent_http_cache_control variable might contain a wrong
value if the "expires" directive was used.
Thanks to Yichun Zhang.
*) Bugfix: the "limit_rate" directive did not allow to use full
throughput, even if limit value was very high.
*) Bugfix: the "sendfile_max_chunk" directive did not work, if the
"limit_rate" directive was used.
*) Bugfix: nginx could not be built on Solaris; the bug had appeared in
1.0.11.
*) Bugfix: in the ngx_http_scgi_module.
*) Bugfix: in the ngx_http_mp4_module.
author | Igor Sysoev <http://sysoev.ru> |
---|---|
date | Mon, 06 Feb 2012 00:00:00 +0400 |
parents | 0d6525917227 |
children |
comparison
equal
deleted
inserted
replaced
643:d81e1c257a02 | 644:ad25218fd14b |
---|---|
1 | 1 |
2 /* | 2 /* |
3 * Copyright (C) Igor Sysoev | 3 * Copyright (C) Igor Sysoev |
4 * Copyright (C) Nginx, Inc. | |
4 */ | 5 */ |
5 | 6 |
6 | 7 |
7 #include <ngx_config.h> | 8 #include <ngx_config.h> |
8 #include <ngx_core.h> | 9 #include <ngx_core.h> |
35 | 36 |
36 static ngx_conf_bitmask_t ngx_mail_ssl_protocols[] = { | 37 static ngx_conf_bitmask_t ngx_mail_ssl_protocols[] = { |
37 { ngx_string("SSLv2"), NGX_SSL_SSLv2 }, | 38 { ngx_string("SSLv2"), NGX_SSL_SSLv2 }, |
38 { ngx_string("SSLv3"), NGX_SSL_SSLv3 }, | 39 { ngx_string("SSLv3"), NGX_SSL_SSLv3 }, |
39 { ngx_string("TLSv1"), NGX_SSL_TLSv1 }, | 40 { ngx_string("TLSv1"), NGX_SSL_TLSv1 }, |
41 { ngx_string("TLSv1.1"), NGX_SSL_TLSv1_1 }, | |
42 { ngx_string("TLSv1.2"), NGX_SSL_TLSv1_2 }, | |
40 { ngx_null_string, 0 } | 43 { ngx_null_string, 0 } |
41 }; | 44 }; |
42 | 45 |
43 | 46 |
44 static ngx_command_t ngx_mail_ssl_commands[] = { | 47 static ngx_command_t ngx_mail_ssl_commands[] = { |
204 | 207 |
205 ngx_conf_merge_value(conf->prefer_server_ciphers, | 208 ngx_conf_merge_value(conf->prefer_server_ciphers, |
206 prev->prefer_server_ciphers, 0); | 209 prev->prefer_server_ciphers, 0); |
207 | 210 |
208 ngx_conf_merge_bitmask_value(conf->protocols, prev->protocols, | 211 ngx_conf_merge_bitmask_value(conf->protocols, prev->protocols, |
209 (NGX_CONF_BITMASK_SET|NGX_SSL_SSLv3|NGX_SSL_TLSv1)); | 212 (NGX_CONF_BITMASK_SET|NGX_SSL_SSLv3|NGX_SSL_TLSv1 |
213 |NGX_SSL_TLSv1_1|NGX_SSL_TLSv1_2)); | |
210 | 214 |
211 ngx_conf_merge_str_value(conf->certificate, prev->certificate, ""); | 215 ngx_conf_merge_str_value(conf->certificate, prev->certificate, ""); |
212 ngx_conf_merge_str_value(conf->certificate_key, prev->certificate_key, ""); | 216 ngx_conf_merge_str_value(conf->certificate_key, prev->certificate_key, ""); |
213 | 217 |
214 ngx_conf_merge_str_value(conf->dhparam, prev->dhparam, ""); | 218 ngx_conf_merge_str_value(conf->dhparam, prev->dhparam, ""); |