helly Thu Nov 3 16:59:13 2005 EDT
Modified files: (Branch: PHP_5_1)
/php-src/ext/spl php_spl.c
Log:
- MFH Try fixing #35088
http://cvs.php.net/diff.php/php-src/ext/spl/php_spl.c?r1=1.52.2.12&r2=1.52.2.13&ty=u
Index: php-src/ext/spl/php_spl.c
diff -u php-src/ext/spl/php_spl.c:1.52.2.12 php-src/ext/spl/php_spl.c:1.52.2.13
--- php-src/ext/spl/php_spl.c:1.52.2.12 Thu Nov 3 16:28:43 2005
+++ php-src/ext/spl/php_spl.c Thu Nov 3 16:59:13 2005
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_spl.c,v 1.52.2.12 2005/11/03 21:28:43 helly Exp $ */
+/* $Id: php_spl.c,v 1.52.2.13 2005/11/03 21:59:13 helly Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -449,7 +449,11 @@
zend_hash_find(EG(function_table), "spl_autoload",
sizeof("spl_autoload"), (void **) &spl_func_ptr);
if (EG(autoload_func) == spl_func_ptr) { /* registered already,
so we insert that first */
- autoload_func_info spl_alfi = {spl_func_ptr, NULL,
NULL};
+ autoload_func_info spl_alfi;
+
+ spl_alfi.func_ptr = spl_func_ptr;
+ spl_alfi.obj = NULL;
+ spl_alfi.ce = NULL;
zend_hash_add(SPL_G(autoload_functions),
"spl_autoload", sizeof("spl_autoload"), &spl_alfi, sizeof(autoload_func_info),
NULL);
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
