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

From: Date: Wed, 18 Mar 2015 23:41:59 +0000
Subject: com php-src: Fixed bug #69134 (Per Directory Values overrides PHP_INI_SYSTEM configuration options): win32/ registry.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-85639@lists.php.net to get a copy of this message
Commit: 7f183044fd301ed75f37983b95903b71467c29f4 Author: Stanislav Malyshev <stas@php.net> Tue, 17 Mar 2015 13:04:36 -0700 Committer: Ferenc Kovacs <tyrael@php.net> Thu, 19 Mar 2015 00:41:59 +0100 Parents: 313ff116fa08918fb3949d51f17eb39d0b950962 Branches: PHP-5.6.7 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=7f183044fd301ed75f37983b95903b71467c29f4 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; }

« previous php.cvs (#85639) next »