From c0edbcce58b03b89c70f1eb39cb44c74c4c7453a Mon Sep 17 00:00:00 2001 From: Igor Sysoev Date: Thu, 21 Oct 2004 15:34:38 +0000 Subject: nginx-0.1.2-RELEASE import *) Feature: the --user=USER, --group=GROUP, and --with-ld-opt=OPTIONS options in configure. *) Feature: the server_name directive supports *.domain.tld. *) Bugfix: the portability improvements. *) Bugfix: if configuration file was set in command line, the reconfiguration was impossible; the bug had appeared in 0.1.1. *) Bugfix: proxy module may get caught in an endless loop when sendfile is not used. *) Bugfix: with sendfile the response was not recoded according to the charset module directives; the bug had appeared in 0.1.1. *) Bugfix: very seldom bug in the kqueue processing. *) Bugfix: the gzip module compressed the proxied responses that was already compressed. --- src/core/ngx_log.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/core/ngx_log.c') diff --git a/src/core/ngx_log.c b/src/core/ngx_log.c index 9cf1d5605..f1c0e97f3 100644 --- a/src/core/ngx_log.c +++ b/src/core/ngx_log.c @@ -57,7 +57,7 @@ static const char *debug_levels[] = { }; -#if (HAVE_VARIADIC_MACROS) +#if (NGX_HAVE_VARIADIC_MACROS) void ngx_log_error_core(ngx_uint_t level, ngx_log_t *log, ngx_err_t err, const char *fmt, ...) #else @@ -67,7 +67,7 @@ void ngx_log_error_core(ngx_uint_t level, ngx_log_t *log, ngx_err_t err, { char errstr[MAX_ERROR_STR]; size_t len, max; -#if (HAVE_VARIADIC_MACROS) +#if (NGX_HAVE_VARIADIC_MACROS) va_list args; #endif @@ -97,7 +97,7 @@ void ngx_log_error_core(ngx_uint_t level, ngx_log_t *log, ngx_err_t err, "*%u ", *(u_int *) log->data); } -#if (HAVE_VARIADIC_MACROS) +#if (NGX_HAVE_VARIADIC_MACROS) va_start(args, fmt); len += ngx_vsnprintf(errstr + len, max - len, fmt, args); @@ -187,7 +187,7 @@ static void ngx_log_write(ngx_log_t *log, char *errstr, size_t len) } -#if !(HAVE_VARIADIC_MACROS) +#if !(NGX_HAVE_VARIADIC_MACROS) void ngx_log_error(ngx_uint_t level, ngx_log_t *log, ngx_err_t err, const char *fmt, ...) @@ -253,7 +253,7 @@ ngx_log_t *ngx_log_init_stderr() #endif ngx_log.file = &ngx_stderr; - ngx_log.log_level = NGX_LOG_ERR; + ngx_log.log_level = NGX_LOG_NOTICE; return &ngx_log; } -- cgit