cvs: php4 / main.c

andi		Sun May 21 20:05:04 2000 EDT

  Modified files:
    /php4	main.c 
  Log:
  - Move activate_models() back to where it was. I don't want to make such
  - an optimization right before 4.0.0. Who knows, maybe one of the phpinfo()
  - functions depends on some information only available after RINIT.
  - In any case, my fix for .phps stays in.
  
  
Index: php4/main.c
diff -u php4/main.c:1.249 php4/main.c:1.250
--- php4/main.c:1.249	Sun May 21 18:36:16 2000
+++ php4/main.c	Sun May 21 20:05:04 2000
@@ -19,7 +19,7 @@
 */
 
 
-/* $Id: main.c,v 1.249 2000/05/21 16:36:16 andi Exp $ */
+/* $Id: main.c,v 1.250 2000/05/21 18:05:04 andi Exp $ */
 
 
 #include <stdio.h>
@@ -1147,6 +1147,8 @@
 	SLS_FETCH();
 
 	php_hash_environment(ELS_C SLS_CC PLS_CC);
+	zend_activate_modules();
+
 	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)) {
@@ -1166,8 +1168,6 @@
 			return;
 		}
 	}
-
-	zend_activate_modules();
 
 	if (setjmp(EG(bailout))!=0) {
 		zend_deactivate_modules();