com php-src: 5.6 have fpm_globals.force_stderr: sapi/ fpm/fpm/fpm_stdio.c
| From: | Remi Collet | Date: | Tue, 08 Jul 2014 06:33:48 +0000 |
| Subject: | com php-src: 5.6 have fpm_globals.force_stderr: sapi/ fpm/fpm/fpm_stdio.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-79316@lists.php.net to get a copy of this message | ||
Commit: 71a27605f4d8488bd5fd9e920934595e46d6a7e9
Author: Remi Collet <remi@php.net> Tue, 8 Jul 2014 08:32:56 +0200
Parents: 60fd4d445c4c6de25c8cb85bc52e9e17b90eecfe
Branches: PHP-5.6 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=71a27605f4d8488bd5fd9e920934595e46d6a7e9
Log:
5.6 have fpm_globals.force_stderr
Changed paths:
M sapi/fpm/fpm/fpm_stdio.c
Diff:
diff --git a/sapi/fpm/fpm/fpm_stdio.c b/sapi/fpm/fpm/fpm_stdio.c
index 303b32a..fcec784 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