Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nginx/nginx.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/core/nginx.c10
-rw-r--r--src/core/ngx_conf_file.c14
-rw-r--r--src/core/ngx_conf_file.h2
-rw-r--r--src/core/ngx_file.c8
-rw-r--r--src/event/ngx_event_openssl.c12
-rw-r--r--src/event/ngx_event_openssl_stapling.c2
-rw-r--r--src/http/modules/ngx_http_geo_module.c2
-rw-r--r--src/http/modules/ngx_http_log_module.c4
-rw-r--r--src/http/modules/ngx_http_xslt_filter_module.c2
-rw-r--r--src/http/modules/perl/ngx_http_perl_module.c4
-rw-r--r--src/http/ngx_http_core_module.c8
-rw-r--r--src/http/ngx_http_file_cache.c4
-rw-r--r--src/http/ngx_http_script.c7
13 files changed, 34 insertions, 45 deletions
diff --git a/src/core/nginx.c b/src/core/nginx.c
index 9cabac1e6..4cc80826e 100644
--- a/src/core/nginx.c
+++ b/src/core/nginx.c
@@ -897,9 +897,7 @@ ngx_process_options(ngx_cycle_t *cycle)
ngx_str_set(&cycle->conf_file, NGX_CONF_PATH);
}
- if (ngx_get_full_name(cycle->pool, &cycle->prefix, &cycle->conf_file)
- != NGX_OK)
- {
+ if (ngx_conf_full_name(cycle, &cycle->conf_file, 0) != NGX_OK) {
return NGX_ERROR;
}
@@ -1015,7 +1013,7 @@ ngx_core_module_init_conf(ngx_cycle_t *cycle, void *conf)
ngx_str_set(&ccf->pid, NGX_PID_PATH);
}
- if (ngx_get_full_name(cycle->pool, &cycle->prefix, &ccf->pid) != NGX_OK) {
+ if (ngx_conf_full_name(cycle, &ccf->pid, 0) != NGX_OK) {
return NGX_CONF_ERROR;
}
@@ -1063,9 +1061,7 @@ ngx_core_module_init_conf(ngx_cycle_t *cycle, void *conf)
ngx_str_set(&ccf->lock_file, NGX_LOCK_PATH);
}
- if (ngx_get_full_name(cycle->pool, &cycle->prefix, &ccf->lock_file)
- != NGX_OK)
- {
+ if (ngx_conf_full_name(cycle, &ccf->lock_file, 0) != NGX_OK) {
return NGX_CONF_ERROR;
}
diff --git a/src/core/ngx_conf_file.c b/src/core/ngx_conf_file.c
index afa27d76c..6cfb5d58d 100644
--- a/src/core/ngx_conf_file.c
+++ b/src/core/ngx_conf_file.c
@@ -747,7 +747,7 @@ ngx_conf_include(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
ngx_log_debug1(NGX_LOG_DEBUG_CORE, cf->log, 0, "include %s", file.data);
- if (ngx_get_full_name(cf->pool, &cf->cycle->conf_prefix, &file) != NGX_OK) {
+ if (ngx_conf_full_name(cf->cycle, &file, 1) != NGX_OK) {
return NGX_CONF_ERROR;
}
@@ -797,6 +797,16 @@ ngx_conf_include(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
}
+ngx_int_t
+ngx_conf_full_name(ngx_cycle_t *cycle, ngx_str_t *name, ngx_uint_t conf_prefix)
+{
+ return ngx_get_full_name(cycle->pool,
+ conf_prefix ? &cycle->conf_prefix:
+ &cycle->prefix,
+ name);
+}
+
+
ngx_open_file_t *
ngx_conf_open_file(ngx_cycle_t *cycle, ngx_str_t *name)
{
@@ -812,7 +822,7 @@ ngx_conf_open_file(ngx_cycle_t *cycle, ngx_str_t *name)
if (name->len) {
full = *name;
- if (ngx_get_full_name(cycle->pool, &cycle->prefix, &full) != NGX_OK) {
+ if (ngx_conf_full_name(cycle, &full, 0) != NGX_OK) {
return NULL;
}
diff --git a/src/core/ngx_conf_file.h b/src/core/ngx_conf_file.h
index f0a12d41f..d73a6c8bf 100644
--- a/src/core/ngx_conf_file.h
+++ b/src/core/ngx_conf_file.h
@@ -311,6 +311,8 @@ char *ngx_conf_parse(ngx_conf_t *cf, ngx_str_t *filename);
char *ngx_conf_include(ngx_conf_t *cf, ngx_command_t *cmd, void *conf);
+ngx_int_t ngx_conf_full_name(ngx_cycle_t *cycle, ngx_str_t *name,
+ ngx_uint_t conf_prefix);
ngx_open_file_t *ngx_conf_open_file(ngx_cycle_t *cycle, ngx_str_t *name);
void ngx_cdecl ngx_conf_log_error(ngx_uint_t level, ngx_conf_t *cf,
ngx_err_t err, const char *fmt, ...);
diff --git a/src/core/ngx_file.c b/src/core/ngx_file.c
index 049b8767c..28e8871ec 100644
--- a/src/core/ngx_file.c
+++ b/src/core/ngx_file.c
@@ -355,9 +355,7 @@ ngx_conf_set_path_slot(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
path->name.len--;
}
- if (ngx_get_full_name(cf->pool, &cf->cycle->prefix, &path->name)
- != NGX_OK)
- {
+ if (ngx_conf_full_name(cf->cycle, &path->name, 0) != NGX_OK) {
return NULL;
}
@@ -411,9 +409,7 @@ ngx_conf_merge_path_value(ngx_conf_t *cf, ngx_path_t **path, ngx_path_t *prev,
(*path)->name = init->name;
- if (ngx_get_full_name(cf->pool, &cf->cycle->prefix, &(*path)->name)
- != NGX_OK)
- {
+ if (ngx_conf_full_name(cf->cycle, &(*path)->name, 0) != NGX_OK) {
return NGX_CONF_ERROR;
}
diff --git a/src/event/ngx_event_openssl.c b/src/event/ngx_event_openssl.c
index 1459eeab9..50746e7ac 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_get_full_name(cf->pool, &cf->cycle->conf_prefix, cert) != NGX_OK) {
+ if (ngx_conf_full_name(cf->cycle, cert, 1) != 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_get_full_name(cf->pool, &cf->cycle->conf_prefix, key) != NGX_OK) {
+ if (ngx_conf_full_name(cf->cycle, key, 1) != 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_get_full_name(cf->pool, &cf->cycle->conf_prefix, cert) != NGX_OK) {
+ if (ngx_conf_full_name(cf->cycle, cert, 1) != 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_get_full_name(cf->pool, &cf->cycle->conf_prefix, cert) != NGX_OK) {
+ if (ngx_conf_full_name(cf->cycle, cert, 1) != 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_get_full_name(cf->pool, &cf->cycle->conf_prefix, crl) != NGX_OK) {
+ if (ngx_conf_full_name(cf->cycle, crl, 1) != 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_get_full_name(cf->pool, &cf->cycle->conf_prefix, file) != NGX_OK) {
+ if (ngx_conf_full_name(cf->cycle, file, 1) != NGX_OK) {
return NGX_ERROR;
}
diff --git a/src/event/ngx_event_openssl_stapling.c b/src/event/ngx_event_openssl_stapling.c
index f02eab677..77076141c 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_get_full_name(cf->pool, &cf->cycle->conf_prefix, file) != NGX_OK) {
+ if (ngx_conf_full_name(cf->cycle, file, 1) != NGX_OK) {
return NGX_ERROR;
}
diff --git a/src/http/modules/ngx_http_geo_module.c b/src/http/modules/ngx_http_geo_module.c
index 711871b6c..34c3b190d 100644
--- a/src/http/modules/ngx_http_geo_module.c
+++ b/src/http/modules/ngx_http_geo_module.c
@@ -1327,7 +1327,7 @@ ngx_http_geo_include(ngx_conf_t *cf, ngx_http_geo_conf_ctx_t *ctx,
ngx_sprintf(file.data, "%V.bin%Z", name);
- if (ngx_get_full_name(cf->pool, &cf->cycle->conf_prefix, &file) != NGX_OK) {
+ if (ngx_conf_full_name(cf->cycle, &file, 1) != NGX_OK) {
return NGX_CONF_ERROR;
}
diff --git a/src/http/modules/ngx_http_log_module.c b/src/http/modules/ngx_http_log_module.c
index 505ae3b22..aa6a3fcee 100644
--- a/src/http/modules/ngx_http_log_module.c
+++ b/src/http/modules/ngx_http_log_module.c
@@ -1134,9 +1134,7 @@ ngx_http_log_set_log(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
}
} else {
- if (ngx_get_full_name(cf->pool, &cf->cycle->prefix, &value[1])
- != NGX_OK)
- {
+ if (ngx_conf_full_name(cf->cycle, &value[1], 0) != NGX_OK) {
return NGX_CONF_ERROR;
}
diff --git a/src/http/modules/ngx_http_xslt_filter_module.c b/src/http/modules/ngx_http_xslt_filter_module.c
index 6bf38285b..9e85693bc 100644
--- a/src/http/modules/ngx_http_xslt_filter_module.c
+++ b/src/http/modules/ngx_http_xslt_filter_module.c
@@ -892,7 +892,7 @@ ngx_http_xslt_stylesheet(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
ngx_memzero(sheet, sizeof(ngx_http_xslt_sheet_t));
- if (ngx_get_full_name(cf->pool, &cf->cycle->prefix, &value[1]) != NGX_OK) {
+ if (ngx_conf_full_name(cf->cycle, &value[1], 0) != NGX_OK) {
return NGX_CONF_ERROR;
}
diff --git a/src/http/modules/perl/ngx_http_perl_module.c b/src/http/modules/perl/ngx_http_perl_module.c
index a8a418422..90e32e80e 100644
--- a/src/http/modules/perl/ngx_http_perl_module.c
+++ b/src/http/modules/perl/ngx_http_perl_module.c
@@ -485,9 +485,7 @@ ngx_http_perl_init_interpreter(ngx_conf_t *cf, ngx_http_perl_main_conf_t *pmcf)
if (pmcf->modules != NGX_CONF_UNSET_PTR) {
m = pmcf->modules->elts;
for (i = 0; i < pmcf->modules->nelts; i++) {
- if (ngx_get_full_name(cf->pool, &cf->cycle->prefix, &m[i])
- != NGX_OK)
- {
+ if (ngx_conf_full_name(cf->cycle, &m[i], 0) != NGX_OK) {
return NGX_CONF_ERROR;
}
}
diff --git a/src/http/ngx_http_core_module.c b/src/http/ngx_http_core_module.c
index 5273fe32c..ffe7fb4fe 100644
--- a/src/http/ngx_http_core_module.c
+++ b/src/http/ngx_http_core_module.c
@@ -3686,9 +3686,7 @@ ngx_http_core_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child)
if (prev->root.data == NULL) {
ngx_str_set(&conf->root, "html");
- if (ngx_get_full_name(cf->pool, &cf->cycle->prefix, &conf->root)
- != NGX_OK)
- {
+ if (ngx_conf_full_name(cf->cycle, &conf->root, 0) != NGX_OK) {
return NGX_CONF_ERROR;
}
}
@@ -4430,9 +4428,7 @@ ngx_http_core_root(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
}
if (clcf->root.data[0] != '$') {
- if (ngx_get_full_name(cf->pool, &cf->cycle->prefix, &clcf->root)
- != NGX_OK)
- {
+ if (ngx_conf_full_name(cf->cycle, &clcf->root, 0) != NGX_OK) {
return NGX_CONF_ERROR;
}
}
diff --git a/src/http/ngx_http_file_cache.c b/src/http/ngx_http_file_cache.c
index 0b90c4150..eacca595a 100644
--- a/src/http/ngx_http_file_cache.c
+++ b/src/http/ngx_http_file_cache.c
@@ -1626,9 +1626,7 @@ ngx_http_file_cache_set_slot(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
cache->path->name.len--;
}
- if (ngx_get_full_name(cf->pool, &cf->cycle->prefix, &cache->path->name)
- != NGX_OK)
- {
+ if (ngx_conf_full_name(cf->cycle, &cache->path->name, 0) != NGX_OK) {
return NGX_CONF_ERROR;
}
diff --git a/src/http/ngx_http_script.c b/src/http/ngx_http_script.c
index 7af48ee00..1da793b8f 100644
--- a/src/http/ngx_http_script.c
+++ b/src/http/ngx_http_script.c
@@ -131,12 +131,7 @@ ngx_http_compile_complex_value(ngx_http_compile_complex_value_t *ccv)
if ((v->len == 0 || v->data[0] != '$')
&& (ccv->conf_prefix || ccv->root_prefix))
{
- if (ngx_get_full_name(ccv->cf->pool,
- ccv->conf_prefix ? &ccv->cf->cycle->conf_prefix:
- &ccv->cf->cycle->prefix,
- v)
- != NGX_OK)
- {
+ if (ngx_conf_full_name(ccv->cf->cycle, v, ccv->conf_prefix) != NGX_OK) {
return NGX_ERROR;
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-13 07:15:29 +0300