com php-src: Revert "Fix Bug #67530 error_log=syslog i gnored": sapi/fpm/fpm/fpm_stdio.c

Commit: 9c8b42960dbf51a2a0d863d22a5a4c344528f93d Author: Ferenc Kovacs <tyrael@php.net> Mon, 30 Jun 2014 18:37:23 +0200 Parents: a7d1656b96ad33ab31309fc505692793d4b4731f Branches: PHP-5.4 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=9c8b42960dbf51a2a0d863d22a5a4c344528f93d Log: Revert "Fix Bug #67530 error_log=syslog ignored" This reverts commit a0ecb3794f00e65cd2a073b2073e32d6c2fb7180. Bugs: https://bugs.php.net/67530 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 769d3a6..d81e101 100644 --- a/sapi/fpm/fpm/fpm_stdio.c +++ b/sapi/fpm/fpm/fpm_stdio.c @@ -268,11 +268,7 @@ 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) && !fpm_globals.force_stderr)) { -#else if (fpm_global_config.daemonize) { -#endif zlog_set_fd(fpm_globals.error_log_fd); } return 0;