From eac3584533dfa94e7bbe26ffe692f981ca7743f6 Mon Sep 17 00:00:00 2001 From: Jeff Trawick Date: Wed, 16 Oct 2013 17:44:34 +0000 Subject: [PATCH] generated from "make docs" git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1532828 13f79535-47bb-0310-9956-ffa450edef68 --- docs/manual/mod/core.html.fr | 2 +- docs/manual/mod/mod_proxy.html.en | 37 ++++++++++++++++++++++--------- docs/manual/mod/mod_proxy.xml.ja | 2 +- 3 files changed, 29 insertions(+), 12 deletions(-) diff --git a/docs/manual/mod/core.html.fr b/docs/manual/mod/core.html.fr index 7e35584c276..6caea31d33f 100644 --- a/docs/manual/mod/core.html.fr +++ b/docs/manual/mod/core.html.fr @@ -213,7 +213,7 @@ sup déterminé par le gestionnaire responsable de la requête. Le gestionnaire de base pour les fichiers normaux rejette par défaut les requêtes avec PATH_INFO. Les gestionnaires qui - servent des scripts, commecgi-script et isapi-handler, acceptent en général par + servent des scripts, comme cgi-script et isapi-handler, acceptent en général par défaut les requêtes avec PATH_INFO. diff --git a/docs/manual/mod/mod_proxy.html.en b/docs/manual/mod/mod_proxy.html.en index b96490899e2..953c3cf94b7 100644 --- a/docs/manual/mod/mod_proxy.html.en +++ b/docs/manual/mod/mod_proxy.html.en @@ -1217,15 +1217,6 @@ through removes the normal limited protection against URL-based attacks provided by the proxy.

-

The optional interpolate keyword (available in - httpd 2.2.9 and later), in combination with - ProxyPassInterpolateEnv causes the ProxyPass - to interpolate environment variables, using the syntax - ${VARNAME}. Note that many of the standard CGI-derived - environment variables will not exist when this interpolation happens, - so you may still have to resort to mod_rewrite - for complex rules.

-

When used inside a <Location> section, the first argument is omitted and the local directory is obtained from the <Location>. The same will occur inside a <LocationMatch> section, @@ -1238,6 +1229,31 @@ through RewriteRule directive with the [P] flag.

+

The optional interpolate keyword (available in + httpd 2.2.9 and later), in combination with + ProxyPassInterpolateEnv causes the ProxyPass + to interpolate environment variables, using the syntax + ${VARNAME}. Note that many of the standard CGI-derived + environment variables will not exist when this interpolation happens, + so you may still have to resort to mod_rewrite + for complex rules. Also note that interpolation is not supported + within the scheme portion of a URL. Dynamic determination of the + scheme can be accomplished with mod_rewrite as in the + following example.

+ + 
+RewriteEngine On
+
+RewriteCond %{HTTPS} =off
+RewriteRule . - [E=protocol:http]
+RewriteCond %{HTTPS} =on
+RewriteRule . - [E=protocol:https]
+
+RewriteRule ^/mirror/foo/(.*) %{ENV:protocol}://backend.example.com/$1 [P]
+ProxyPassReverse  /mirror/foo/ http://backend.example.com/
+ProxyPassReverse  /mirror/foo/ https://backend.example.com/
+
+
top
@@ -1390,7 +1406,8 @@ proxied server httpd 2.2.9 and later), used together with ProxyPassInterpolateEnv, enables interpolation of environment variables specified using the format ${VARNAME}. -

+ Note that interpolation is not supported within the scheme portion of a + URL.

When used inside a <Location> section, the first argument is omitted and the local directory is obtained from the <Location>. The same occurs inside a <LocationMatch> section, but will probably not work as diff --git a/docs/manual/mod/mod_proxy.xml.ja b/docs/manual/mod/mod_proxy.xml.ja index 9f0ea311228..9419ed28661 100644 --- a/docs/manual/mod/mod_proxy.xml.ja +++ b/docs/manual/mod/mod_proxy.xml.ja @@ -1,7 +1,7 @@ - +