Mercurial > hg > nginx
comparison src/http/modules/ngx_http_proxy_module.c @ 6157:b2899e7d0ef8
Disabled SSLv3 by default (ticket #653).
author | Maxim Dounin <mdounin@mdounin.ru> |
---|---|
date | Mon, 25 May 2015 17:58:20 +0300 |
parents | 24ccec3c4a87 |
children | 4d5ac1a31d44 |
comparison
equal
deleted
inserted
replaced
6156:a88e309f839b | 6157:b2899e7d0ef8 |
---|---|
3166 | 3166 |
3167 ngx_conf_merge_value(conf->upstream.ssl_session_reuse, | 3167 ngx_conf_merge_value(conf->upstream.ssl_session_reuse, |
3168 prev->upstream.ssl_session_reuse, 1); | 3168 prev->upstream.ssl_session_reuse, 1); |
3169 | 3169 |
3170 ngx_conf_merge_bitmask_value(conf->ssl_protocols, prev->ssl_protocols, | 3170 ngx_conf_merge_bitmask_value(conf->ssl_protocols, prev->ssl_protocols, |
3171 (NGX_CONF_BITMASK_SET|NGX_SSL_SSLv3 | 3171 (NGX_CONF_BITMASK_SET|NGX_SSL_TLSv1 |
3172 |NGX_SSL_TLSv1|NGX_SSL_TLSv1_1 | 3172 |NGX_SSL_TLSv1_1|NGX_SSL_TLSv1_2)); |
3173 |NGX_SSL_TLSv1_2)); | |
3174 | 3173 |
3175 ngx_conf_merge_str_value(conf->ssl_ciphers, prev->ssl_ciphers, | 3174 ngx_conf_merge_str_value(conf->ssl_ciphers, prev->ssl_ciphers, |
3176 "DEFAULT"); | 3175 "DEFAULT"); |
3177 | 3176 |
3178 if (conf->upstream.ssl_name == NULL) { | 3177 if (conf->upstream.ssl_name == NULL) { |