cvs: php4(PHP_4_0_6) /sapi/apache mod_php4.c
| From: | Sterling Hughes | Date: | Wed, 16 May 2001 18:26:09 +0000 |
| Subject: | cvs: php4(PHP_4_0_6) /sapi/apache mod_php4.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-5791@lists.php.net to get a copy of this message | ||
sterling Wed May 16 11:26:09 2001 EDT
Modified files: (Branch: PHP_4_0_6)
/php4/sapi/apache mod_php4.c
Log:
MFH
# slightly modified
Index: php4/sapi/apache/mod_php4.c
diff -u php4/sapi/apache/mod_php4.c:1.94.2.3 php4/sapi/apache/mod_php4.c:1.94.2.4
--- php4/sapi/apache/mod_php4.c:1.94.2.3 Wed May 16 02:01:55 2001
+++ php4/sapi/apache/mod_php4.c Wed May 16 11:26:08 2001
@@ -17,7 +17,7 @@
| PHP 4.0 patches by Zeev Suraski <zeev@zend.com> |
+----------------------------------------------------------------------+
*/
-/* $Id: mod_php4.c,v 1.94.2.3 2001/05/16 09:01:55 dbeu Exp $ */
+/* $Id: mod_php4.c,v 1.94.2.4 2001/05/16 18:26:08 sterling Exp $ */
#define NO_REGEX_EXTRA_H
#ifdef WIN32
@@ -295,7 +295,7 @@
static int php_apache_sapi_activate(SLS_D)
{
- request_rec *r = ((request_rec *) SG(server_context));
+ request_rec *r = (request_rec *) SG(server_context);
APLS_FETCH();
/*
@@ -307,7 +307,7 @@
* memory.
*/
block_alarms();
- register_cleanup(((request_rec *) SG(server_context))->pool, NULL, php_apache_request_shutdown,
php_request_shutdown_for_exec);
+ register_cleanup(r->pool, NULL, php_apache_request_shutdown, php_request_shutdown_for_exec);
AP(in_request)=1;
unblock_alarms();