From 7f689fc044ff41bce02629a66ad1b5964b3ba4e2 Mon Sep 17 00:00:00 2001 From: Andi Gutmans Date: Sun, 21 May 2000 18:05:04 +0000 Subject: [PATCH] - 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. --- main/main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/main/main.c b/main/main.c index 07a7fd9fa8..b85c2ef89f 100644 --- a/main/main.c +++ b/main/main.c @@ -1147,6 +1147,8 @@ 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)) { @@ -1167,8 +1169,6 @@ PHPAPI void php_execute_script(zend_file_handle *primary_file CLS_DC ELS_DC PLS_ } } - zend_activate_modules(); - if (setjmp(EG(bailout))!=0) { zend_deactivate_modules(); return; -- 2.50.1