You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by re...@apache.org on 2020/05/25 15:07:53 UTC
[tomcat] branch 7.0.x updated: 64470: Fix solidus handling
This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch 7.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/7.0.x by this push:
new b238c75 64470: Fix solidus handling
b238c75 is described below
commit b238c7534911c2c69c162a7802c274a363bb7718
Author: remm <re...@apache.org>
AuthorDate: Mon May 25 17:07:41 2020 +0200
64470: Fix solidus handling
It should reflect the UDecoder.ALLOW_ENCODED_SLASH system property.
---
java/org/apache/catalina/connector/Connector.java | 4 +++-
webapps/docs/changelog.xml | 8 ++++++++
2 files changed, 11 insertions(+), 1 deletion(-)
diff --git a/java/org/apache/catalina/connector/Connector.java b/java/org/apache/catalina/connector/Connector.java
index 08443f9..52ba8f6 100644
--- a/java/org/apache/catalina/connector/Connector.java
+++ b/java/org/apache/catalina/connector/Connector.java
@@ -40,6 +40,7 @@ import org.apache.tomcat.util.IntrospectionUtils;
import org.apache.tomcat.util.buf.B2CConverter;
import org.apache.tomcat.util.buf.CharsetUtil;
import org.apache.tomcat.util.buf.EncodedSolidusHandling;
+import org.apache.tomcat.util.buf.UDecoder;
import org.apache.tomcat.util.http.mapper.Mapper;
import org.apache.tomcat.util.res.StringManager;
@@ -266,7 +267,8 @@ public class Connector extends LifecycleMBeanBase {
/**
* The behavior when an encoded solidus (slash) is submitted.
*/
- private EncodedSolidusHandling encodedSolidusHandling = EncodedSolidusHandling.REJECT;
+ private EncodedSolidusHandling encodedSolidusHandling =
+ UDecoder.ALLOW_ENCODED_SLASH ? EncodedSolidusHandling.DECODE : EncodedSolidusHandling.REJECT;
/**
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index f635c22..4c43208 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -60,6 +60,14 @@
issues do not "pop up" wrt. others).
-->
<section name="Tomcat 7.0.105 (violetagg)" rtext="in development">
+ <subsection name="Catalina">
+ <changelog>
+ <fix>
+ <bug>64470</bug>: The default value of the solidus handling should
+ reflect the associated system property. (remm)
+ </fix>
+ </changelog>
+ </subsection>
<subsection name="WebSocket">
<changelog>
<fix>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org