diff options
| author | Remi Collet <remi@php.net> | 2014-06-27 09:50:27 +0200 |
|---|---|---|
| committer | Remi Collet <remi@php.net> | 2014-06-27 09:50:27 +0200 |
| commit | 13c5bb9600307ea8b17132aeff2dff4e558c46c3 (patch) | |
| tree | 52a1fc35f728ada32887157a6fea13f81ff3c734 | |
| parent | b1433d86b269ea789f57a0de9c0d998b22152ddf (diff) | |
| parent | 334758794da5fc38a5fb9cf2c962eb535bab6b67 (diff) | |
| download | php-git-13c5bb9600307ea8b17132aeff2dff4e558c46c3.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
NEWS
Fix Bug #67531 syslog cannot be set in pool configuration
Fix Bug #67530 error_log=syslog ignored
| -rw-r--r-- | sapi/fpm/fpm/fpm_conf.c | 3 | ||||
| -rw-r--r-- | sapi/fpm/fpm/fpm_stdio.c | 4 |
2 files changed, 7 insertions, 0 deletions
diff --git a/sapi/fpm/fpm/fpm_conf.c b/sapi/fpm/fpm/fpm_conf.c index 688c640250..103a830389 100644 --- a/sapi/fpm/fpm/fpm_conf.c +++ b/sapi/fpm/fpm/fpm_conf.c @@ -1069,6 +1069,9 @@ static int fpm_conf_process_all_pools() /* {{{ */ } } for (kv = wp->config->php_admin_values; kv; kv = kv->next) { + if (!strcasecmp(kv->key, "error_log") && !strcasecmp(kv->value, "syslog")) { + continue; + } for (p = options; *p; p++) { if (!strcasecmp(kv->key, *p)) { fpm_evaluate_full_path(&kv->value, wp, NULL, 0); diff --git a/sapi/fpm/fpm/fpm_stdio.c b/sapi/fpm/fpm/fpm_stdio.c index d81e10150d..769d3a6338 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; |