com php-src: Fixed bug #69134 (Per Directory Values overrides PHP_INI_SYSTEM configuration options): NEWS win 32/registry.c

Commit: bfb669891e02ba36f27f7807a3e114a57d78823c Author: Stanislav Malyshev <stas@php.net> Tue, 17 Mar 2015 13:04:36 -0700 Parents: 9ba4db5e5d6aae8b1df934fbe26ea976b026576d Branches: PHP-5.4 PHP-5.5 PHP-5.6 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=bfb669891e02ba36f27f7807a3e114a57d78823c Log: Fixed bug #69134 (Per Directory Values overrides PHP_INI_SYSTEM configuration options) Bugs: https://bugs.php.net/69134 Changed paths: M NEWS M win32/registry.c Diff: diff --git a/NEWS b/NEWS index 9b45a99..3fac92c 100644 --- a/NEWS +++ b/NEWS @@ -4,6 +4,12 @@ PHP NEWS - Core: . Fixed bug #69207 (move_uploaded_file allows nulls in path). (Stas) + . Fixed bug #69134 (Per Directory Values overrides PHP_INI_SYSTEM + configuration options). (Anatol Belski) + +- SOAP: + . Fixed bug #69085 (SoapClient's __call() type confusion through + unserialize()).. (Dmitry) 19 Feb 2015 PHP 5.4.38 diff --git a/win32/registry.c b/win32/registry.c index 685a09d..9f8782a 100644 --- a/win32/registry..c +++ b/win32/registry.c @@ -261,7 +261,7 @@ void UpdateIniFromRegistry(char *path TSRMLS_DC) zend_hash_get_current_data_ex(ht, (void**)&data, &pos) == SUCCESS && zend_hash_get_current_key_ex(ht, &index, &index_len, &num, 0, &pos) == HASH_KEY_IS_STRING; zend_hash_move_forward_ex(ht, &pos)) { - zend_alter_ini_entry(index, index_len, Z_STRVAL_PP(data), Z_STRLEN_PP(data), PHP_INI_SYSTEM, PHP_INI_STAGE_ACTIVATE); + zend_alter_ini_entry(index, index_len, Z_STRVAL_PP(data), Z_STRLEN_PP(data), PHP_INI_USER, PHP_INI_STAGE_ACTIVATE); } break; }