diff options
| author | Remi Collet <remi@php.net> | 2014-07-08 08:30:44 +0200 |
|---|---|---|
| committer | Remi Collet <remi@php.net> | 2014-07-08 08:30:44 +0200 |
| commit | 0c840ced7cf9c5727f1bee4be33080eb16c7627a (patch) | |
| tree | 81591df038949b2bc50848f97e72ea6e4f4d57ee | |
| parent | 1939b34c788c57de452b3cf1540182d08ff8f1ad (diff) | |
| parent | 494034901e6743861d17b1fe60e8d3d0c6477f8c (diff) | |
| download | php-git-0c840ced7cf9c5727f1bee4be33080eb16c7627a.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
NEWS
Fix Bug #67530 error_log=syslog ignored
| -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 d81e10150d..7bcf785238 100644 --- a/sapi/fpm/fpm/fpm_stdio.c +++ b/sapi/fpm/fpm/fpm_stdio.c @@ -268,7 +268,11 @@ int fpm_stdio_open_error_log(int reopen) /* {{{ */ if (!strcasecmp(fpm_global_config.error_log, "syslog")) { 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)) { +#else if (fpm_global_config.daemonize) { +#endif zlog_set_fd(fpm_globals.error_log_fd); } return 0; |