This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/main by this push:
new d6c962a2ea Remove deprecated code
d6c962a2ea is described below
commit d6c962a2eac2a87fbd1865bd297e10ebb4ce4676
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Fri Jun 23 17:51:02 2023 +0100
Remove deprecated code
---
java/org/apache/catalina/connector/Request.java | 28 ----------------------
.../catalina/filters/FailedRequestFilter.java | 2 --
java/org/apache/tomcat/util/http/Parameters.java | 7 ------
3 files changed, 37 deletions(-)
diff --git a/java/org/apache/catalina/connector/Request.java
b/java/org/apache/catalina/connector/Request.java
index 88de9be19a..5ce77d2d08 100644
--- a/java/org/apache/catalina/connector/Request.java
+++ b/java/org/apache/catalina/connector/Request.java
@@ -3162,34 +3162,6 @@ public class Request implements HttpServletRequest {
}
- /**
- * Read post body into an array.
- *
- * @param body The bytes array in which the body will be read
- * @param len The body length
- *
- * @return the bytes count that has been read
- *
- * @throws IOException if an IO exception occurred
- *
- * @deprecated Unused. Will be removed in Tomcat 11.0.x onwards. Use
{@link #readPostBodyFully(byte[], int)}
- */
- @Deprecated
- protected int readPostBody(byte[] body, int len) throws IOException {
-
- int offset = 0;
- do {
- int inputLen = getStream().read(body, offset, len - offset);
- if (inputLen <= 0) {
- return offset;
- }
- offset += inputLen;
- } while ((len - offset) > 0);
- return len;
-
- }
-
-
/**
* Read post body into an array.
*
diff --git a/java/org/apache/catalina/filters/FailedRequestFilter.java
b/java/org/apache/catalina/filters/FailedRequestFilter.java
index 389575c7ce..98032f8de9 100644
--- a/java/org/apache/catalina/filters/FailedRequestFilter.java
+++ b/java/org/apache/catalina/filters/FailedRequestFilter.java
@@ -49,7 +49,6 @@ public class FailedRequestFilter extends FilterBase {
return log;
}
- @SuppressWarnings("deprecation")
@Override
public void doFilter(ServletRequest request, ServletResponse response,
FilterChain chain)
throws IOException, ServletException {
@@ -76,7 +75,6 @@ public class FailedRequestFilter extends FilterBase {
case INVALID_CONTENT_TYPE:
case MULTIPART_CONFIG_INVALID:
case NO_NAME:
- case REQUEST_BODY_INCOMPLETE:
case URL_DECODING:
case CLIENT_DISCONNECT:
// Client is never going to see this so this is really just
diff --git a/java/org/apache/tomcat/util/http/Parameters.java
b/java/org/apache/tomcat/util/http/Parameters.java
index 29a6bc0f91..b590d379e8 100644
--- a/java/org/apache/tomcat/util/http/Parameters.java
+++ b/java/org/apache/tomcat/util/http/Parameters.java
@@ -503,13 +503,6 @@ public final class Parameters {
IO_ERROR,
NO_NAME,
POST_TOO_LARGE,
- /**
- * Same as {@link #CLIENT_DISCONNECT}.
- *
- * @deprecated Unused. Will be removed in Tomcat 11.0.x onwards
- */
- @Deprecated
- REQUEST_BODY_INCOMPLETE,
TOO_MANY_PARAMETERS,
UNKNOWN,
URL_DECODING
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
