Mercurial > hg > nginx-ranges
diff src/http/ngx_http_script.c @ 491: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 | 56baf312c1b5 |
children | f39b9e29530d |
line wrap: on
line diff
--- a/src/http/ngx_http_script.c +++ b/src/http/ngx_http_script.c @@ -1213,7 +1213,7 @@ ngx_http_script_add_full_name_code(ngx_h } code->code = (ngx_http_script_code_pt) ngx_http_script_full_name_len_code; - code->prefix = sc->conf_prefix; + code->conf_prefix = sc->conf_prefix; code = ngx_http_script_add_code(*sc->values, sizeof(ngx_http_script_full_name_code_t), @@ -1223,7 +1223,7 @@ ngx_http_script_add_full_name_code(ngx_h } code->code = ngx_http_script_full_name_code; - code->prefix = sc->conf_prefix; + code->conf_prefix = sc->conf_prefix; return NGX_OK; } @@ -1238,7 +1238,8 @@ ngx_http_script_full_name_len_code(ngx_h e->ip += sizeof(ngx_http_script_full_name_code_t); - return code->prefix ? sizeof(NGX_CONF_PREFIX) : ngx_cycle->root.len; + return code->conf_prefix ? ngx_cycle->conf_prefix.len: + ngx_cycle->prefix.len; } @@ -1254,7 +1255,7 @@ ngx_http_script_full_name_code(ngx_http_ value.data = e->buf.data; value.len = e->pos - e->buf.data; - if (ngx_conf_full_name((ngx_cycle_t *) ngx_cycle, &value, code->prefix) + if (ngx_conf_full_name((ngx_cycle_t *) ngx_cycle, &value, code->conf_prefix) != NGX_OK) { e->ip = ngx_http_script_exit; @@ -1413,6 +1414,7 @@ ngx_http_script_file_code(ngx_http_scrip of.directio = clcf->directio; of.valid = clcf->open_file_cache_valid; of.min_uses = clcf->open_file_cache_min_uses; + of.test_only = 1; of.errors = clcf->open_file_cache_errors; of.events = clcf->open_file_cache_events; @@ -1421,7 +1423,7 @@ ngx_http_script_file_code(ngx_http_scrip { if (of.err != NGX_ENOENT && of.err != NGX_ENOTDIR) { ngx_log_error(NGX_LOG_CRIT, r->connection->log, of.err, - ngx_file_info_n " \"%s\" failed", value->data); + "%s \"%s\" failed", of.failed, value->data); } switch (code->op) {