pollita Wed May 5 14:18:57 2004 EDT
Modified files:
/php-src/ext/standard user_filters.c
/php-src/main/streams userspace.c
/php-src NEWS
Log:
BugFix#28287 stream_*_register() not calling __autoload().
http://cvs.php.net/diff.php/php-src/ext/standard/user_filters.c?r1=1.25&r2=1.26&ty=u
Index: php-src/ext/standard/user_filters.c
diff -u php-src/ext/standard/user_filters.c:1.25
php-src/ext/standard/user_filters.c:1.26
--- php-src/ext/standard/user_filters.c:1.25 Sat Apr 10 09:56:27 2004
+++ php-src/ext/standard/user_filters.c Wed May 5 14:18:56 2004
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: user_filters.c,v 1.25 2004/04/10 13:56:27 helly Exp $ */
+/* $Id: user_filters.c,v 1.26 2004/05/05 18:18:56 pollita Exp $ */
#include "php.h"
#include "php_globals.h"
@@ -280,8 +280,8 @@
/* bind the classname to the actual class */
if (fdat->ce == NULL) {
- if (FAILURE == zend_hash_find(EG(class_table), fdat->classname,
strlen(fdat->classname)+1,
- (void **)&fdat->ce)) {
+ if (FAILURE == zend_lookup_class(fdat->classname,
strlen(fdat->classname),
+ (zend_class_entry ***)&fdat->ce TSRMLS_CC)) {
php_error_docref(NULL TSRMLS_CC, E_WARNING,
"user-filter \"%s\" requires class \"%s\", but
that class is not defined",
filtername, fdat->classname);
http://cvs.php.net/diff.php/php-src/main/streams/userspace.c?r1=1.23&r2=1.24&ty=u
Index: php-src/main/streams/userspace.c
diff -u php-src/main/streams/userspace.c:1.23 php-src/main/streams/userspace.c:1.24
--- php-src/main/streams/userspace.c:1.23 Tue Mar 16 19:08:22 2004
+++ php-src/main/streams/userspace.c Wed May 5 14:18:57 2004
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: userspace.c,v 1.23 2004/03/17 00:08:22 pollita Exp $ */
+/* $Id: userspace.c,v 1.24 2004/05/05 18:18:57 pollita Exp $ */
#include "php.h"
#include "php_globals.h"
@@ -417,7 +417,7 @@
zend_str_tolower(uwrap->classname, classname_len);
rsrc_id = ZEND_REGISTER_RESOURCE(NULL, uwrap, le_protocols);
- if (zend_hash_find(EG(class_table), uwrap->classname, classname_len + 1,
(void**)&uwrap->ce) == SUCCESS) {
+ if (zend_lookup_class(uwrap->classname, classname_len,
(zend_class_entry***)&uwrap->ce TSRMLS_CC) == SUCCESS) {
uwrap->ce = *(zend_class_entry**)uwrap->ce;
if (php_register_url_stream_wrapper(protocol, &uwrap->wrapper
TSRMLS_CC) == SUCCESS) {
RETURN_TRUE;
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1703&r2=1.1704&ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1703 php-src/NEWS:1.1704
--- php-src/NEWS:1.1703 Tue May 4 11:11:06 2004
+++ php-src/NEWS Wed May 5 14:18:57 2004
@@ -2,6 +2,7 @@
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
?? ??? 2004, PHP 5 Release Candidate 3
- You may now use count() on COM arrays. (Wez)
+- Fixed bug #28287 (stream_*_register() not calling __autoload()). (Sara)
- Fixed bug #28161 (COM: Array style properties could not be accessed). (Wez)
- Fixed bug #28125 (ArrayObject leaks when accessing elements). (Marcus)
- Fixed bug #28099 (ArrayObject doesn't implement ArrayAccess). (Marcus)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
