This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/master by this push:
new d142168 Remove the deprecated code
d142168 is described below
commit d1421686d29591c4a3ccd7309b727efb90d7157f
Author: Mark Thomas <[email protected]>
AuthorDate: Tue Mar 31 22:52:35 2020 +0100
Remove the deprecated code
---
java/org/apache/catalina/connector/Connector.java | 5 -----
webapps/docs/config/ajp.xml | 6 +-----
webapps/docs/config/http.xml | 6 +-----
webapps/docs/config/systemprops.xml | 19 -------------------
4 files changed, 2 insertions(+), 34 deletions(-)
diff --git a/java/org/apache/catalina/connector/Connector.java
b/java/org/apache/catalina/connector/Connector.java
index 62e4384..c1b1f5f 100644
--- a/java/org/apache/catalina/connector/Connector.java
+++ b/java/org/apache/catalina/connector/Connector.java
@@ -106,11 +106,6 @@ public class Connector extends LifecycleMBeanBase {
// Default for Connector depends on this system property
setThrowOnFailure(Boolean.getBoolean("org.apache.catalina.startup.EXIT_ON_INIT_FAILURE"));
-
- // Default for Connector depends on this (deprecated) system property
- if
(Boolean.parseBoolean(System.getProperty("org.apache.tomcat.util.buf.UDecoder.ALLOW_ENCODED_SLASH",
"false"))) {
- encodedSolidusHandling = EncodedSolidusHandling.DECODE;
- }
}
diff --git a/webapps/docs/config/ajp.xml b/webapps/docs/config/ajp.xml
index 5b20d6f..9f9d36c 100644
--- a/webapps/docs/config/ajp.xml
+++ b/webapps/docs/config/ajp.xml
@@ -121,11 +121,7 @@
time other <code>%nn</code> sequences are decoded. When set to
<code>passthrough</code> request paths containing a <code>%2f</code>
sequence will be processed with the <code>%2f</code> sequence unchanged.
- If not specified the default value is <code>reject</code>. This default
- may be modified if the deprecated <a href="systemprops.html">system
- property</a>
- <code>org.apache.tomcat.util.buf.UDecoder.ALLOW_ENCODED_SLASH</code> is
- set.</p>
+ If not specified the default value is <code>reject</code>.</p>
</attribute>
<attribute name="maxHeaderCount" required="false">
diff --git a/webapps/docs/config/http.xml b/webapps/docs/config/http.xml
index a746da2..3d3c1df 100644
--- a/webapps/docs/config/http.xml
+++ b/webapps/docs/config/http.xml
@@ -126,11 +126,7 @@
time other <code>%nn</code> sequences are decoded. When set to
<code>passthrough</code> request paths containing a <code>%2f</code>
sequence will be processed with the <code>%2f</code> sequence unchanged.
- If not specified the default value is <code>reject</code>. This default
- may be modified if the deprecated <a href="systemprops.html">system
- property</a>
- <code>org.apache.tomcat.util.buf.UDecoder.ALLOW_ENCODED_SLASH</code> is
- set.</p>
+ If not specified the default value is <code>reject</code>.</p>
</attribute>
<attribute name="enforceEncodingInGetWriter" required="false">
diff --git a/webapps/docs/config/systemprops.xml
b/webapps/docs/config/systemprops.xml
index dbd9d70..8ce3793 100644
--- a/webapps/docs/config/systemprops.xml
+++ b/webapps/docs/config/systemprops.xml
@@ -114,25 +114,6 @@
</section>
-<section name="Security">
-
- <properties>
-
- <property
- name="org.apache.tomcat.util.buf. UDecoder.ALLOW_ENCODED_SLASH">
- <p>Use of this system property is deprecated. It will be removed from
- Tomcat 10 onwards.</p>
- <p>If this system property is set to <code>true</code>, the default for
- the <code>encodedSolidusHandling</code> attribute of all Connectors will
- be changed from <code>reject</code> to <code>decode</code>. If decoded,
it
- will be treated a path delimiter.</p>
- </property>
-
- </properties>
-
-</section>
-
-
<section name="Specifications">
<properties>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
