mirror of
https://github.com/php/php-src.git
synced 2024-09-22 02:17:32 +00:00
- MFH Move stdClass registering where it should be
This commit is contained in:
parent
08659c2dcd
commit
63d00f7006
15
Zend/zend.c
15
Zend/zend.c
@ -432,20 +432,6 @@ static FILE *zend_fopen_wrapper(const char *filename, char **opened_path TSRMLS_
|
|||||||
}
|
}
|
||||||
/* }}} */
|
/* }}} */
|
||||||
|
|
||||||
static void register_standard_class(TSRMLS_D) /* {{{ */
|
|
||||||
{
|
|
||||||
zend_standard_class_def = calloc(1, sizeof(zend_class_entry));
|
|
||||||
|
|
||||||
zend_standard_class_def->type = ZEND_INTERNAL_CLASS;
|
|
||||||
zend_standard_class_def->name_length = sizeof("stdClass") - 1;
|
|
||||||
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(CG(class_table), "stdclass", sizeof("stdclass"), &zend_standard_class_def, sizeof(zend_class_entry *), NULL);
|
|
||||||
zend_standard_class_def->module = EG(current_module);
|
|
||||||
}
|
|
||||||
/* }}} */
|
|
||||||
|
|
||||||
#ifdef ZTS
|
#ifdef ZTS
|
||||||
static zend_bool asp_tags_default = 0;
|
static zend_bool asp_tags_default = 0;
|
||||||
static zend_bool short_tags_default = 1;
|
static zend_bool short_tags_default = 1;
|
||||||
@ -703,7 +689,6 @@ int zend_startup(zend_utility_functions *utility_functions, char **extensions, i
|
|||||||
zend_startup_builtin_functions(TSRMLS_C);
|
zend_startup_builtin_functions(TSRMLS_C);
|
||||||
}
|
}
|
||||||
|
|
||||||
register_standard_class(TSRMLS_C);
|
|
||||||
zend_register_standard_constants(TSRMLS_C);
|
zend_register_standard_constants(TSRMLS_C);
|
||||||
zend_register_auto_global("GLOBALS", sizeof("GLOBALS") - 1, NULL TSRMLS_CC);
|
zend_register_auto_global("GLOBALS", sizeof("GLOBALS") - 1, NULL TSRMLS_CC);
|
||||||
|
|
||||||
|
@ -286,11 +286,21 @@ static const zend_function_entry builtin_functions[] = { /* {{{ */
|
|||||||
};
|
};
|
||||||
/* }}} */
|
/* }}} */
|
||||||
|
|
||||||
|
ZEND_MINIT_FUNCTION(core) { /* {{{ */
|
||||||
|
zend_class_entry class_entry;
|
||||||
|
|
||||||
|
INIT_CLASS_ENTRY(class_entry, "stdClass", NULL);
|
||||||
|
zend_standard_class_def = zend_register_internal_class(&class_entry TSRMLS_CC);
|
||||||
|
|
||||||
|
return SUCCESS;
|
||||||
|
}
|
||||||
|
/* }}} */
|
||||||
|
|
||||||
zend_module_entry zend_builtin_module = { /* {{{ */
|
zend_module_entry zend_builtin_module = { /* {{{ */
|
||||||
STANDARD_MODULE_HEADER,
|
STANDARD_MODULE_HEADER,
|
||||||
"Core",
|
"Core",
|
||||||
builtin_functions,
|
builtin_functions,
|
||||||
NULL,
|
ZEND_MINIT(core),
|
||||||
NULL,
|
NULL,
|
||||||
NULL,
|
NULL,
|
||||||
NULL,
|
NULL,
|
||||||
|
Loading…
Reference in New Issue
Block a user