diff options
| author | Zeev Suraski <zeev@php.net> | 2001-05-15 14:55:42 +0000 |
|---|---|---|
| committer | Zeev Suraski <zeev@php.net> | 2001-05-15 14:55:42 +0000 |
| commit | d1845fb13815bdb0ceb6b51bfbd75ed75faa8b53 (patch) | |
| tree | ad031e0462bd02fa63d303bf99a567a5afc19afc | |
| parent | ea8cd965fe8b33e4f7c06d59565ee36ec1c73381 (diff) | |
| download | php-git-d1845fb13815bdb0ceb6b51bfbd75ed75faa8b53.tar.gz | |
Move the initialization to a safer place (earlier, it could end up
not being reset to 0 under certain circumstances)
| -rw-r--r-- | sapi/apache/mod_php4.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sapi/apache/mod_php4.c b/sapi/apache/mod_php4.c index cfff789b20..f89d015713 100644 --- a/sapi/apache/mod_php4.c +++ b/sapi/apache/mod_php4.c @@ -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; |