archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-18 15:08:55 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge branch 'PHP-5.6'

Browse source 
* PHP-5.6:
  NEWS
  NEWS
  NEWS
  Fix Bug #67531 	syslog cannot be set in pool configuration
  Fix Bug #67530 	error_log=syslog ignored
This commit is contained in:
Remi Collet 2014-06-27 09:51:52 +02:00
commit 6fa814cfc3
2 changed files with 7 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

3
sapi/fpm/fpm/fpm_conf.c
View file

@ -1075,6 +1075,9 @@ static int fpm_conf_process_all_pools() /* {{{ */
} }
} }
for (kv = wp->config->php_admin_values; kv; kv = kv->next) { 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++) { for (p = options; *p; p++) {
if (!strcasecmp(kv->key, *p)) { if (!strcasecmp(kv->key, *p)) {
fpm_evaluate_full_path(&kv->value, wp, NULL, 0); fpm_evaluate_full_path(&kv->value, wp, NULL, 0);

4
sapi/fpm/fpm/fpm_stdio.c
View file

@ -268,7 +268,11 @@ int fpm_stdio_open_error_log(int reopen) /* {{{ */
if (!strcasecmp(fpm_global_config.error_log, "syslog")) { if (!strcasecmp(fpm_global_config.error_log, "syslog")) {
openlog(fpm_global_config.syslog_ident, LOG_PID | LOG_CONS, fpm_global_config.syslog_facility); openlog(fpm_global_config.syslog_ident, LOG_PID | LOG_CONS, fpm_global_config.syslog_facility);
fpm_globals.error_log_fd = ZLOG_SYSLOG; 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) { if (fpm_global_config.daemonize) {
#endif
zlog_set_fd(fpm_globals.error_log_fd); zlog_set_fd(fpm_globals.error_log_fd);
} }
return 0; return 0;