From: Aaron Bannert <aaron@php.net>
Date: Thu, 11 Apr 2002 17:32:37 +0000 (+0000)
Subject: Don't depend on the context provided by the filter (f->ctx) anymore. In
X-Git-Tag: php-4.2.0RC3~10
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5d2bb8b8d5189eca232d817873ff8aa079e1f226;p=php

Don't depend on the context provided by the filter (f->ctx) anymore. In
Apache 2 the input and output filter contexts are kept unique. We now
only depend on SG(server_context) for each request, and assume that
the same thread will process the entire request. At some point it
would be wise to separate the input and output contexts.
---

diff --git a/sapi/apache2filter/sapi_apache2.c b/sapi/apache2filter/sapi_apache2.c
index d44fed1b56..f0d3b6d4cf 100644
--- a/sapi/apache2filter/sapi_apache2.c
+++ b/sapi/apache2filter/sapi_apache2.c
@@ -252,9 +252,7 @@ static int php_input_filter(ap_filter_t *f, apr_bucket_brigade *bb,
 		return ap_get_brigade(f->next, bb, mode, block, readbytes);
 	}
 
-	ctx = SG(server_context);
-
-	if (ctx == NULL) {
+	if (SG(server_context) == NULL) {
 		/* Initialize filter context */
 		SG(server_context) = ctx = apr_pcalloc(f->r->pool, sizeof(*ctx));
 	}
@@ -330,9 +328,9 @@ static int php_output_filter(ap_filter_t *f, apr_bucket_brigade *bb)
 	ap_add_common_vars(f->r);
 	ap_add_cgi_vars(f->r);
 
-	if (f->ctx == NULL) {
+	if (SG(server_context) == NULL) {
 		/* Initialize filter context */
-		f->ctx = ctx = apr_pcalloc(f->r->pool, sizeof(*ctx));
+		SG(server_context) = ctx = apr_pcalloc(f->r->pool, sizeof(*ctx));
 		ctx->f = f;
 	}
 
@@ -365,7 +363,6 @@ static int php_output_filter(ap_filter_t *f, apr_bucket_brigade *bb)
 				}
 			}
 
-			SG(server_context) = ctx;
 			apply_config(conf);
 			php_apache_request_ctor(f, ctx TSRMLS_CC);