archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-18 23:18:56 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

- Move activate_models() back to where it was. I don't want to make such

Browse source 
- 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:
Andi Gutmans 2000-05-21 18:05:04 +00:00
parent a8b0d9609c
commit 7f689fc044
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
main/main.c
View file

@ -1147,6 +1147,8 @@ PHPAPI void php_execute_script(zend_file_handle *primary_file CLS_DC ELS_DC PLS_
SLS_FETCH(); SLS_FETCH();
php_hash_environment(ELS_C SLS_CC PLS_CC); php_hash_environment(ELS_C SLS_CC PLS_CC);
zend_activate_modules();
if (SG(request_info).query_string && SG(request_info).query_string[0]=='=' if (SG(request_info).query_string && SG(request_info).query_string[0]=='='
&& PG(expose_php)) { && PG(expose_php)) {
if (!strcmp(SG(request_info).query_string+1, PHP_LOGO_GUID)) { 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) { if (setjmp(EG(bailout))!=0) {
zend_deactivate_modules(); zend_deactivate_modules();
return; return;