Mercurial > hg > nginx
comparison src/http/modules/ngx_http_proxy_module.c @ 4400:a0505851e70c
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.
author | Maxim Dounin <mdounin@mdounin.ru> |
---|---|
date | Wed, 11 Jan 2012 11:15:00 +0000 |
parents | 3d51ba7f347b |
children | d45742815c90 |
comparison
equal
deleted
inserted
replaced
4399:d2b3130fd8d9 | 4400:a0505851e70c |
---|---|
3596 } | 3596 } |
3597 | 3597 |
3598 plcf->upstream.ssl->log = cf->log; | 3598 plcf->upstream.ssl->log = cf->log; |
3599 | 3599 |
3600 if (ngx_ssl_create(plcf->upstream.ssl, | 3600 if (ngx_ssl_create(plcf->upstream.ssl, |
3601 NGX_SSL_SSLv2|NGX_SSL_SSLv3|NGX_SSL_TLSv1, NULL) | 3601 NGX_SSL_SSLv2|NGX_SSL_SSLv3|NGX_SSL_TLSv1 |
3602 |NGX_SSL_TLSv1_1|NGX_SSL_TLSv1_2, | |
3603 NULL) | |
3602 != NGX_OK) | 3604 != NGX_OK) |
3603 { | 3605 { |
3604 return NGX_ERROR; | 3606 return NGX_ERROR; |
3605 } | 3607 } |
3606 | 3608 |