diff options
| author | Dmitry Stogov <dmitry@php.net> | 2007-05-02 10:16:34 +0000 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@php.net> | 2007-05-02 10:16:34 +0000 |
| commit | c327dec913b3511bf64996c21a38fe9944ccb50d (patch) | |
| tree | ce3ed81500b8e19bfe793830e7d2909bf3ba1a9e | |
| parent | 101a0f08ce9650b92fdce6560ad994020a3eba76 (diff) | |
| download | php-git-c327dec913b3511bf64996c21a38fe9944ccb50d.tar.gz | |
Fixed bug #41192 (Per Directory Values only work for one key)
| -rw-r--r-- | NEWS | 1 | ||||
| -rw-r--r-- | win32/registry.c | 3 |
2 files changed, 3 insertions, 1 deletions
@@ -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 9c674c0819..cdeb85f21d 100644 --- 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); |