From: Marcus Boerger <helly@php.net>
Date: Tue, 30 Dec 2008 20:15:28 +0000 (+0000)
Subject: - MFH Provide a core module that contains all Zend and php/main (in 5.3 incl. stdClass)
X-Git-Tag: php-5.3.0beta1~342
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=826cc0dc3ddaa4c9e5d5f58ec4689260d91b68a1;p=php

- MFH Provide a core module that contains all Zend and php/main (in 5.3 incl. stdClass)
---

diff --git a/Zend/zend.c b/Zend/zend.c
index 5f51d71028..ff85af9061 100644
--- a/Zend/zend.c
+++ b/Zend/zend.c
@@ -442,6 +442,7 @@ static void register_standard_class(TSRMLS_D) /* {{{ */
 	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 @@ int zend_startup(zend_utility_functions *utility_functions, char **extensions, i
 	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 @@ int zend_startup(zend_utility_functions *utility_functions, char **extensions, i
 	zend_init_exception_op(TSRMLS_C);
 #endif
 
-	if (start_builtin_functions) {
-		zend_startup_builtin_functions(TSRMLS_C);
-	}
-
 	zend_ini_startup(TSRMLS_C);
 
 #ifdef ZTS
diff --git a/Zend/zend_builtin_functions.c b/Zend/zend_builtin_functions.c
index 1d65637745..3cd4bd507a 100644
--- a/Zend/zend_builtin_functions.c
+++ b/Zend/zend_builtin_functions.c
@@ -288,7 +288,7 @@ static const zend_function_entry builtin_functions[] = { /* {{{ */
 
 zend_module_entry zend_builtin_module = { /* {{{ */
     STANDARD_MODULE_HEADER,
-	"Zend",
+	"Core",
 	builtin_functions,
 	NULL,
 	NULL,
@@ -302,7 +302,9 @@ zend_module_entry zend_builtin_module = { /* {{{ */
 
 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;
 }
 /* }}} */