mirror of
https://github.com/php/php-src.git
synced 2026-03-24 00:02:20 +01:00
- 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.
This commit is contained in:
@@ -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;
|
||||
|
||||
Reference in New Issue
Block a user