diff options
| author | Maxim Dounin <mdounin@mdounin.ru> | 2012-01-11 11:15:00 +0000 |
|---|---|---|
| committer | Maxim Dounin <mdounin@mdounin.ru> | 2012-01-11 11:15:00 +0000 |
| commit | 4efcbce3289803bb087ff78ee2b3784558daed27 (patch) | |
| tree | 767425e1ddffacfb6a1bc67be546a68a482284bb /src/http/modules/ngx_http_proxy_module.c | |
| parent | f2ef9db230374f5f8ff31ea3f09e02b55da892b5 (diff) | |
| download | nginx-4efcbce3289803bb087ff78ee2b3784558daed27.tar.gz nginx-4efcbce3289803bb087ff78ee2b3784558daed27.zip | |
Added support for TLSv1.1, TLSv1.2 in ssl_protocols directive.
Support for TLSv1.1 and TLSv1.2 protocols was introduced in OpenSSL 1.0.1
(-beta1 was recently released). This change makes it possible to disable
these protocols and/or enable them without other protocols.
Diffstat (limited to 'src/http/modules/ngx_http_proxy_module.c')
| -rw-r--r-- | src/http/modules/ngx_http_proxy_module.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/http/modules/ngx_http_proxy_module.c b/src/http/modules/ngx_http_proxy_module.c index 78817cea8..5329351e4 100644 --- a/src/http/modules/ngx_http_proxy_module.c +++ b/src/http/modules/ngx_http_proxy_module.c @@ -3598,7 +3598,9 @@ ngx_http_proxy_set_ssl(ngx_conf_t *cf, ngx_http_proxy_loc_conf_t *plcf) plcf->upstream.ssl->log = cf->log; if (ngx_ssl_create(plcf->upstream.ssl, - NGX_SSL_SSLv2|NGX_SSL_SSLv3|NGX_SSL_TLSv1, NULL) + NGX_SSL_SSLv2|NGX_SSL_SSLv3|NGX_SSL_TLSv1 + |NGX_SSL_TLSv1_1|NGX_SSL_TLSv1_2, + NULL) != NGX_OK) { return NGX_ERROR; |