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_ssl_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_ssl_module.c')
| -rw-r--r-- | src/http/modules/ngx_http_ssl_module.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/http/modules/ngx_http_ssl_module.c b/src/http/modules/ngx_http_ssl_module.c index e6ce126ae..efbc4594c 100644 --- a/src/http/modules/ngx_http_ssl_module.c +++ b/src/http/modules/ngx_http_ssl_module.c @@ -830,6 +830,13 @@ ngx_http_ssl_merge_srv_conf(ngx_conf_t *cf, void *parent, void *child) ngx_http_ssl_npn_advertised, NULL); #endif + if (ngx_ssl_ciphers(cf, &conf->ssl, &conf->ciphers, + conf->prefer_server_ciphers) + != NGX_OK) + { + return NGX_CONF_ERROR; + } + if (ngx_http_ssl_compile_certificates(cf, conf) != NGX_OK) { return NGX_CONF_ERROR; } @@ -862,13 +869,6 @@ ngx_http_ssl_merge_srv_conf(ngx_conf_t *cf, void *parent, void *child) } } - if (ngx_ssl_ciphers(cf, &conf->ssl, &conf->ciphers, - conf->prefer_server_ciphers) - != NGX_OK) - { - return NGX_CONF_ERROR; - } - conf->ssl.buffer_size = conf->buffer_size; if (conf->verify) { |