diff options
| author | Remi Collet <remi@php.net> | 2013-05-24 12:10:39 +0200 |
|---|---|---|
| committer | Remi Collet <remi@php.net> | 2013-05-24 12:10:39 +0200 |
| commit | 433731d4631c01c729a58901ac6d7759bd2f1597 (patch) | |
| tree | 72cc47641871ed6c5e5b9c3045dc7cda48830721 /sapi | |
| parent | 2df1067036dc8627b8cd4820c6b8a4c403a94de5 (diff) | |
| parent | 9f6ca9bc6400fc9c8eaebf963f6eb048dde4b34f (diff) | |
| download | php-git-433731d4631c01c729a58901ac6d7759bd2f1597.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Fixed Bug #64915 (error_log ignored when daemonize=0)
Diffstat (limited to 'sapi')
| -rw-r--r-- | sapi/fpm/fpm/fpm_stdio.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sapi/fpm/fpm/fpm_stdio.c b/sapi/fpm/fpm/fpm_stdio.c index 10b867d00a..d81e10150d 100644 --- 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); } } |