svn commit: r1785909 - /httpd/httpd/branches/2.4.x/docs/manual/mod/mod_proxy.xml

[co...@apache.org]

Author: covener
Date: Wed Mar  8 00:41:04 2017
New Revision: 1785909

URL: http://svn.apache.org/viewvc?rev=1785909&view=rev
Log:
Merge r1785907 from trunk:

compat inline for no-proxy



Modified:
    httpd/httpd/branches/2.4.x/docs/manual/mod/mod_proxy.xml

Modified: httpd/httpd/branches/2.4.x/docs/manual/mod/mod_proxy.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/mod/mod_proxy.xml?rev=1785909&r1=1785908&r2=1785909&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/mod/mod_proxy.xml (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/mod/mod_proxy.xml Wed Mar  8 00:41:04 2017
@@ -398,7 +398,7 @@ ProxyPass "/examples" "http://backend.ex
 </Location>
         </highlight>
 
-      <p> The "no-proxy" environment variable can be set to disable 
+      <p> In 2.4.26 and later, the "no-proxy" environment variable can be set to disable 
       <module>mod_proxy</module> processing the current request.
       This variable should be set with <directive module="mod_setenvif"
       >SetEnvIf</directive>, as <directive module="mod_env">SetEnv</directive>
@@ -965,7 +965,7 @@ ProxyPass "/mirror/foo" "http://backend.
       specific location will take precedence.</p>
 
       <p>For the same reasons, exclusions must come <em>before</em> the
-      general <directive>ProxyPass</directive> directives. The "no-proxy"
+      general <directive>ProxyPass</directive> directives. In 2.4.26 and later, the "no-proxy"
       environment variable is an alternative to exclusions, and is the only
       way to configure an exclusion of a <directive>ProxyPass</directive>
       directive in <directive module="core">Location</directive> context.