diff options
| author | Stanislav Malyshev <stas@php.net> | 2015-03-17 13:04:36 -0700 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2015-03-17 13:05:43 -0700 |
| commit | bfb669891e02ba36f27f7807a3e114a57d78823c (patch) | |
| tree | beacab33fbc03af591342acccebc2ef2af1506a4 | |
| parent | 9ba4db5e5d6aae8b1df934fbe26ea976b026576d (diff) | |
| download | php-git-bfb669891e02ba36f27f7807a3e114a57d78823c.tar.gz | |
Fixed bug #69134 (Per Directory Values overrides PHP_INI_SYSTEM configuration options)
| -rw-r--r-- | NEWS | 6 | ||||
| -rw-r--r-- | win32/registry.c | 2 |
2 files changed, 7 insertions, 1 deletions
@@ -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 685a09d084..9f8782aff2 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; } |