diff options
| author | Sergey Kandaurov <pluknet@nginx.com> | 2021-09-01 10:57:25 +0300 |
|---|---|---|
| committer | Sergey Kandaurov <pluknet@nginx.com> | 2021-09-01 10:57:25 +0300 |
| commit | 72af057584ac7cb3822e4898f5566f7d27c70ebd (patch) | |
| tree | 929f00aca9e2178b239e3baaf7e3d0b8a090be5e /src/http/modules/ngx_http_proxy_module.c | |
| parent | 68d4325de08053f4cb0db590dc72ef9494c33bd6 (diff) | |
| parent | a80a0601b95f58146381d8f208d4de293da7a239 (diff) | |
| download | nginx-72af057584ac7cb3822e4898f5566f7d27c70ebd.tar.gz nginx-72af057584ac7cb3822e4898f5566f7d27c70ebd.zip | |
Merged with the default branch.
Diffstat (limited to 'src/http/modules/ngx_http_proxy_module.c')
| -rw-r--r-- | src/http/modules/ngx_http_proxy_module.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/http/modules/ngx_http_proxy_module.c b/src/http/modules/ngx_http_proxy_module.c index 368297e77..084462746 100644 --- a/src/http/modules/ngx_http_proxy_module.c +++ b/src/http/modules/ngx_http_proxy_module.c @@ -4944,6 +4944,12 @@ ngx_http_proxy_set_ssl(ngx_conf_t *cf, ngx_http_proxy_loc_conf_t *plcf) cln->handler = ngx_ssl_cleanup_ctx; cln->data = plcf->upstream.ssl; + if (ngx_ssl_ciphers(cf, plcf->upstream.ssl, &plcf->ssl_ciphers, 0) + != NGX_OK) + { + return NGX_ERROR; + } + if (plcf->upstream.ssl_certificate) { if (plcf->upstream.ssl_certificate_key == NULL) { @@ -4975,12 +4981,6 @@ ngx_http_proxy_set_ssl(ngx_conf_t *cf, ngx_http_proxy_loc_conf_t *plcf) } } - if (ngx_ssl_ciphers(cf, plcf->upstream.ssl, &plcf->ssl_ciphers, 0) - != NGX_OK) - { - return NGX_ERROR; - } - if (plcf->upstream.ssl_verify) { if (plcf->ssl_trusted_certificate.len == 0) { ngx_log_error(NGX_LOG_EMERG, cf->log, 0, |