From 894e2f15f04dd37de7e109eb5e75e85a16f6c76d Mon Sep 17 00:00:00 2001 From: foobar Date: Fri, 11 Jul 2003 04:24:11 +0000 Subject: MFH: Fixed bug #21074 (Apache2: "ErrorDocument xxx /error.php" broken). --- sapi/apache2handler/sapi_apache2.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'sapi/apache2handler/sapi_apache2.c') diff --git a/sapi/apache2handler/sapi_apache2.c b/sapi/apache2handler/sapi_apache2.c index 81ea318130..5e64c5161c 100644 --- a/sapi/apache2handler/sapi_apache2.c +++ b/sapi/apache2handler/sapi_apache2.c @@ -470,9 +470,15 @@ static int php_handler(request_rec *r) return DECLINED; } - /* setup standard CGI variables */ - ap_add_common_vars(r); - ap_add_cgi_vars(r); + /* Setup the CGI variables if this is the main request */ + if (r->main == NULL || + /* .. or if the sub-request envinronment differs from the main-request. */ + r->subprocess_env != r->main->subprocess_env + ) { + /* setup standard CGI variables */ + ap_add_common_vars(r); + ap_add_cgi_vars(r); + } ctx = SG(server_context); if (ctx == NULL) { -- cgit v1.2.1