From: Jean-Frederic Clere <jfclere@apache.org>
Date: Fri, 4 Jun 2021 17:11:58 +0000 (+0000)
Subject: Add mapping = servlet / encoded
X-Git-Tag: 2.5.0-alpha2-ci-test-only~927
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8077b7af7782507ab8e3b9f2c05a1556e2bc4172;p=thirdparty%2Fapache%2Fhttpd.git

Add mapping = servlet / encoded


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1890477 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/docs/manual/mod/mod_proxy.html.en.utf8 b/docs/manual/mod/mod_proxy.html.en.utf8
index a9238d03487..177dd606d12 100644
--- a/docs/manual/mod/mod_proxy.html.en.utf8
+++ b/docs/manual/mod/mod_proxy.html.en.utf8
@@ -1435,6 +1435,12 @@ ProxyPass "/mirror/foo"   "http://backend.example.com"</pre>
         <td><p>Protocol accepted in the Upgrade header by <code class="module"><a href="../mod/mod_proxy_wstunnel.html">mod_proxy_wstunnel</a></code>.
         See the documentation of this module for more details.</p>
     </td></tr>
+    <tr><td>mapping</td>
+        <td>-</td>
+        <td><p>Mapping to process the <var>url</var> before choosing a Worker/Balancer.
+        'servlet' maps like a servlet container (like jk_servlet_normalize), use with Apache Tomcat for example.
+        'encoded' maps it encoded.</p>
+    </td></tr>
 
     </table>
 
@@ -2174,7 +2180,7 @@ var comments_identifier = 'http://httpd.apache.org/docs/trunk/mod/mod_proxy.html
     }
 })(window, document);
 //--><!]]></script></div><div id="footer">
-<p class="apache">Copyright 2020 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2021 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/quickreference.html">Directives</a> | <a href="http://wiki.apache.org/httpd/FAQ">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div><script type="text/javascript"><!--//--><![CDATA[//><!--
 if (typeof(prettyPrint) !== 'undefined') {
     prettyPrint();
diff --git a/docs/manual/mod/mod_proxy.xml b/docs/manual/mod/mod_proxy.xml
index c91a3dc8075..8b77ad8310a 100644
--- a/docs/manual/mod/mod_proxy.xml
+++ b/docs/manual/mod/mod_proxy.xml
@@ -1283,6 +1283,12 @@ ProxyPass "/example" "http://backend.example.com" max=20 ttl=120 retry=300
         <td><p>Protocol accepted in the Upgrade header by <module>mod_proxy_wstunnel</module>.
         See the documentation of this module for more details.</p>
     </td></tr>
+    <tr><td>mapping</td>
+        <td>-</td>
+        <td><p>Mapping to process the <var>url</var> before choosing a Worker/Balancer.
+        'servlet' maps like a servlet container (like jk_servlet_normalize), use with Apache Tomcat for example.
+        'encoded' maps it encoded.</p>
+    </td></tr>
 
     </table>