Author: is
Date: 2011-11-01 11:23:26 +0000 (Tue, 01 Nov 2011)
New Revision: 4243

Modified:
branches/stable-1.0/
branches/stable-1.0/auto/install
branches/stable-1.0/src/core/ngx_log.c
Log:
Merging r4013, r4200:

error_log related fixes:

*) Complain on invalid log levels.

Previously only first log level was required to be correct, while
error_log directive in fact accepts list of levels (e.g. one may
specify "error_log ... debug_core debug_http;"). This resulted
in (avoidable) wierd behaviour on missing semicolon after error_log
directive, e.g.

error_log /path/to/log info
index index.php;

silently skipped index directive and it's arguments (trying to
interpret them as log levels without checking to be correct).

*) Fixed configuration summary and manpage contents for the special
--error-log-path=stderr case.



Property changes on: branches/stable-1.0
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk:3960-3974,3977-3987,3991-3996,3998,4003-4007,4009-4012,4015-4016,4018,4023,4025-4027,4035-4065,4073,4077,4086-4090,4094-4102,4106-4108,4113-4114,4129-4131,4133,4135-4137,4154,4156-4157,4184,4192,4201-4205
+ /trunk:3960-3974,3977-3987,3991-3996,3998,4003-4007,4009-4013,4015-4016,4018,4023,4025-4027,4035-4065,4073,4077,4086-4090,4094-4102,4106-4108,4113-4114,4129-4131,4133,4135-4137,4154,4156-4157,4184,4192,4200-4205

Modified: branches/stable-1.0/auto/install
===================================================================
--- branches/stable-1.0/auto/install 2011-11-01 11:19:58 UTC (rev 4242)
+++ branches/stable-1.0/auto/install 2011-11-01 11:23:26 UTC (rev 4243)
@@ -53,7 +53,7 @@


case ".$NGX_ERROR_LOG_PATH" in
- ./*)
+ ./* | .)
;;

*)
@@ -78,7 +78,7 @@
sed -e "s|%%PREFIX%%|$NGX_PREFIX|" \\
-e "s|%%PID_PATH%%|$NGX_PID_PATH|" \\
-e "s|%%CONF_PATH%%|$NGX_CONF_PATH|" \\
- -e "s|%%ERROR_LOG_PATH%%|$NGX_ERROR_LOG_PATH|" \\
+ -e "s|%%ERROR_LOG_PATH%%|${NGX_ERROR_LOG_PATH:-stderr}|" \\
< man/nginx.8 > $NGX_OBJS/nginx.8

install: $NGX_OBJS${ngx_dirsep}nginx${ngx_binext} \
@@ -137,7 +137,7 @@
END


-if test -n "\$(DESTDIR)$NGX_ERROR_LOG_PATH"; then
+if test -n "$NGX_ERROR_LOG_PATH"; then
cat << END >> $NGX_MAKEFILE

test -d '\$(DESTDIR)`dirname "$NGX_ERROR_LOG_PATH"`' || \

Modified: branches/stable-1.0/src/core/ngx_log.c
===================================================================
--- branches/stable-1.0/src/core/ngx_log.c 2011-11-01 11:19:58 UTC (rev 4242)
+++ branches/stable-1.0/src/core/ngx_log.c 2011-11-01 11:23:26 UTC (rev 4243)
@@ -369,12 +369,13 @@
char *
ngx_log_set_levels(ngx_conf_t *cf, ngx_log_t *log)
{
- ngx_uint_t i, n, d;
+ ngx_uint_t i, n, d, found;
ngx_str_t *value;

value = cf->args->elts;

for (i = 2; i < cf->args->nelts; i++) {
+ found = 0;

for (n = 1; n <= NGX_LOG_DEBUG; n++) {
if (ngx_strcmp(value[i].data, err_levels[n].data) == 0) {
@@ -387,7 +388,8 @@
}

log->log_level = n;
- continue;
+ found = 1;
+ break;
}
}

@@ -401,11 +403,13 @@
}

log->log_level |= d;
+ found = 1;
+ break;
}
}


- if (log->log_level == 0) {
+ if (!found) {
ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
"invalid log level \"%V\"", &value[i]);
return NGX_CONF_ERROR;

_______________________________________________
nginx-devel mailing list
nginx-devel@nginx.org
http://mailman.nginx.org/mailman/listinfo/nginx-devel