helly Mon Sep 8 06:45:20 2003 EDT
Added files:
/php-src/tests/classes class_stdclass.phpt
Modified files:
/ZendEngine2 zend.c
Log:
Fix registering/derigistering of stdClass in ZTS and NON ZTS mode
Index: ZendEngine2/zend.c
diff -u ZendEngine2/zend.c:1.248 ZendEngine2/zend.c:1.249
--- ZendEngine2/zend.c:1.248 Mon Sep 1 09:05:50 2003
+++ ZendEngine2/zend.c Mon Sep 8 06:45:18 2003
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: zend.c,v 1.248 2003/09/01 13:05:50 helly Exp $ */
+/* $Id: zend.c,v 1.249 2003/09/08 10:45:18 helly Exp $ */
#include "zend.h"
#include "zend_extensions.h"
@@ -401,16 +401,9 @@
zend_standard_class_def->name = zend_strndup("stdClass",
zend_standard_class_def->name_length);
zend_initialize_class_data(zend_standard_class_def, 1 TSRMLS_CC);
- zend_hash_add(GLOBAL_CLASS_TABLE, "stdclass", sizeof("stdclass")-1,
&zend_standard_class_def, sizeof(zend_class_entry *), NULL);
+ zend_hash_add(CG(class_table), "stdclass", sizeof("stdclass"),
&zend_standard_class_def, sizeof(zend_class_entry *), NULL);
}
-#ifdef ZTS
-static void unregister_standard_class()
-{
- destroy_zend_class(&zend_standard_class_def);
-}
-#endif
-
static void zend_set_default_compile_time_values(TSRMLS_D)
{
/* default compile-time values */
@@ -697,7 +690,6 @@
zend_shutdown_constants(TSRMLS_C);
#ifdef ZTS
zend_hash_destroy(GLOBAL_CONSTANTS_TABLE);
- unregister_standard_class();
#endif
}
Index: php-src/tests/classes/class_stdclass.phpt
+++ php-src/tests/classes/class_stdclass.phpt
--TEST--
Instantiate stdClass
--FILE--
<?php
$obj = new stdClass;
echo get_class($obj)."\n";
echo "Done\n";
?>
--EXPECTF--
stdClass
Done
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
