diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2011-11-01 11:23:26 +0000 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2011-11-01 11:23:26 +0000 |
| commit | 1b6bed1c8e0652e133155c323a3fdd56f3fb31c3 (patch) | |
| tree | 74155fba8c77ee024673af26ca983e01b6efb9c1 /auto | |
| parent | f59e9d45fb8ee216dd7db6a723a7912c012e4b5b (diff) | |
| download | nginx-1b6bed1c8e0652e133155c323a3fdd56f3fb31c3.tar.gz nginx-1b6bed1c8e0652e133155c323a3fdd56f3fb31c3.tar.bz2 | |
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.
Diffstat (limited to 'auto')
| -rw-r--r-- | auto/install | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/auto/install b/auto/install index 6b5a12034..6e8ccda60 100644 --- a/auto/install +++ b/auto/install @@ -53,7 +53,7 @@ esac case ".$NGX_ERROR_LOG_PATH" in - ./*) + ./* | .) ;; *) @@ -78,7 +78,7 @@ manpage: 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 @@ install: $NGX_OBJS${ngx_dirsep}nginx${ngx_binext} \ 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"`' || \ |