diff options
author | Igor Sysoev <igor@sysoev.ru> | 2006-07-28 15:16:17 +0000 |
---|---|---|
committer | Igor Sysoev <igor@sysoev.ru> | 2006-07-28 15:16:17 +0000 |
commit | 8f1255877c4b64f83fce75baa4d903797e00e815 (patch) | |
tree | e6594c2c4578b85fa81c4a5fe334daac91142a6f /src/core/ngx_file.c | |
parent | 741c6e9c1ecd17d2165f2e8e3426023117f4b15d (diff) | |
download | nginx-8f1255877c4b64f83fce75baa4d903797e00e815.tar.gz nginx-8f1255877c4b64f83fce75baa4d903797e00e815.zip |
nginx-0.3.55-RELEASE importrelease-0.3.55
*) Feature: the "stub" parameter in the "include" SSI command.
*) Feature: the "block" SSI command.
*) Feature: the unicode2nginx script was added to contrib.
*) Bugfix: if a "root" was specified by variable only, then the root
was relative to a server prefix.
*) Bugfix: if the request contained "//" or "/./" and escaped symbols
after them, then the proxied request was sent unescaped.
*) Bugfix: the $r->headers_in("Cookie") of the ngx_http_perl_module now
returns all "Cookie" header lines.
*) Bugfix: a segmentation fault occurred if
"client_body_in_file_only on" was used and nginx switched to a next
upstream.
*) Bugfix: on some condition while reconfiguration character codes
inside the "charset_map" may be treated invalid; the bug had
appeared in 0.3.50.
Diffstat (limited to 'src/core/ngx_file.c')
-rw-r--r-- | src/core/ngx_file.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/core/ngx_file.c b/src/core/ngx_file.c index 0d094ec87..a730ede11 100644 --- a/src/core/ngx_file.c +++ b/src/core/ngx_file.c @@ -25,11 +25,8 @@ ngx_write_chain_to_temp_file(ngx_temp_file_t *tf, ngx_chain_t *chain) return rc; } - if (tf->log_level == NGX_LOG_NOTICE) { - ngx_log_error(NGX_LOG_NOTICE, tf->file.log, 0, tf->warn); - - } else if (tf->log_level == NGX_LOG_WARN) { - ngx_log_error(NGX_LOG_WARN, tf->file.log, 0, "%s %V", + if (tf->log_level) { + ngx_log_error(tf->log_level, tf->file.log, 0, "%s %V", tf->warn, &tf->file.name); } } |