RE: [PHP-CVS] com php-src: Fix Bug #67530 error_log=syslog ignored: sapi/fpm/fpm/fpm_stdio.c

Hey Remi, Unless I'm missing something, PHP < 5.6 doesn't have fpm_globals.force_stderr, so this update breaks the build for both 5.4 and 5.5... Can you revert? Thanks, Zeev > -----Original Message----- > From: Remi Collet [mailto:remi@php.net] > Sent: Friday, June 27, 2014 10:46 AM > To: php-cvs@lists.php.net > Subject: [PHP-CVS] com php-src: Fix Bug #67530 error_log=syslog ignored: > sapi/fpm/fpm/fpm_stdio.c > > Commit: a0ecb3794f00e65cd2a073b2073e32d6c2fb7180 > Author: Remi Collet <remi@php.net> Fri, 27 Jun 2014 09:45:53 > +0200 > Parents: 2db96fea2d87bf3e24760e846b4a8633bd158330 > Branches: PHP-5.4 PHP-5.5 PHP-5.6 master > > Link: http://git.php.net/?p=php- > src.git;a=commitdiff;h=a0ecb3794f00e65cd2a073b2073e32d6c2fb7180 > > 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..769d3a6 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) > && > +!fpm_globals.force_stderr)) { #else > if (fpm_global_config.daemonize) { > +#endif > zlog_set_fd(fpm_globals.error_log_fd); > } > return 0; > > > -- > PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: > http://www.php.net/unsub.php