From: Marcus Boerger <helly@php.net>
Date: Tue, 30 Dec 2008 20:14:58 +0000 (+0000)
Subject: - Provide a core module that contains all Zend and php/main stuff but stdClass
X-Git-Tag: php-5.4.0alpha1~191^2~4710
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=16e60294d8bde8e4392b47267951190a31c2eeb9;p=php

- Provide a core module that contains all Zend and php/main stuff but stdClass
---

diff --git a/Zend/zend.c b/Zend/zend.c
index 3480eaf386..1f4f610f4f 100644
--- a/Zend/zend.c
+++ b/Zend/zend.c
@@ -684,6 +684,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);
 }
 /* }}} */
 
@@ -1159,6 +1160,7 @@ int zend_startup(zend_utility_functions *utility_functions, char **extensions TS
 	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);
diff --git a/Zend/zend_builtin_functions.c b/Zend/zend_builtin_functions.c
index 4ceccee11e..65d3804b4b 100644
--- a/Zend/zend_builtin_functions.c
+++ b/Zend/zend_builtin_functions.c
@@ -293,7 +293,7 @@ static const zend_function_entry builtin_functions[] = { /* {{{ */
 
 zend_module_entry zend_builtin_module = { /* {{{ */
     STANDARD_MODULE_HEADER,
-	"Zend",
+	"Core",
 	builtin_functions,
 	NULL,
 	NULL,
@@ -307,7 +307,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;
 }
 /* }}} */