archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-20 09:24:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fixed bug #69134 (Per Directory Values overrides PHP_INI_SYSTEM configuration options)

Browse source
This commit is contained in:
Stanislav Malyshev 2015-03-17 13:04:36 -07:00
parent 9ba4db5e5d
commit bfb669891e
2 changed files with 7 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

6
NEWS
View file

@ -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

2
win32/registry.c
View file

@ -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;
}