Fixed bug #41192 (Per Directory Values only work for one key)

diff --git a/NEWS b/NEWS
index 34743af934a0cf5874fc36b12e50c1e1caaa828f..111d33286044645fa627eb278d70cee40ab5c9ea 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -3,6 +3,7 @@ PHP                                                                        NEWS
 ?? Apr 2007, PHP 5.2.3RC3
 - Fixed iterator_apply() with a callback using __call(). (Johannes)
 - Fixed bug #41215 (setAttribute return code reversed). (Ilia)
+- Fixed bug #41192 (Per Directory Values only work for one key). (Dmitry)
 - Fixed bug #41097 (ext/soap returning associative array as indexed without
   using WSDL). (Dmitry)
 - Fixed bug #41004 (minOccurs="0" and null class member variable). (Dmitry)

diff --git a/win32/registry.c b/win32/registry.c
index 9c674c081951ae017c6e50fda7b8590738a0c8a5..cdeb85f21d4e311295399fb816d1cd20fd251218 100644 (file)
--- a/win32/registry.c
+++ b/win32/registry.c
@@ -135,11 +135,12 @@ static int LoadDirectory(HashTable *directories, HKEY key, char *path, int path_
                                                        new_path[path_len] = '/';
                                                        memcpy(new_path+path_len+1, name, name_len+1);
                                                        zend_str_tolower(new_path, path_len+name_len+1);
+                                                       name_len += path_len+1;
                                                } else {
                                                        memcpy(new_path, name, name_len+1);
                                                        zend_str_tolower(new_path, name_len);
                                                }
-                                               if (LoadDirectory(directories, subkey, new_path, path_len+name_len, ht)) {
+                                               if (LoadDirectory(directories, subkey, new_path, name_len, ht)) {
                                                        ret = 1;
                                                }
                                                RegCloseKey(subkey);