helly Tue Nov 5 10:15:51 2002 EDT
Modified files:
/php4/sapi/cli php_cli.c
Log:
call php_module_startup after zts has been initialised. This way we could
have called zend_ini_deactivate(TSRMLS_C). But it seems unnecessary.
#tested with ZTS and non ZTS build and many manual fail points.
#now it even compiles without any warning, at least for me
Index: php4/sapi/cli/php_cli.c
diff -u php4/sapi/cli/php_cli.c:1.47 php4/sapi/cli/php_cli.c:1.48
--- php4/sapi/cli/php_cli.c:1.47 Tue Nov 5 06:13:35 2002
+++ php4/sapi/cli/php_cli.c Tue Nov 5 10:15:51 2002
@@ -431,12 +431,6 @@
cli_sapi_module.executable_location = argv[0];
- /* startup after we get the above ini override se we get things right */
- if (php_module_startup(&cli_sapi_module, NULL, 0)==FAILURE) {
- goto err;
- }
- module_started = 1;
-
#ifdef ZTS
compiler_globals = ts_resource(compiler_globals_id);
executor_globals = ts_resource(executor_globals_id);
@@ -444,6 +438,18 @@
sapi_globals = ts_resource(sapi_globals_id);
tsrm_ls = ts_resource(0);
#endif
+
+ /* startup after we get the above ini override se we get things right */
+ if (php_module_startup(&cli_sapi_module, NULL, 0)==FAILURE) {
+ /* there is no way to see if we must call zend_ini_deactivate()
+ * since we cannot check if EG(ini_directives) has been initialised
+ * because the executor's constructor does not set initialize it.
+ * Apart from that there seems no need for zend_ini_deactivate() yet.
+ * So we goto out_err.*/
+ exit_status = 1;
+ goto out_err;
+ }
+ module_started = 1;
zend_first_try {
while ((c=ap_php_getopt(argc, argv, OPTSTRING))!=-1) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
