mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-11-25 02:44:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix TSRM embed startup

Browse Source
This commit is contained in:
Stanislav Malyshev 2007-08-08 21:06:28 +00:00
parent ef71664817
commit 6c8312fa03
1 changed files with 9 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
sapi/embed/php_embed.c
View File

@ -143,9 +143,6 @@ int php_embed_init(int argc, char **argv PTSRMLS_DC)
{ {
zend_llist global_vars; zend_llist global_vars;
#ifdef ZTS #ifdef ZTS
zend_compiler_globals *compiler_globals;
zend_executor_globals *executor_globals;
php_core_globals *core_globals;
sapi_globals_struct *sapi_globals; sapi_globals_struct *sapi_globals;
void ***tsrm_ls; void ***tsrm_ls;
#endif #endif
@ -173,15 +170,6 @@ int php_embed_init(int argc, char **argv PTSRMLS_DC)
tsrm_startup(1, 1, 0, NULL); tsrm_startup(1, 1, 0, NULL);
#endif #endif
#ifdef ZTS
compiler_globals = ts_resource(compiler_globals_id);
executor_globals = ts_resource(executor_globals_id);
core_globals = ts_resource(core_globals_id);
sapi_globals = ts_resource(sapi_globals_id);
tsrm_ls = ts_resource(0);
*ptsrm_ls = tsrm_ls;
#endif
ini_entries_len = strlen(HARDCODED_INI); ini_entries_len = strlen(HARDCODED_INI);
php_embed_module.ini_entries = malloc(ini_entries_len+2); php_embed_module.ini_entries = malloc(ini_entries_len+2);
memcpy(php_embed_module.ini_entries, HARDCODED_INI, ini_entries_len+1); memcpy(php_embed_module.ini_entries, HARDCODED_INI, ini_entries_len+1);
@ -189,24 +177,24 @@ int php_embed_init(int argc, char **argv PTSRMLS_DC)
sapi_startup(&php_embed_module); sapi_startup(&php_embed_module);
if (argv) {
php_embed_module.executable_location = argv[0];
}
if (php_embed_module.startup(&php_embed_module)==FAILURE) { if (php_embed_module.startup(&php_embed_module)==FAILURE) {
return FAILURE; return FAILURE;
} }
if (argv) { #ifdef ZTS
php_embed_module.executable_location = argv[0]; sapi_globals = ts_resource(sapi_globals_id);
} tsrm_ls = ts_resource(0);
*ptsrm_ls = tsrm_ls;
#endif
zend_llist_init(&global_vars, sizeof(char *), NULL, 0); zend_llist_init(&global_vars, sizeof(char *), NULL, 0);
/* Set some Embedded PHP defaults */ /* Set some Embedded PHP defaults */
SG(options) |= SAPI_OPTION_NO_CHDIR; SG(options) |= SAPI_OPTION_NO_CHDIR;
#if 0
// zend_alter_ini_entry("register_argc_argv", 19, "1", 1, PHP_INI_SYSTEM, PHP_INI_STAGE_ACTIVATE);
// zend_alter_ini_entry("html_errors", 12, "0", 1, PHP_INI_SYSTEM, PHP_INI_STAGE_ACTIVATE);
// zend_alter_ini_entry("implicit_flush", 15, "1", 1, PHP_INI_SYSTEM, PHP_INI_STAGE_ACTIVATE);
// zend_alter_ini_entry("max_execution_time", 19, "0", 1, PHP_INI_SYSTEM, PHP_INI_STAGE_ACTIVATE);
#endif
SG(request_info).argc=argc; SG(request_info).argc=argc;
SG(request_info).argv=argv; SG(request_info).argv=argv;