diff options
| author | Jérôme Loyet <fat@php.net> | 2011-11-03 15:47:19 +0000 |
|---|---|---|
| committer | Jérôme Loyet <fat@php.net> | 2011-11-03 15:47:19 +0000 |
| commit | 10a1121a37f0322e9ad954460635ab80eeb73c12 (patch) | |
| tree | 8f419537f4e7ec3399267847ae48f9086b0cc2b6 | |
| parent | 36103d1236c7290223fad40221344bd76a2ad45b (diff) | |
| download | php-git-10a1121a37f0322e9ad954460635ab80eeb73c12.tar.gz | |
- Fixed bug #60179 (php_flag and php_value does not work properly)
| -rw-r--r-- | sapi/fpm/fpm/fpm_conf.c | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/sapi/fpm/fpm/fpm_conf.c b/sapi/fpm/fpm/fpm_conf.c index 5ad7c96dd2..2a31d1a511 100644 --- 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); |