diff options
Diffstat (limited to 'sapi/apache2handler/sapi_apache2.c')
| -rw-r--r-- | sapi/apache2handler/sapi_apache2.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/sapi/apache2handler/sapi_apache2.c b/sapi/apache2handler/sapi_apache2.c index 5a0095917b..d496eaa946 100644 --- a/sapi/apache2handler/sapi_apache2.c +++ b/sapi/apache2handler/sapi_apache2.c @@ -465,9 +465,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) { |