Mercurial > hg > nginx-vendor-1-0
diff src/core/ngx_conf_file.c @ 482:392c16f2d858 NGINX_0_7_53
nginx 0.7.53
*) Change: now a log set by --error-log-path is created from the very
start-up.
*) Feature: now the start up errors and warnings are outputted to an
error_log and stderr.
*) Feature: the empty --prefix= configure parameter forces nginx to use
a directory where it was run as prefix.
*) Feature: the -p switch.
*) Feature: the -s switch on Unix platforms.
*) Feature: the -? and -h switches.
Thanks to Jerome Loyet.
*) Feature: now switches may be set in condensed form.
*) Bugfix: nginx/Windows did not work if configuration file was given
by the -c switch.
*) Bugfix: temporary files might be not removed if the "proxy_store",
"fastcgi_store", "proxy_cache", or "fastcgi_cache" were used.
Thanks to Maxim Dounin.
*) Bugfix: an incorrect value was passed to mail proxy authentication
server in "Auth-Method" header line; the bug had appeared
in 0.7.34.
Thanks to Simon Lecaille.
*) Bugfix: system error text descriptions were not logged on Linux;
the bug had appeared in 0.7.45.
*) Bugfix: the "fastcgi_cache_min_uses" directive did not work.
Thanks to Andrew Vorobyoff.
author | Igor Sysoev <http://sysoev.ru> |
---|---|
date | Mon, 27 Apr 2009 00:00:00 +0400 |
parents | a8424ffa495c |
children | ed5e10fb40fc |
line wrap: on
line diff
--- a/src/core/ngx_conf_file.c +++ b/src/core/ngx_conf_file.c @@ -798,10 +798,6 @@ ngx_conf_full_name(ngx_cycle_t *cycle, n u_char *p, *prefix; ngx_str_t old; - if (name->data[0] == '/') { - return NGX_OK; - } - #if (NGX_WIN32) if (name->len > 2 @@ -812,17 +808,23 @@ ngx_conf_full_name(ngx_cycle_t *cycle, n return NGX_OK; } +#else + + if (name->data[0] == '/') { + return NGX_OK; + } + #endif old = *name; if (conf_prefix) { - len = sizeof(NGX_CONF_PREFIX) - 1; - prefix = (u_char *) NGX_CONF_PREFIX; + len = cycle->conf_prefix.len; + prefix = cycle->conf_prefix.data; } else { - len = cycle->root.len; - prefix = cycle->root.data; + len = cycle->prefix.len; + prefix = cycle->prefix.data; } name->len = len + old.len; @@ -851,7 +853,7 @@ ngx_conf_open_file(ngx_cycle_t *cycle, n full.data = NULL; #endif - if (name) { + if (name && name->len) { full = *name; if (ngx_conf_full_name(cycle, &full, 0) != NGX_OK) { @@ -887,12 +889,12 @@ ngx_conf_open_file(ngx_cycle_t *cycle, n return NULL; } - if (name) { + if (name && name->len) { file->fd = NGX_INVALID_FILE; file->name = full; } else { - file->fd = ngx_stderr_fileno; + file->fd = ngx_stderr; file->name.len = 0; file->name.data = NULL; }