cvs: php4 / main.c

andi		Sun May 28 10:19:49 2000 EDT

  Modified files:
    /php4	main.c 
  Log:
  - Move zend_activate_modules() to later on.
  
  
Index: php4/main.c
diff -u php4/main.c:1.254 php4/main.c:1.255
--- php4/main.c:1.254	Sun May 28 09:22:28 2000
+++ php4/main.c	Sun May 28 10:19:49 2000
@@ -19,7 +19,7 @@
 */
 
 
-/* $Id: main.c,v 1.254 2000/05/28 16:22:28 sas Exp $ */
+/* $Id: main.c,v 1.255 2000/05/28 17:19:49 andi Exp $ */
 
 
 #include <stdio.h>
@@ -1147,31 +1147,28 @@
 	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)) {
 			sapi_add_header(CONTEXT_TYPE_IMAGE_GIF, sizeof(CONTEXT_TYPE_IMAGE_GIF)-1, 1);
 			PHPWRITE(php_logo, sizeof(php_logo));
-			zend_deactivate_modules();
 			return;
 		} else if (!strcmp(SG(request_info).query_string+1, PHP_EGG_LOGO_GUID)) {
 			sapi_add_header(CONTEXT_TYPE_IMAGE_GIF, sizeof(CONTEXT_TYPE_IMAGE_GIF)-1, 1);
 			PHPWRITE(php_egg_logo, sizeof(php_egg_logo));
-			zend_deactivate_modules();
 			return;
 		} else if (!strcmp(SG(request_info).query_string+1, ZEND_LOGO_GUID)) {
 			sapi_add_header(CONTEXT_TYPE_IMAGE_GIF, sizeof(CONTEXT_TYPE_IMAGE_GIF)-1, 1);
 			PHPWRITE(zend_logo, sizeof(zend_logo));
-			zend_deactivate_modules();
 			return;
 		} else if (!strcmp(SG(request_info).query_string+1, "PHPB8B5F2A0-3C92-11d3-A3A9-4C7B08C10000")) {
 			php_print_credits(PHP_CREDITS_ALL);
-			zend_deactivate_modules();
 			return;
 		}
 	}
+
+	zend_activate_modules();
 
 	if (setjmp(EG(bailout))!=0) {
 		zend_deactivate_modules();