cvs: php4 /sapi/apache mod_php4.c
| From: | Zeev Suraski | Date: | Tue, 15 May 2001 14:55:42 +0000 |
| Subject: | cvs: php4 /sapi/apache mod_php4.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-5758@lists.php.net to get a copy of this message | ||
zeev Tue May 15 07:55:42 2001 EDT
Modified files:
/php4/sapi/apache mod_php4.c
Log:
Move the initialization to a safer place (earlier, it could end up
not being reset to 0 under certain circumstances)
Index: php4/sapi/apache/mod_php4.c
diff -u php4/sapi/apache/mod_php4.c:1.96 php4/sapi/apache/mod_php4.c:1.97
--- php4/sapi/apache/mod_php4.c:1.96 Sun May 13 02:03:46 2001
+++ php4/sapi/apache/mod_php4.c Tue May 15 07:55:42 2001
@@ -17,7 +17,7 @@
| PHP 4.0 patches by Zeev Suraski <zeev@zend.com> |
+----------------------------------------------------------------------+
*/
-/* $Id: mod_php4.c,v 1.96 2001/05/13 09:03:46 zeev Exp $ */
+/* $Id: mod_php4.c,v 1.97 2001/05/15 14:55:42 zeev Exp $ */
#define NO_REGEX_EXTRA_H
#ifdef WIN32
@@ -307,6 +307,7 @@
*/
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 @@
zend_execute_scripts(ZEND_INCLUDE CLS_CC ELS_CC, 1, &fh);
return OK;
}
- AP(in_request)=1;
if (setjmp(EG(bailout))!=0) {
return OK;