mirror of
https://github.com/php/php-src.git
synced 2025-08-15 21:48:51 +02:00
Fixed bug #41192 (Per Directory Values only work for one key)
This commit is contained in:
parent
101a0f08ce
commit
c327dec913
2 changed files with 3 additions and 1 deletions
1
NEWS
1
NEWS
|
@ -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)
|
||||||
|
|
|
@ -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);
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue