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

This commit is contained in:
Dmitry Stogov 2007-05-02 10:16:34 +00:00
parent 101a0f08ce
commit c327dec913
2 changed files with 3 additions and 1 deletions

1
NEWS
View file

@ -3,6 +3,7 @@ PHP NEWS
?? Apr 2007, PHP 5.2.3RC3 ?? Apr 2007, PHP 5.2.3RC3
- Fixed iterator_apply() with a callback using __call(). (Johannes) - Fixed iterator_apply() with a callback using __call(). (Johannes)
- Fixed bug #41215 (setAttribute return code reversed). (Ilia) - 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 - Fixed bug #41097 (ext/soap returning associative array as indexed without
using WSDL). (Dmitry) using WSDL). (Dmitry)
- Fixed bug #41004 (minOccurs="0" and null class member variable). (Dmitry) - Fixed bug #41004 (minOccurs="0" and null class member variable). (Dmitry)

View file

@ -135,11 +135,12 @@ static int LoadDirectory(HashTable *directories, HKEY key, char *path, int path_
new_path[path_len] = '/'; new_path[path_len] = '/';
memcpy(new_path+path_len+1, name, name_len+1); memcpy(new_path+path_len+1, name, name_len+1);
zend_str_tolower(new_path, path_len+name_len+1); zend_str_tolower(new_path, path_len+name_len+1);
name_len += path_len+1;
} else { } else {
memcpy(new_path, name, name_len+1); memcpy(new_path, name, name_len+1);
zend_str_tolower(new_path, name_len); 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; ret = 1;
} }
RegCloseKey(subkey); RegCloseKey(subkey);