svn: /php/php-src/ branches/PHP_5_3/NEWS branches/PHP_5_3/sapi/fpm/fpm/fpm_conf.c branches/PHP_5_4/sapi/fpm/fpm/fpm_conf.c
trunk/sapi/fpm/fpm/fpm_conf.c
| From: | Jérôme Loyet | Date: | Thu, 03 Nov 2011 15:47:19 +0000 |
| Subject: | svn: /php/php-src/ branches/PHP_5_3/NEWS branches/PHP_5_3/sapi/fpm/fpm/fpm_conf.c branches/PHP_5_4/sapi/fpm/fpm/fpm_conf.c trunk/sapi/fpm/fpm/fpm_conf.c |
||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-66882@lists.php.net to get a copy of this message | ||
fat Thu, 03 Nov 2011 15:47:19 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=318743
Log:
- Fixed bug #60179 (php_flag and php_value does not work properly)
Bug: https://bugs.php.net/60179 (Assigned) php_flag and
php_value does not work properly
Changed paths:
U php/php-src/branches/PHP_5_3/NEWS
U php/php-src/branches/PHP_5_3/sapi/fpm/fpm/fpm_conf.c
U php/php-src/branches/PHP_5_4/sapi/fpm/fpm/fpm_conf.c
U php/php-src/trunk/sapi/fpm/fpm/fpm_conf.c
Modified: php/php-src/branches/PHP_5_3/NEWS
===================================================================
--- php/php-src/branches/PHP_5_3/NEWS 2011-11-03 15:26:34 UTC (rev 318742)
+++ php/php-src/branches/PHP_5_3/NEWS 2011-11-03 15:47:19 UTC (rev 318743)
@@ -2,7 +2,10 @@
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
?? ??? 2011, PHP 5.3.9
+- PHP-FPM SAPI:
+ . Fixed bug #60179 (php_flag and php_value does not work properly). (fat)
+
03 Nov 2011, PHP 5.3.9RC1
- Core:
Modified: php/php-src/branches/PHP_5_3/sapi/fpm/fpm/fpm_conf.c
===================================================================
--- php/php-src/branches/PHP_5_3/sapi/fpm/fpm/fpm_conf.c 2011-11-03 15:26:34 UTC (rev 318742)
+++ php/php-src/branches/PHP_5_3/sapi/fpm/fpm/fpm_conf.c 2011-11-03 15:47:19 UTC (rev 318743)
@@ -539,7 +539,7 @@
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 @@
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);
Modified: php/php-src/branches/PHP_5_4/sapi/fpm/fpm/fpm_conf.c
===================================================================
--- php/php-src/branches/PHP_5_4/sapi/fpm/fpm/fpm_conf.c 2011-11-03 15:26:34 UTC (rev 318742)
+++ php/php-src/branches/PHP_5_4/sapi/fpm/fpm/fpm_conf.c 2011-11-03 15:47:19 UTC (rev 318743)
@@ -539,7 +539,7 @@
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 @@
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);
Modified: php/php-src/trunk/sapi/fpm/fpm/fpm_conf.c
===================================================================
--- php/php-src/trunk/sapi/fpm/fpm/fpm_conf.c 2011-11-03 15:26:34 UTC (rev 318742)
+++ php/php-src/trunk/sapi/fpm/fpm/fpm_conf.c 2011-11-03 15:47:19 UTC (rev 318743)
@@ -539,7 +539,7 @@
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 @@
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);