cvs: ZendEngine2 / zend.c zend_builtin_functions.c

helly		Tue Dec 30 20:14:58 2008 UTC

  Modified files:              
    /ZendEngine2	zend.c zend_builtin_functions.c 
  Log:
  - Provide a core module that contains all Zend and php/main stuff but stdClass
  
http://cvs.php.net/viewvc.cgi/ZendEngine2/zend.c?r1=1.424&r2=1.425&diff_format=u
Index: ZendEngine2/zend.c
diff -u ZendEngine2/zend.c:1.424 ZendEngine2/zend.c:1.425
--- ZendEngine2/zend.c:1.424	Tue Dec 30 18:17:28 2008
+++ ZendEngine2/zend.c	Tue Dec 30 20:14:58 2008
@@ -17,7 +17,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: zend.c,v 1.424 2008/12/30 18:17:28 helly Exp $ */
+/* $Id: zend.c,v 1.425 2008/12/30 20:14:58 helly Exp $ */
 
 #include "zend.h"
 #include "zend_extensions.h"
@@ -684,6 +684,7 @@
 	zend_initialize_class_data(zend_standard_class_def, 1 TSRMLS_CC);
 
 	zend_hash_add(CG(class_table), "stdclass", sizeof("stdclass"), &zend_standard_class_def, sizeof(zend_class_entry *), NULL);
+	zend_standard_class_def->module = EG(current_module);
 }
 /* }}} */
 
@@ -1159,6 +1160,7 @@
 	EG(user_error_handler) = NULL;
 	EG(user_exception_handler) = NULL;
 #endif
+
 	register_standard_class(TSRMLS_C);
 	zend_register_standard_constants(TSRMLS_C);
 	zend_register_auto_global("GLOBALS", sizeof("GLOBALS") - 1, NULL TSRMLS_CC);
http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_builtin_functions.c?r1=1.392&r2=1.393&diff_format=u
Index: ZendEngine2/zend_builtin_functions.c
diff -u ZendEngine2/zend_builtin_functions.c:1.392 ZendEngine2/zend_builtin_functions.c:1.393
--- ZendEngine2/zend_builtin_functions.c:1.392	Tue Dec 30 19:00:37 2008
+++ ZendEngine2/zend_builtin_functions.c	Tue Dec 30 20:14:58 2008
@@ -17,7 +17,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: zend_builtin_functions.c,v 1.392 2008/12/30 19:00:37 bjori Exp $ */
+/* $Id: zend_builtin_functions.c,v 1.393 2008/12/30 20:14:58 helly Exp $ */
 
 #include "zend.h"
 #include "zend_API.h"
@@ -293,7 +293,7 @@
 
 zend_module_entry zend_builtin_module = { /* {{{ */
     STANDARD_MODULE_HEADER,
-	"Zend",
+	"Core",
 	builtin_functions,
 	NULL,
 	NULL,
@@ -307,7 +307,9 @@
 
 int zend_startup_builtin_functions(TSRMLS_D) /* {{{ */
 {
-	return zend_register_internal_module(&zend_builtin_module TSRMLS_CC) == NULL ? FAILURE : SUCCESS;
+	zend_builtin_module.module_number = 0;
+	zend_builtin_module.type = MODULE_PERSISTENT;
+	return (EG(current_module) = zend_register_module_ex(&zend_builtin_module TSRMLS_CC)) == NULL ? FAILURE : SUCCESS;
 }
 /* }}} */