From: Jeff Trawick <trawick@apache.org>
Date: Thu, 9 Apr 2015 20:48:42 +0000 (+0000)
Subject: Merge r1672480,1672483 from trunk:
X-Git-Tag: 2.4.13~286
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=47de7462a943422ab6b6f69e03c5859df025dd59;p=apache

Merge r1672480,1672483 from trunk:

SetEnv doesn't work for proxy-scgi-pathinfo
Further tweak: omit the period after the example lest it get copied


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1672484 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/docs/manual/mod/mod_proxy_scgi.xml b/docs/manual/mod/mod_proxy_scgi.xml
index 7224f61ac6..e62a8809c8 100644
--- a/docs/manual/mod/mod_proxy_scgi.xml
+++ b/docs/manual/mod/mod_proxy_scgi.xml
@@ -79,8 +79,8 @@ ProxyPass /scgi-bin/ balancer://somecluster/
 
 <section id="env"><title>Environment Variables</title>
     <p>In addition to the configuration directives that control the
-    behaviour of <module>mod_proxy</module>, there are a number of
-    <dfn>environment variables</dfn> that control the SCGI protocol
+    behaviour of <module>mod_proxy</module>, an <dfn>environment
+    variable</dfn> may also control the SCGI protocol
     provider:</p>
     <dl>
         <dt>proxy-scgi-pathinfo</dt>
@@ -89,7 +89,11 @@ ProxyPass /scgi-bin/ balancer://somecluster/
         the backend SCGI server to correctly determine <var>SCRIPT_NAME</var>
         and <var>Script-URI</var> and be compliant with RFC 3875 section 3.3.
         If instead you need <module>mod_proxy_scgi</module> to generate
-        a "best guess" for <var>PATH_INFO</var>, set this env-var.</dd>
+        a "best guess" for <var>PATH_INFO</var>, set this env-var.  The
+        variable must be set before <directive mod="env">SetEnv</directive>
+        is effective.  <directive mod="setenv">SetEnvIf</directive> can be
+        used instead: <code>SetEnvIf Request_URI . proxy-scgi-pathinfo</code>
+        </dd>
     </dl>
 </section>