com php-src: Fix Bug #67531 syslog cannot be set in pool configuration: sapi/fpm/fpm/fpm_conf.c

From: Date: Fri, 27 Jun 2014 07:47:28 +0000
Subject: com php-src: Fix Bug #67531 syslog cannot be set in pool configuration: sapi/fpm/fpm/fpm_conf.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-79091@lists.php.net to get a copy of this message
Commit: bf328b16817a9d7dfc7aaf078d4e944ab14ce0e1 Author: Remi Collet <remi@php.net> Fri, 27 Jun 2014 09:47:28 +0200 Parents: a0ecb3794f00e65cd2a073b2073e32d6c2fb7180 Branches: PHP-5.4 PHP-5.5 PHP-5.6 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=bf328b16817a9d7dfc7aaf078d4e944ab14ce0e1 Log: Fix Bug #67531 syslog cannot be set in pool configuration error_log is listed in FPM_PHP_INI_TO_EXPAND, but should not be expand when value = syslog Bugs: https://bugs.php.net/67531 Changed paths: M sapi/fpm/fpm/fpm_conf.c Diff: diff --git a/sapi/fpm/fpm/fpm_conf.c b/sapi/fpm/fpm/fpm_conf.c index 688c640..103a830 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);

« previous php.cvs (#79091) next »