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

diff --git a/NEWS b/NEWS
index 9b45a99b0f1de19ec4837f7884c6f240f78ea0b2..3fac92c805ca438d88f73fe56f2993737ae14dfa 100644 (file)
--- 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 685a09d084abd379026a725dcf572eb8c5db855a..9f8782aff2c4f48fa71b9b5b4fdd4b1d3bc33b56 100644 (file)
--- 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;
                }