1
0
mirror of https://github.com/php/php-src.git synced 2026-03-26 01:02:25 +01:00

Fixed Bug #64915 (error_log ignored when daemonize=0)

Use configured error_log file when stderr is not a tty.
So only use tty during interactive debug run.
This commit is contained in:
Remi Collet
2013-05-24 12:09:05 +02:00
parent cd74b7d57e
commit 9f6ca9bc64
2 changed files with 7 additions and 0 deletions

3
NEWS
View File

@@ -2,6 +2,9 @@ PHP NEWS
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
?? ??? 2013, PHP 5.4.17
- FPM:
. Fixed Bug #64915 (error_log ignored when daemonize=0). (Remi)
?? ??? 2013, PHP 5.4.16
- Core:

View File

@@ -291,7 +291,11 @@ int fpm_stdio_open_error_log(int reopen) /* {{{ */
fd = fpm_globals.error_log_fd; /* for FD_CLOSEXEC to work */
} else {
fpm_globals.error_log_fd = fd;
#if HAVE_UNISTD_H
if (fpm_global_config.daemonize || !isatty(STDERR_FILENO)) {
#else
if (fpm_global_config.daemonize) {
#endif
zlog_set_fd(fpm_globals.error_log_fd);
}
}