Author: markt Date: Fri Jan 26 20:29:17 2018 New Revision: 1822345 URL: http://svn.apache.org/viewvc?rev=1822345&view=rev Log: Simplify
Modified: tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java Modified: tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java?rev=1822345&r1=1822344&r2=1822345&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java (original) +++ tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java Fri Jan 26 20:29:17 2018 @@ -580,13 +580,12 @@ public class CoyoteAdapter implements Ad if (undecodedURI.equals("*")) { if (req.method().equalsIgnoreCase("OPTIONS")) { StringBuilder allow = new StringBuilder(); - allow.append("GET, HEAD, POST, PUT, DELETE"); + allow.append("GET, HEAD, POST, PUT, DELETE, OPTIONS"); // Trace if allowed if (connector.getAllowTrace()) { allow.append(", TRACE"); } // Always allow options - allow.append(", OPTIONS"); res.setHeader("Allow", allow.toString()); } else { res.setStatus(404); @@ -808,11 +807,10 @@ public class CoyoteAdapter implements Ad } } } - res.setStatus(405); 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-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org