From: Remi Collet <remi@php.net>
Date: Tue, 8 Jul 2014 06:32:56 +0000 (+0200)
Subject: 5.6 have fpm_globals.force_stderr
X-Git-Tag: php-5.6.0RC3~1^2~62
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=71a27605f4d8488bd5fd9e920934595e46d6a7e9;p=php

5.6 have fpm_globals.force_stderr
---

diff --git a/sapi/fpm/fpm/fpm_stdio.c b/sapi/fpm/fpm/fpm_stdio.c
index 303b32aede..fcec78435b 100644
--- a/sapi/fpm/fpm/fpm_stdio.c
+++ b/sapi/fpm/fpm/fpm_stdio.c
@@ -269,7 +269,7 @@ int fpm_stdio_open_error_log(int reopen) /* {{{ */
 		openlog(fpm_global_config.syslog_ident, LOG_PID | LOG_CONS, fpm_global_config.syslog_facility);
 		fpm_globals.error_log_fd = ZLOG_SYSLOG;
 #if HAVE_UNISTD_H
-		if (fpm_global_config.daemonize || !isatty(STDERR_FILENO)) {
+		if (fpm_global_config.daemonize || (!isatty(STDERR_FILENO) && !fpm_globals.force_stderr)) {
 #else
 		if (fpm_global_config.daemonize) {
 #endif