From: Eric Covener
Date: Fri, 26 Jul 2013 14:27:27 +0000 (+0000)
Subject: Merge r1507326 from trunk:
X-Git-Tag: 2.2.26~42
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d5d6d66a0a9009d644e9132b56889c058e970db6;p=thirdparty%2Fapache%2Fhttpd.git
Merge r1507326 from trunk:
add a note that proxy environment variables are either set or unset,
unless specific values are listed.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1507329 13f79535-47bb-0310-9956-ffa450edef68
---
diff --git a/docs/manual/mod/mod_proxy_http.xml b/docs/manual/mod/mod_proxy_http.xml
index 92e16251601..44cf03f0f36 100644
--- a/docs/manual/mod/mod_proxy_http.xml
+++ b/docs/manual/mod/mod_proxy_http.xml
@@ -56,7 +56,8 @@
In addition to the configuration directives that control the
behaviour of mod_proxy, there are a number of
environment variables that control the HTTP protocol
- provider:
+ provider. Environment variables below that don't specify specific values
+ are enabled when set to any value.
- proxy-sendextracrlf
- Causes proxy to send an extra CR-LF newline on the end of a