Mercurial > hg > nginx
comparison src/http/modules/ngx_http_proxy_module.c @ 4446:fd40c9ef750d stable-1.0
Merge of r4401, r4415:
SSL changes:
*) 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.
*) Removed ENGINE_load_builtin_engines() call.
It's already called by OPENSSL_config(). Calling it again causes
some openssl engines (notably GOST) to corrupt memory, as they don't
expect to be created more than once.
| author | Maxim Dounin <mdounin@mdounin.ru> |
|---|---|
| date | Sun, 05 Feb 2012 19:15:09 +0000 |
| parents | 94b995c7c614 |
| children | 2b2d51cdbd97 |
comparison
equal
deleted
inserted
replaced
| 4445:50445a6d469e | 4446:fd40c9ef750d |
|---|---|
| 2764 } | 2764 } |
| 2765 | 2765 |
| 2766 plcf->upstream.ssl->log = cf->log; | 2766 plcf->upstream.ssl->log = cf->log; |
| 2767 | 2767 |
| 2768 if (ngx_ssl_create(plcf->upstream.ssl, | 2768 if (ngx_ssl_create(plcf->upstream.ssl, |
| 2769 NGX_SSL_SSLv2|NGX_SSL_SSLv3|NGX_SSL_TLSv1, NULL) | 2769 NGX_SSL_SSLv2|NGX_SSL_SSLv3|NGX_SSL_TLSv1 |
| 2770 |NGX_SSL_TLSv1_1|NGX_SSL_TLSv1_2, | |
| 2771 NULL) | |
| 2770 != NGX_OK) | 2772 != NGX_OK) |
| 2771 { | 2773 { |
| 2772 return NGX_ERROR; | 2774 return NGX_ERROR; |
| 2773 } | 2775 } |
| 2774 | 2776 |