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/stream/ngx_stream_ssl_module.c | |
| parent | 226647e39742ab4e154c3e2546f7300952c3ee3f (diff) | |
| download | nginx-724f0f028eabc32a343c4c43f38450963f623ad2.tar.gz nginx-724f0f028eabc32a343c4c43f38450963f623ad2.zip | |
Disabled SSLv3 by default (ticket #653).
Diffstat (limited to 'src/stream/ngx_stream_ssl_module.c')
| -rw-r--r-- | src/stream/ngx_stream_ssl_module.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/stream/ngx_stream_ssl_module.c b/src/stream/ngx_stream_ssl_module.c index ecdd14c56..4b27a1e3e 100644 --- a/src/stream/ngx_stream_ssl_module.c +++ b/src/stream/ngx_stream_ssl_module.c @@ -211,7 +211,7 @@ ngx_stream_ssl_merge_conf(ngx_conf_t *cf, void *parent, void *child) prev->prefer_server_ciphers, 0); ngx_conf_merge_bitmask_value(conf->protocols, prev->protocols, - (NGX_CONF_BITMASK_SET|NGX_SSL_SSLv3|NGX_SSL_TLSv1 + (NGX_CONF_BITMASK_SET|NGX_SSL_TLSv1 |NGX_SSL_TLSv1_1|NGX_SSL_TLSv1_2)); ngx_conf_merge_str_value(conf->certificate, prev->certificate, ""); |