Author: markt
Date: Tue May 16 13:18:58 2017
New Revision: 1795305
URL: http://svn.apache.org/viewvc?rev=1795305&view=rev
Log:
Fix Bug 61055. There are no plans to implement proxy support in Tomcat
Modified:
tomcat/trunk/java/org/apache/catalina/valves/rewrite/RewriteRule.java
tomcat/trunk/java/org/apache/catalina/valves/rewrite/RewriteValve.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/catalina/valves/rewrite/RewriteRule.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/valves/rewrite/RewriteRule.java?rev=1795305&r1=1795304&r2=1795305&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/valves/rewrite/RewriteRule.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/valves/rewrite/RewriteRule.java Tue
May 16 13:18:58 2017
@@ -266,14 +266,6 @@ public class RewriteRule {
protected boolean nosubreq = false;
/**
- * This flag forces the substitution part to be internally forced as a
proxy
- * request and immediately (i.e., rewriting rule processing stops here)
put
- * through the proxy module. You have to make sure that the substitution
string
- * is a valid URI (e.g., typically starting with http://hostname) which
can be
- * handled by the Apache proxy module. If not you get an error from the
proxy
- * module. Use this flag to achieve a more powerful implementation of the
- * ProxyPass directive, to map some remote stuff into the namespace of
- * the local server.
* Note: No proxy
*/
Modified: tomcat/trunk/java/org/apache/catalina/valves/rewrite/RewriteValve.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/valves/rewrite/RewriteValve.java?rev=1795305&r1=1795304&r2=1795305&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/valves/rewrite/RewriteValve.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/valves/rewrite/RewriteValve.java Tue
May 16 13:18:58 2017
@@ -758,9 +758,8 @@ public class RewriteValve extends ValveB
rule.setNoescape(true);
} else if (flag.startsWith("next") || flag.startsWith("N")) {
rule.setNext(true);
- // FIXME: Proxy not supported, would require proxy capabilities in
Tomcat
- /* } else if (flag.startsWith("proxy") || flag.startsWith("P")) {
- rule.setProxy(true);*/
+ // Note: Proxy is not supported as Tomcat does not have proxy
+ // capabilities
} else if (flag.startsWith("qsappend") || flag.startsWith("QSA")) {
rule.setQsappend(true);
} else if (flag.startsWith("redirect") || flag.startsWith("R")) {
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1795305&r1=1795304&r2=1795305&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Tue May 16 13:18:58 2017
@@ -81,6 +81,11 @@
<subsection name="Other">
<changelog>
<fix>
+ <bug>61055</bug>: Clarify the code comments in the rewrite valve to
make
+ clear that there are no plans to provide proxy support for this valve
+ since Tomcat does not have proxy capbilities. (markt)
+ </fix>
+ <fix>
<bug>61076</bug>: Document the <code>altDDName</code> attribute for the
<code>Context</code> element. (markt)
</fix>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
