diff options
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/nginx.h | 2 | ||||
| -rw-r--r-- | src/core/ngx_file.c | 7 |
2 files changed, 3 insertions, 6 deletions
diff --git a/src/core/nginx.h b/src/core/nginx.h index 1b135e596..86beaea07 100644 --- a/src/core/nginx.h +++ b/src/core/nginx.h @@ -8,7 +8,7 @@ #define _NGINX_H_INCLUDED_ -#define NGINX_VER "nginx/0.3.54" +#define NGINX_VER "nginx/0.3.55" #define NGINX_VAR "NGINX" #define NGX_OLDPID_EXT ".oldbin" 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); } } |