- Fixed bug #60179 (php_flag and php_value does not work properly)

diff --git a/sapi/fpm/fpm/fpm_conf.c b/sapi/fpm/fpm/fpm_conf.c
index 5ad7c96dd21b017883f2a41088af15bea65e8b06..2a31d1a5110a6c3b4b1cd9a94b88ca89caccb868 100644 (file)
--- a/sapi/fpm/fpm/fpm_conf.c
+++ b/sapi/fpm/fpm/fpm_conf.c
@@ -539,7 +539,7 @@ static char *fpm_conf_set_array(zval *key, zval *value, void **config, int conve
        if (convert_to_bool) {
                char *err = fpm_conf_set_boolean(value, &subconf, 0);
                if (err) return err;
-               kv->value = strdup(b ? "On" : "Off");
+               kv->value = strdup(b ? "1" : "0");
        } else {
                kv->value = strdup(Z_STRVAL_P(value));
                if (fpm_conf_expand_pool_name(&kv->value) == -1) {
@@ -1343,20 +1343,10 @@ static void fpm_conf_ini_parser_array(zval *name, zval *key, zval *value, void *
                err = fpm_conf_set_array(key, value, &config, 0);
 
        } else if (!strcmp("php_value", Z_STRVAL_P(name))) {
-               if (!*Z_STRVAL_P(value)) {
-                       zlog(ZLOG_ERROR, "[%s:%d] empty value", ini_filename, ini_lineno);
-                       *error = 1;
-                       return;
-               }
                config = (char *)current_wp->config + WPO(php_values);
                err = fpm_conf_set_array(key, value, &config, 0);
 
        } else if (!strcmp("php_admin_value", Z_STRVAL_P(name))) {
-               if (!*Z_STRVAL_P(value)) {
-                       zlog(ZLOG_ERROR, "[%s:%d] empty value", ini_filename, ini_lineno);
-                       *error = 1;
-                       return;
-               }
                config = (char *)current_wp->config + WPO(php_admin_values);
                err = fpm_conf_set_array(key, value, &config, 0);