You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2020/01/15 17:29:42 UTC
[tomcat] 02/02: Align master, 9.0.x and 8.5.x - Simplify
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 10be4d11bec0ed2f725b249f2c6afb89ced5d301
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Wed Jan 15 17:06:31 2020 +0000
Align master, 9.0.x and 8.5.x - Simplify
---
java/org/apache/catalina/connector/CoyoteAdapter.java | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/java/org/apache/catalina/connector/CoyoteAdapter.java b/java/org/apache/catalina/connector/CoyoteAdapter.java
index 8ad166f..0d81f6d 100644
--- a/java/org/apache/catalina/connector/CoyoteAdapter.java
+++ b/java/org/apache/catalina/connector/CoyoteAdapter.java
@@ -837,13 +837,12 @@ public class CoyoteAdapter implements Adapter {
}
}
}
- res.setStatus(405);
if (header != null) {
res.addHeader("Allow", header);
}
- res.setMessage("TRACE method is not allowed");
- request.getContext().logAccess(request, response, 0, true);
- return false;
+ response.sendError(405, "TRACE method is not allowed");
+ // Safe to skip the remainder of this method.
+ return true;
}
doConnectorAuthenticationAuthorization(req, request);
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org