mirror/nginx
1
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2025-06-06 00:42:40 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Backed out f1a91825730a and 7094bd12c1ff.

Browse Source 
While ngx_get_full_name() might have a bit more descriptive arguments,
the ngx_conf_full_name() is generally easier to use when parsing
configuration and limits exposure of cycle->prefix / cycle->conf_prefix
details.
This commit is contained in:
Maxim Dounin 2013-08-20 21:11:19 +04:00
parent 4c53a38fb5
commit e3cab76758
13 changed files with 34 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/core/nginx.c
View File

@ -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;
}

14
src/core/ngx_conf_file.c
View File

@ -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;
}

2
src/core/ngx_conf_file.h
View File

@ -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, ...);

8
src/core/ngx_file.c
View File

@ -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;
}

12
src/event/ngx_event_openssl.c
View File

@ -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;
}

2
src/event/ngx_event_openssl_stapling.c
View File

@ -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;
}

2
src/http/modules/ngx_http_geo_module.c
View File

@ -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;
}

4
src/http/modules/ngx_http_log_module.c
View File

@ -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;
}

2
src/http/modules/ngx_http_xslt_filter_module.c
View File

@ -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;
}

4
src/http/modules/perl/ngx_http_perl_module.c
View File

@ -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;
}
}

8
src/http/ngx_http_core_module.c
View File

@ -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;
}
}

4
src/http/ngx_http_file_cache.c
View File

@ -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;
}

7
src/http/ngx_http_script.c
View File

@ -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;
}