diff options
| author | Remi Collet <remi@php.net> | 2014-07-08 08:32:56 +0200 |
|---|---|---|
| committer | Remi Collet <remi@php.net> | 2014-07-08 08:33:48 +0200 |
| commit | 71a27605f4d8488bd5fd9e920934595e46d6a7e9 (patch) | |
| tree | 85e80017ff95dd2073be694f9de3a0c971969a95 /sapi | |
| parent | 60fd4d445c4c6de25c8cb85bc52e9e17b90eecfe (diff) | |
| download | php-git-71a27605f4d8488bd5fd9e920934595e46d6a7e9.tar.gz | |
5.6 have fpm_globals.force_stderr
Diffstat (limited to 'sapi')
| -rw-r--r-- | sapi/fpm/fpm/fpm_stdio.c | 2 |
1 files changed, 1 insertions, 1 deletions
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 |