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

Move the initialization to a safer place (earlier, it could end up

Browse source 
not being reset to 0 under certain circumstances)
This commit is contained in:
Zeev Suraski 2001-05-15 14:55:42 +00:00
parent ea8cd965fe
commit d1845fb138
1 changed files with 1 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
sapi/apache/mod_php4.c
View file

@ -307,6 +307,7 @@ static int php_apache_sapi_activate(SLS_D)
*/
block_alarms();
register_cleanup(((request_rec *) SG(server_context))->pool, NULL, php_apache_request_shutdown, php_request_shutdown_for_exec);
AP(in_request)=1;
unblock_alarms();
/* Override the default headers_only value - sometimes "GET" requests should actually only
@ -458,7 +459,6 @@ static int send_php(request_rec *r, int display_source_mode, char *filename)
zend_execute_scripts(ZEND_INCLUDE CLS_CC ELS_CC, 1, &fh);
return OK;
}
AP(in_request)=1;
if (setjmp(EG(bailout))!=0) {
return OK;