From: Remi Collet <remi@php.net>
Date: Fri, 27 Jun 2014 07:47:28 +0000 (+0200)
Subject: Fix Bug #67531 	syslog cannot be set in pool configuration
X-Git-Tag: php-5.5.15RC1~39^2~1
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=bf328b16817a9d7dfc7aaf078d4e944ab14ce0e1;p=php

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
---

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);