mirror of
https://github.com/php/php-src.git
synced 2024-09-22 02:17:32 +00:00
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5: NEWS NEWS Fix Bug #67531 syslog cannot be set in pool configuration Fix Bug #67530 error_log=syslog ignored
This commit is contained in:
commit
37aa57cd1b
@ -1075,6 +1075,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);
|
||||
|
@ -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;
|
||||
|
Loading…
Reference in New Issue
Block a user