cvs: ZendEngine2(PHP_5_3) / zend.c zend_builtin_functions.c

helly		Tue Dec 30 20:15:28 2008 UTC

  Modified files:              (Branch: PHP_5_3)
    /ZendEngine2	zend.c zend_builtin_functions.c 
  Log:
  - MFH Provide a core module that contains all Zend and php/main (in 5.3 incl. stdClass)
  
http://cvs.php.net/viewvc.cgi/ZendEngine2/zend.c?r1=1.308.2.12.2.35.2.23&r2=1.308.2.12.2.35.2.24&diff_format=u
Index: ZendEngine2/zend.c
diff -u ZendEngine2/zend.c:1.308.2.12.2.35.2.23 ZendEngine2/zend.c:1.308.2.12.2.35.2.24
--- ZendEngine2/zend.c:1.308.2.12.2.35.2.23	Fri Aug 15 19:47:23 2008
+++ ZendEngine2/zend.c	Tue Dec 30 20:15:28 2008
@@ -17,7 +17,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: zend.c,v 1.308.2.12.2.35.2.23 2008/08/15 19:47:23 felipe Exp $ */
+/* $Id: zend.c,v 1.308.2.12.2.35.2.24 2008/12/30 20:15:28 helly Exp $ */
 
 #include "zend.h"
 #include "zend_extensions.h"
@@ -442,6 +442,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);
 }
 /* }}} */
 
@@ -698,6 +699,10 @@
 	EG(user_error_handler) = NULL;
 	EG(user_exception_handler) = NULL;
 #endif
+	if (start_builtin_functions) {
+		zend_startup_builtin_functions(TSRMLS_C);
+	}
+
 	register_standard_class(TSRMLS_C);
 	zend_register_standard_constants(TSRMLS_C);
 	zend_register_auto_global("GLOBALS", sizeof("GLOBALS") - 1, NULL TSRMLS_CC);
@@ -707,10 +712,6 @@
 	zend_init_exception_op(TSRMLS_C);
 #endif
 
-	if (start_builtin_functions) {
-		zend_startup_builtin_functions(TSRMLS_C);
-	}
-
 	zend_ini_startup(TSRMLS_C);
 
 #ifdef ZTS
http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_builtin_functions.c?r1=1.277.2.12.2.25.2.39&r2=1.277.2.12.2.25.2.40&diff_format=u
Index: ZendEngine2/zend_builtin_functions.c
diff -u ZendEngine2/zend_builtin_functions.c:1.277.2.12.2.25.2.39 ZendEngine2/zend_builtin_functions.c:1.277.2.12.2.25.2.40
--- ZendEngine2/zend_builtin_functions.c:1.277.2.12.2.25.2.39	Tue Dec 30 18:55:16 2008
+++ ZendEngine2/zend_builtin_functions.c	Tue Dec 30 20:15:28 2008
@@ -17,7 +17,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: zend_builtin_functions.c,v 1.277.2.12.2.25.2.39 2008/12/30 18:55:16 bjori Exp $ */
+/* $Id: zend_builtin_functions.c,v 1.277.2.12.2.25.2.40 2008/12/30 20:15:28 helly Exp $ */
 
 #include "zend.h"
 #include "zend_API.h"
@@ -288,7 +288,7 @@
 
 zend_module_entry zend_builtin_module = { /* {{{ */
     STANDARD_MODULE_HEADER,
-	"Zend",
+	"Core",
 	builtin_functions,
 	NULL,
 	NULL,
@@ -302,7 +302,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;
 }
 /* }}} */