cvs: php4 /main main.c

sas Thu Oct 26 11:32:39 2000 EDT Modified files: /php4/main main.c Log: Move some initialization code from php_execute_script() to php_request_startup() where it should be. AFAICT, it does not cause any problems, but please it test it with your favorite SAPI module. Index: php4/main/main.c diff -u php4/main/main.c:1.326 php4/main/main.c:1.327 --- php4/main/main.c:1.326 Fri Oct 20 11:25:16 2000 +++ php4/main/main.c Thu Oct 26 11:32:38 2000 @@ -19,7 +19,7 @@ */ -/* $Id: main.c,v 1.326 2000/10/20 18:25:16 andrei Exp $ */ +/* $Id: main.c,v 1.327 2000/10/26 18:32:38 sas Exp $ */ #include <stdio.h> @@ -595,6 +595,7 @@ } #endif +static int php_hash_environment(ELS_D SLS_DC PLS_DC); int php_request_startup(CLS_D ELS_DC PLS_DC SLS_DC) { @@ -631,6 +632,10 @@ /* We turn this off in php_execute_script() */ /* PG(during_request_startup) = 0; */ + php_hash_environment(ELS_C SLS_CC PLS_CC); + zend_activate_modules(); + PG(modules_activated)=1; + return SUCCESS; } @@ -1135,10 +1140,6 @@ char *old_cwd; SLS_FETCH(); - 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)) {