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.
13 years ago · 9f6ca9bc64
2 changed files with 7 additions and 0 deletions
--- a/3
+++ b/3
@ -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:
--- a/sapi/fpm/fpm/fpm_stdio.c
+++ b/sapi/fpm/fpm/fpm_stdio.c
@ -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);
 		}
 	}