diff options
| author | Maxim Dounin <mdounin@mdounin.ru> | 2015-05-25 17:58:20 +0300 |
|---|---|---|
| committer | Maxim Dounin <mdounin@mdounin.ru> | 2015-05-25 17:58:20 +0300 |
| commit | 724f0f028eabc32a343c4c43f38450963f623ad2 (patch) | |
| tree | 94d1c3f00575f891087b1c38fb6dc2f8f8925697 /src/http/modules/ngx_http_uwsgi_module.c | |
| parent | 226647e39742ab4e154c3e2546f7300952c3ee3f (diff) | |
| download | nginx-724f0f028eabc32a343c4c43f38450963f623ad2.tar.gz nginx-724f0f028eabc32a343c4c43f38450963f623ad2.zip | |
Disabled SSLv3 by default (ticket #653).
Diffstat (limited to 'src/http/modules/ngx_http_uwsgi_module.c')
| -rw-r--r-- | src/http/modules/ngx_http_uwsgi_module.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/http/modules/ngx_http_uwsgi_module.c b/src/http/modules/ngx_http_uwsgi_module.c index 0d0bc5857..a50c55320 100644 --- a/src/http/modules/ngx_http_uwsgi_module.c +++ b/src/http/modules/ngx_http_uwsgi_module.c @@ -1724,9 +1724,8 @@ ngx_http_uwsgi_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child) prev->upstream.ssl_session_reuse, 1); ngx_conf_merge_bitmask_value(conf->ssl_protocols, prev->ssl_protocols, - (NGX_CONF_BITMASK_SET|NGX_SSL_SSLv3 - |NGX_SSL_TLSv1|NGX_SSL_TLSv1_1 - |NGX_SSL_TLSv1_2)); + (NGX_CONF_BITMASK_SET|NGX_SSL_TLSv1 + |NGX_SSL_TLSv1_1|NGX_SSL_TLSv1_2)); ngx_conf_merge_str_value(conf->ssl_ciphers, prev->ssl_ciphers, "DEFAULT"); |