This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/9.0.x by this push:
new 7d9d931 Deprecate code that is removed in Tomcat 10
7d9d931 is described below
commit 7d9d931aae3266b634b7731731a342ff469c6980
Author: Mark Thomas <[email protected]>
AuthorDate: Fri Mar 13 11:59:38 2020 +0000
Deprecate code that is removed in Tomcat 10
---
java/org/apache/catalina/connector/CoyoteAdapter.java | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/java/org/apache/catalina/connector/CoyoteAdapter.java
b/java/org/apache/catalina/connector/CoyoteAdapter.java
index 5955731..16d157f 100644
--- a/java/org/apache/catalina/connector/CoyoteAdapter.java
+++ b/java/org/apache/catalina/connector/CoyoteAdapter.java
@@ -641,6 +641,9 @@ public class CoyoteAdapter implements Adapter {
// Character decoding
convertURI(decodedURI, request);
// Check that the URI is still normalized
+ // Note: checkNormalize is deprecated because the test is no
+ // longer required in Tomcat 10 onwards and has been
+ // removed
if (!checkNormalize(req.decodedURI())) {
response.sendError(400, "Invalid URI");
}
@@ -1247,7 +1250,10 @@ public class CoyoteAdapter implements Adapter {
* @return <code>false</code> if sequences that are supposed to be
* normalized are still present in the URI, otherwise
* <code>true</code>
+ *
+ * @deprecated This code will be removed in Apache Tomcat 10 onwards
*/
+ @Deprecated
public static boolean checkNormalize(MessageBytes uriMB) {
CharChunk uriCC = uriMB.getCharChunk();
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
