From: Ruediger Pluem Date: Wed, 28 May 2008 22:13:53 +0000 (+0000) Subject: * Update transformation by doing a ./build.sh all convmap X-Git-Tag: 2.2.9~78 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5cfc717e687d813e28a12068c54627fe04a360ec;p=thirdparty%2Fapache%2Fhttpd.git * Update transformation by doing a ./build.sh all convmap git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@661122 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/docs/manual/convenience.map b/docs/manual/convenience.map index dda47246d4d..577c6d6d37a 100644 --- a/docs/manual/convenience.map +++ b/docs/manual/convenience.map @@ -264,6 +264,7 @@ proxyiobuffersize mod/mod_proxy.html#proxyiobuffersize proxymatch mod/mod_proxy.html#proxymatch proxymaxforwards mod/mod_proxy.html#proxymaxforwards proxypass mod/mod_proxy.html#proxypass +proxypassinterpolateenv mod/mod_proxy.html#proxypassinterpolateenv proxypassmatch mod/mod_proxy.html#proxypassmatch proxypassreverse mod/mod_proxy.html#proxypassreverse proxypassreversecookiedomain mod/mod_proxy.html#proxypassreversecookiedomain diff --git a/docs/manual/mod/directives.html.de b/docs/manual/mod/directives.html.de index 768e3556bbb..a483cd376cc 100644 --- a/docs/manual/mod/directives.html.de +++ b/docs/manual/mod/directives.html.de @@ -298,6 +298,7 @@
  • <ProxyMatch>
  • ProxyMaxForwards
  • ProxyPass
    • +
  • ProxyPassInterpolateEnv
  • ProxyPassMatch
  • ProxyPassReverse
  • ProxyPassReverseCookieDomain
    • diff --git a/docs/manual/mod/directives.html.en b/docs/manual/mod/directives.html.en index 7279efea32d..5b037a68548 100644 --- a/docs/manual/mod/directives.html.en +++ b/docs/manual/mod/directives.html.en @@ -301,6 +301,7 @@
  • <ProxyMatch>
  • ProxyMaxForwards
  • ProxyPass
    • +
  • ProxyPassInterpolateEnv
  • ProxyPassMatch
  • ProxyPassReverse
  • ProxyPassReverseCookieDomain
    • diff --git a/docs/manual/mod/directives.html.es b/docs/manual/mod/directives.html.es index 2504a5b8ef6..9ff3df358b5 100644 --- a/docs/manual/mod/directives.html.es +++ b/docs/manual/mod/directives.html.es @@ -303,6 +303,7 @@
  • <ProxyMatch>
  • ProxyMaxForwards
  • ProxyPass
    • +
  • ProxyPassInterpolateEnv
  • ProxyPassMatch
  • ProxyPassReverse
  • ProxyPassReverseCookieDomain
    • diff --git a/docs/manual/mod/directives.html.ko.euc-kr b/docs/manual/mod/directives.html.ko.euc-kr index f5666c1e0c9..ea9822b1de4 100644 --- a/docs/manual/mod/directives.html.ko.euc-kr +++ b/docs/manual/mod/directives.html.ko.euc-kr @@ -293,6 +293,7 @@
  • <ProxyMatch>
  • ProxyMaxForwards
  • ProxyPass
    • +
  • ProxyPassInterpolateEnv
  • ProxyPassMatch
  • ProxyPassReverse
  • ProxyPassReverseCookieDomain
    • diff --git a/docs/manual/mod/directives.html.ru.koi8-r b/docs/manual/mod/directives.html.ru.koi8-r index b714855b4c2..929e30f015f 100644 --- a/docs/manual/mod/directives.html.ru.koi8-r +++ b/docs/manual/mod/directives.html.ru.koi8-r @@ -300,6 +300,7 @@
  • <ProxyMatch>
  • ProxyMaxForwards
  • ProxyPass
    • +
  • ProxyPassInterpolateEnv
  • ProxyPassMatch
  • ProxyPassReverse
  • ProxyPassReverseCookieDomain
    • diff --git a/docs/manual/mod/directives.html.tr.utf8 b/docs/manual/mod/directives.html.tr.utf8 index 50acb6a875b..5982f231265 100644 --- a/docs/manual/mod/directives.html.tr.utf8 +++ b/docs/manual/mod/directives.html.tr.utf8 @@ -297,6 +297,7 @@
  • <ProxyMatch>
  • ProxyMaxForwards
  • ProxyPass
    • +
  • ProxyPassInterpolateEnv
  • ProxyPassMatch
  • ProxyPassReverse
  • ProxyPassReverseCookieDomain
    • diff --git a/docs/manual/mod/mod_proxy.html.en b/docs/manual/mod/mod_proxy.html.en index 8c9e262eab9..e207d7bd819 100644 --- a/docs/manual/mod/mod_proxy.html.en +++ b/docs/manual/mod/mod_proxy.html.en @@ -75,6 +75,7 @@
  • <ProxyMatch>
  • ProxyMaxForwards
  • ProxyPass
    • +
  • ProxyPassInterpolateEnv
  • ProxyPassMatch
  • ProxyPassReverse
  • ProxyPassReverseCookieDomain
    • @@ -730,7 +731,8 @@ through

    ProxyPass Directive

    - + @@ -1014,6 +1016,15 @@ 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>.

    @@ -1021,6 +1032,34 @@ throughRewriteRule directive with the [P] flag.

    + +
    top
    +

    ProxyPassInterpolateEnv Directive

    +
    Description:Maps remote servers into the local server URL-space
    Syntax:ProxyPass [path] !|url [key=value key=value ...]] [nocanon]
    Syntax:ProxyPass [path] !|url [key=value +key=value ...]] [nocanon] [interpolate]
    Context:server config, virtual host, directory
    Status:Extension
    Module:mod_proxy
    + + + + + + + +
    Description:Enable Environment Variable interpolation in Reverse Proxy configurations
    Syntax:ProxyPassInterpolateEnv On|Off
    Default:ProxyPassInterpolateEnv Off
    Context:server config, virtual host, directory
    Status:Extension
    Module:mod_proxy
    Compatibility:Available in httpd 2.2.9 and later
    +

    This directive, together with the interpolate argument to + ProxyPass, ProxyPassReverse, + ProxyPassReverseCookieDomain and + ProxyPassReverseCookiePath + enables reverse proxies to be dynamically + configured using environment variables, which may be set by + another module such as mod_rewrite. + It affects the ProxyPass, + ProxyPassReverse, + ProxyPassReverseCookieDomain, and + ProxyPassReverseCookiePath directives, + and causes them to substitute the value of an environment + variable varname for the string ${varname} + in configuration directives.

    +

    Keep this turned off (for server performance) unless you need it!

    +
    top

    ProxyPassMatch Directive

    @@ -1059,7 +1098,8 @@ through - + @@ -1109,6 +1149,12 @@ proxied server (RewriteRule ... [P]) from mod_rewrite because it doesn't depend on a corresponding ProxyPass directive.

    +

    The optional interpolate keyword (available in + httpd 2.2.9 and later), used together with + ProxyPassInterpolateEnv, enables interpolation + of environment variables specified using the format ${VARNAME}. +

    +

    When used inside a <Location> section, the first argument is omitted and the local directory is obtained from the <Location>.

    @@ -1118,7 +1164,8 @@ proxied server
    Description:Adjusts the URL in HTTP response headers sent from a reverse proxied server
    Syntax:ProxyPassReverse [path] url
    Syntax:ProxyPassReverse [path] url +[interpolate]
    Context:server config, virtual host, directory
    Status:Extension
    Module:mod_proxy
    - + @@ -1134,7 +1181,8 @@ string in Set-Cookie headers.

    Description:Adjusts the Domain string in Set-Cookie headers from a reverse- proxied server
    Syntax:ProxyPassReverseCookieDomain internal-domain public-domain
    Syntax:ProxyPassReverseCookieDomain internal-domain +public-domain [interpolate]
    Context:server config, virtual host, directory
    Status:Extension
    Module:mod_proxy
    - + diff --git a/docs/manual/mod/mod_proxy.xml.ja b/docs/manual/mod/mod_proxy.xml.ja index afc130b5a98..ae9125958c5 100644 --- a/docs/manual/mod/mod_proxy.xml.ja +++ b/docs/manual/mod/mod_proxy.xml.ja @@ -1,7 +1,7 @@ - +
    Description:Adjusts the Path string in Set-Cookie headers from a reverse- proxied server
    Syntax:ProxyPassReverseCookiePath internal-path public-path
    Syntax:ProxyPassReverseCookiePath internal-path +public-path [interpolate]
    Context:server config, virtual host, directory
    Status:Extension
    Module:mod_proxy