From: Jim Jagielski <jim@apache.org>
Date: Thu, 9 Feb 2017 12:58:35 +0000 (+0000)
Subject: Allow final admin-level fine-tuning
X-Git-Tag: 2.5.0-alpha~679
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=54cb64ca1b9a05db079841254bcdfa4015784ef2;p=thirdparty%2Fapache%2Fhttpd.git

Allow final admin-level fine-tuning

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1782323 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/modules/proxy/mod_proxy_fcgi.c b/modules/proxy/mod_proxy_fcgi.c
index 15822ba0fa4..de08396b533 100644
--- a/modules/proxy/mod_proxy_fcgi.c
+++ b/modules/proxy/mod_proxy_fcgi.c
@@ -371,7 +371,6 @@ static apr_status_t send_environment(proxy_conn_rec *conn, request_rec *r,
 
     ap_add_common_vars(r);
     ap_add_cgi_vars(r);
-    fix_cgivars(r, dconf);
 
     if (fpm || apr_table_get(r->notes, "virtual_script")) {
         /*
@@ -395,6 +394,9 @@ static apr_status_t send_environment(proxy_conn_rec *conn, request_rec *r,
 
     /* XXX are there any FastCGI specific env vars we need to send? */
 
+    /* Give admins final option to fine-tune env vars */
+    fix_cgivars(r, dconf);
+
     /* XXX mod_cgi/mod_cgid use ap_create_environment here, which fills in
      *     the TZ value specially.  We could use that, but it would mean
      *     parsing the key/value pairs back OUT of the allocated env array,