stas Wed Aug 8 21:06:28 2007 UTC
Modified files: (Branch: PHP_5_2)
/php-src/sapi/embed php_embed.c
Log:
fix TSRM embed startup
http://cvs.php.net/viewvc.cgi/php-src/sapi/embed/php_embed.c?r1=1.11.2.1.2.2&r2=1.11.2.1.2.3&diff_format=u
Index: php-src/sapi/embed/php_embed.c
diff -u php-src/sapi/embed/php_embed.c:1.11.2.1.2.2
php-src/sapi/embed/php_embed.c:1.11.2.1.2.3
--- php-src/sapi/embed/php_embed.c:1.11.2.1.2.2 Thu Aug 2 23:45:28 2007
+++ php-src/sapi/embed/php_embed.c Wed Aug 8 21:06:28 2007
@@ -15,7 +15,7 @@
| Author: Edin Kadribasic <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
*/
-/* $Id: php_embed.c,v 1.11.2.1.2.2 2007/08/02 23:45:28 stas Exp $ */
+/* $Id: php_embed.c,v 1.11.2.1.2.3 2007/08/08 21:06:28 stas Exp $ */
#include "php_embed.h"
@@ -143,9 +143,6 @@
{
zend_llist global_vars;
#ifdef ZTS
- zend_compiler_globals *compiler_globals;
- zend_executor_globals *executor_globals;
- php_core_globals *core_globals;
sapi_globals_struct *sapi_globals;
void ***tsrm_ls;
#endif
@@ -173,15 +170,6 @@
tsrm_startup(1, 1, 0, NULL);
#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);
php_embed_module.ini_entries = malloc(ini_entries_len+2);
memcpy(php_embed_module.ini_entries, HARDCODED_INI, ini_entries_len+1);
@@ -189,24 +177,24 @@
sapi_startup(&php_embed_module);
+ if (argv) {
+ php_embed_module.executable_location = argv[0];
+ }
+
if (php_embed_module.startup(&php_embed_module)==FAILURE) {
return FAILURE;
}
- if (argv) {
- php_embed_module.executable_location = argv[0];
- }
+#ifdef ZTS
+ 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);
/* Set some Embedded PHP defaults */
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).argv=argv;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
