Mercurial > hg > nginx-ranges
comparison src/mail/ngx_mail_ssl_module.c @ 546:a52c99698e7f NGINX_0_8_19
nginx 0.8.19
*) Change: now SSLv2 protocol is disabled by default.
*) Change: now default SSL ciphers are "ALL:!ADH:RC4+RSA:+HIGH:+MEDIUM".
*) Bugfix: a "limit_req" directive did not work; the bug had appeared
in 0.8.18.
author | Igor Sysoev <http://sysoev.ru> |
---|---|
date | Tue, 06 Oct 2009 00:00:00 +0400 |
parents | 24b676623d4f |
children | 0dc162a5f3e8 |
comparison
equal
deleted
inserted
replaced
545:4a44adbff19a | 546:a52c99698e7f |
---|---|
7 #include <ngx_config.h> | 7 #include <ngx_config.h> |
8 #include <ngx_core.h> | 8 #include <ngx_core.h> |
9 #include <ngx_mail.h> | 9 #include <ngx_mail.h> |
10 | 10 |
11 | 11 |
12 #define NGX_DEFAULT_CIPHERS "ALL:!ADH:RC4+RSA:+HIGH:+MEDIUM:+LOW:+SSLv2:+EXP" | 12 #define NGX_DEFAULT_CIPHERS "ALL:!ADH:RC4+RSA:+HIGH:+MEDIUM" |
13 | 13 |
14 | 14 |
15 static void *ngx_mail_ssl_create_conf(ngx_conf_t *cf); | 15 static void *ngx_mail_ssl_create_conf(ngx_conf_t *cf); |
16 static char *ngx_mail_ssl_merge_conf(ngx_conf_t *cf, void *parent, void *child); | 16 static char *ngx_mail_ssl_merge_conf(ngx_conf_t *cf, void *parent, void *child); |
17 | 17 |
196 | 196 |
197 ngx_conf_merge_value(conf->prefer_server_ciphers, | 197 ngx_conf_merge_value(conf->prefer_server_ciphers, |
198 prev->prefer_server_ciphers, 0); | 198 prev->prefer_server_ciphers, 0); |
199 | 199 |
200 ngx_conf_merge_bitmask_value(conf->protocols, prev->protocols, | 200 ngx_conf_merge_bitmask_value(conf->protocols, prev->protocols, |
201 (NGX_CONF_BITMASK_SET | 201 (NGX_CONF_BITMASK_SET|NGX_SSL_SSLv3|NGX_SSL_TLSv1)); |
202 |NGX_SSL_SSLv2|NGX_SSL_SSLv3|NGX_SSL_TLSv1)); | |
203 | 202 |
204 ngx_conf_merge_str_value(conf->certificate, prev->certificate, ""); | 203 ngx_conf_merge_str_value(conf->certificate, prev->certificate, ""); |
205 ngx_conf_merge_str_value(conf->certificate_key, prev->certificate_key, ""); | 204 ngx_conf_merge_str_value(conf->certificate_key, prev->certificate_key, ""); |
206 | 205 |
207 ngx_conf_merge_str_value(conf->dhparam, prev->dhparam, ""); | 206 ngx_conf_merge_str_value(conf->dhparam, prev->dhparam, ""); |