- Move zend_activate_modules() to later on.

diff --git a/main/main.c b/main/main.c
index 416e1fb333d8e09ba943ecd5e184bb62bb8eed8d..76c8d83de2cf0fe47f0fffb6a89702157a623276 100644 (file)
--- a/main/main.c
+++ b/main/main.c
@@ -1147,32 +1147,29 @@ PHPAPI void php_execute_script(zend_file_handle *primary_file CLS_DC ELS_DC PLS_
        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();
                return;