cvs: php4 / main.c php4dllts.dsp php_globals.h

zeev Mon May 29 11:45:06 2000 EDT Modified files: /php4 main.c php4dllts.dsp php_globals.h Log: Fix startup sequence. It should do it this time. Index: php4/main.c diff -u php4/main.c:1.256 php4/main.c:1.257 --- php4/main.c:1.256 Mon May 29 10:22:35 2000 +++ php4/main.c Mon May 29 11:45:06 2000 @@ -19,7 +19,7 @@ */ -/* $Id: main.c,v 1.256 2000/05/29 17:22:35 zeev Exp $ */ +/* $Id: main.c,v 1.257 2000/05/29 18:45:06 zeev Exp $ */ #include <stdio.h> @@ -679,6 +679,7 @@ php_output_startup(); /* initialize global variables */ + PG(modules_activated) = 0; PG(header_is_being_sent) = 0; PG(connection_status) = PHP_CONNECTION_NORMAL; @@ -728,6 +729,9 @@ php_ini_rshutdown(); EG(error_reporting) = PG(error_reporting); + if (PG(modules_activated)) { + zend_deactivate_modules(); + } zend_deactivate(CLS_C ELS_CC); sapi_deactivate(SLS_C); @@ -1166,6 +1170,9 @@ php_hash_environment(ELS_C SLS_CC PLS_CC); + zend_activate_modules(); + PG(modules_activated)=1; + if (SG(request_info).query_string && SG(request_info).query_string[0]=='=' && PG(expose_php)) { if (!strcmp(SG(request_info).query_string+1, PHP_LOGO_GUID)) { @@ -1186,10 +1193,8 @@ } } - zend_activate_modules(); if (setjmp(EG(bailout))!=0) { - zend_deactivate_modules(); return; } @@ -1218,7 +1223,6 @@ EG(active_op_array) = EG(main_op_array); zend_execute(EG(main_op_array) ELS_CC); } - zend_deactivate_modules(); } #ifdef PHP_WIN32 Index: php4/php4dllts.dsp diff -u php4/php4dllts.dsp:1.68 php4/php4dllts.dsp:1.69 --- php4/php4dllts.dsp:1.68 Tue May 23 10:45:05 2000 +++ php4/php4dllts.dsp Mon May 29 11:45:06 2000 @@ -1118,6 +1118,10 @@ # End Source File # Begin Source File +SOURCE=".\php.ini-optimized" +# End Source File +# Begin Source File + SOURCE=".\README.CVS-RULES" # End Source File # Begin Source File Index: php4/php_globals.h diff -u php4/php_globals.h:1.48 php4/php_globals.h:1.49 --- php4/php_globals.h:1.48 Thu May 18 08:34:21 2000 +++ php4/php_globals.h Mon May 29 11:45:06 2000 @@ -67,8 +67,8 @@ zend_bool safe_mode; zend_bool sql_safe_mode; - char *safe_mode_exec_dir; zend_bool enable_dl; + char *safe_mode_exec_dir; long memory_limit; @@ -97,14 +97,6 @@ char *gpc_order; char *variables_order; - zend_bool expose_php; - - zend_bool track_vars; - zend_bool register_globals; - zend_bool register_argc_argv; - - zend_bool y2k_compliance; - short connection_status; short ignore_user_abort; @@ -115,6 +107,16 @@ zend_llist tick_functions; php_http_globals http_globals; + + zend_bool expose_php; + + zend_bool track_vars; + zend_bool register_globals; + zend_bool register_argc_argv; + + zend_bool y2k_compliance; + + zend_bool modules_activated; };