diff options
Diffstat (limited to 'src/event')
| -rw-r--r-- | src/event/ngx_event_openssl.c | 12 | ||||
| -rw-r--r-- | src/event/ngx_event_openssl_stapling.c | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/event/ngx_event_openssl.c b/src/event/ngx_event_openssl.c index 50746e7ac..1459eeab9 100644 --- a/src/event/ngx_event_openssl.c +++ b/src/event/ngx_event_openssl.c @@ -240,7 +240,7 @@ ngx_ssl_certificate(ngx_conf_t *cf, ngx_ssl_t *ssl, ngx_str_t *cert, X509 *x509; u_long n; - if (ngx_conf_full_name(cf->cycle, cert, 1) != NGX_OK) { + if (ngx_get_full_name(cf->pool, &cf->cycle->conf_prefix, cert) != NGX_OK) { return NGX_ERROR; } @@ -319,7 +319,7 @@ ngx_ssl_certificate(ngx_conf_t *cf, ngx_ssl_t *ssl, ngx_str_t *cert, BIO_free(bio); - if (ngx_conf_full_name(cf->cycle, key, 1) != NGX_OK) { + if (ngx_get_full_name(cf->pool, &cf->cycle->conf_prefix, key) != NGX_OK) { return NGX_ERROR; } @@ -350,7 +350,7 @@ ngx_ssl_client_certificate(ngx_conf_t *cf, ngx_ssl_t *ssl, ngx_str_t *cert, return NGX_OK; } - if (ngx_conf_full_name(cf->cycle, cert, 1) != NGX_OK) { + if (ngx_get_full_name(cf->pool, &cf->cycle->conf_prefix, cert) != NGX_OK) { return NGX_ERROR; } @@ -394,7 +394,7 @@ ngx_ssl_trusted_certificate(ngx_conf_t *cf, ngx_ssl_t *ssl, ngx_str_t *cert, return NGX_OK; } - if (ngx_conf_full_name(cf->cycle, cert, 1) != NGX_OK) { + if (ngx_get_full_name(cf->pool, &cf->cycle->conf_prefix, cert) != NGX_OK) { return NGX_ERROR; } @@ -421,7 +421,7 @@ ngx_ssl_crl(ngx_conf_t *cf, ngx_ssl_t *ssl, ngx_str_t *crl) return NGX_OK; } - if (ngx_conf_full_name(cf->cycle, crl, 1) != NGX_OK) { + if (ngx_get_full_name(cf->pool, &cf->cycle->conf_prefix, crl) != NGX_OK) { return NGX_ERROR; } @@ -587,7 +587,7 @@ ngx_ssl_dhparam(ngx_conf_t *cf, ngx_ssl_t *ssl, ngx_str_t *file) return NGX_OK; } - if (ngx_conf_full_name(cf->cycle, file, 1) != NGX_OK) { + if (ngx_get_full_name(cf->pool, &cf->cycle->conf_prefix, file) != NGX_OK) { return NGX_ERROR; } diff --git a/src/event/ngx_event_openssl_stapling.c b/src/event/ngx_event_openssl_stapling.c index 77076141c..f02eab677 100644 --- a/src/event/ngx_event_openssl_stapling.c +++ b/src/event/ngx_event_openssl_stapling.c @@ -197,7 +197,7 @@ ngx_ssl_stapling_file(ngx_conf_t *cf, ngx_ssl_t *ssl, ngx_str_t *file) staple = SSL_CTX_get_ex_data(ssl->ctx, ngx_ssl_stapling_index); - if (ngx_conf_full_name(cf->cycle, file, 1) != NGX_OK) { + if (ngx_get_full_name(cf->pool, &cf->cycle->conf_prefix, file) != NGX_OK) { return NGX_ERROR; } |
