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 688c6402505e5b2986f865edfb68500357b1d393..103a830389c88f7ed91cdeae18f64206ae84d3b7 100644 (file)
--- 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);