com php-src: Fix Bug #67530 error_log=syslog ignored : sapi/fpm/fpm/fpm_stdio.c

Commit: f8acf826c33bca214a211233c52e22b5d738b131 Author: Remi Collet <remi@php.net> Tue, 8 Jul 2014 08:29:24 +0200 Parents: 604de67b7d0b8c6db76002011e3b55dd9c7aeec8 Branches: PHP-5.4 PHP-5.5 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=f8acf826c33bca214a211233c52e22b5d738b131 Log: Fix Bug #67530 error_log=syslog ignored As for Bug #64915 Systemd use --nodaemonize but need to error_log to file or syslog to be honoured Bugs: https://bugs.php.net/67530 https://bugs.php.net/64915 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 d81e101..7bcf785 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;