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

Commit: 048e0d58bf3a30849b0f7b7c1e43e8fb9fc8b01b Author: Stanislav Malyshev <stas@php.net> Tue, 17 Mar 2015 13:04:36 -0700 Committer: Julien Pauli <jpauli@php.net> Wed, 18 Mar 2015 10:32:56 +0100 Parents: 93b8970b3316cd5c557eae2f03d7efc39a9eae53 Branches: PHP-5.5.23 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=048e0d58bf3a30849b0f7b7c1e43e8fb9fc8b01b Log: Fixed bug #69134 (Per Directory Values overrides PHP_INI_SYSTEM configuration options) Bugs: https://bugs.php.net/69134 Changed paths: M win32/registry.c Diff: 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; }