cvs: php4 /sapi/apache2filter sapi_apache2.c
| From: | Sascha Schumann | Date: | Wed, 01 Nov 2000 19:26:57 +0000 |
| Subject: | cvs: php4 /sapi/apache2filter sapi_apache2.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-2403@lists.php.net to get a copy of this message | ||
sas Wed Nov 1 11:26:57 2000 EDT
Modified files:
/php4/sapi/apache2filter sapi_apache2.c
Log:
Our context's lifetime differs from the lifetime of a filter's context,
so don't set the filter's context in the INIT_CTX macro.
Index: php4/sapi/apache2filter/sapi_apache2.c
diff -u php4/sapi/apache2filter/sapi_apache2.c:1.16 php4/sapi/apache2filter/sapi_apache2.c:1.17
--- php4/sapi/apache2filter/sapi_apache2.c:1.16 Wed Nov 1 11:19:46 2000
+++ php4/sapi/apache2filter/sapi_apache2.c Wed Nov 1 11:26:57 2000
@@ -228,7 +228,7 @@
#define INIT_CTX \
if (ctx == NULL) { \
/* Initialize filter context */ \
- SG(server_context) = f->ctx = ctx = apr_pcalloc(f->r->pool, sizeof(*ctx)); \
+ SG(server_context) = ctx = apr_pcalloc(f->r->pool, sizeof(*ctx)); \
ctx->bb = ap_brigade_create(f->c->pool); \
}