cvs: php-src(PHP_5_2) / NEWS /win32 registry.c
| From: | Dmitry Stogov | Date: | Wed, 02 May 2007 10:16:34 +0000 |
| Subject: | cvs: php-src(PHP_5_2) / NEWS /win32 registry.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-44130@lists.php.net to get a copy of this message | ||
dmitry Wed May 2 10:16:34 2007 UTC
Modified files: (Branch: PHP_5_2)
/php-src NEWS
/php-src/win32 registry.c
Log:
Fixed bug #41192 (Per Directory Values only work for one key)
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.670&r2=1.2027.2.547.2.671&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.670 php-src/NEWS:1.2027.2.547.2.671
--- php-src/NEWS:1.2027.2.547.2.670 Wed May 2 09:38:11 2007
+++ php-src/NEWS Wed May 2 10:16:34 2007
@@ -3,6 +3,7 @@
?? 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)
http://cvs.php.net/viewvc.cgi/php-src/win32/registry.c?r1=1.16.4.4&r2=1.16.4.5&diff_format=u
Index: php-src/win32/registry.c
diff -u php-src/win32/registry.c:1.16.4.4 php-src/win32/registry.c:1.16.4.5
--- php-src/win32/registry.c:1.16.4.4 Sun Apr 22 10:25:18 2007
+++ php-src/win32/registry.c Wed May 2 10:16:34 2007
@@ -135,11 +135,12 @@
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);