Author: markt
Date: Mon Dec 1 11:48:36 2014
New Revision: 1642668
URL: http://svn.apache.org/r1642668
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=57180
Don't limit HTTP methods to those defined in RFC 7231.
Modified:
tomcat/trunk/java/org/apache/catalina/filters/CorsFilter.java
Modified: tomcat/trunk/java/org/apache/catalina/filters/CorsFilter.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/filters/CorsFilter.java?rev=1642668&r1=1642667&r2=1642668&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/filters/CorsFilter.java (original)
+++ tomcat/trunk/java/org/apache/catalina/filters/CorsFilter.java Mon Dec 1
11:48:36 2014
@@ -650,7 +650,7 @@ public final class CorsFilter implements
requestType = CORSRequestType.ACTUAL;
}
}
- } else if (COMPLEX_HTTP_METHODS.contains(method)) {
+ } else {
requestType = CORSRequestType.ACTUAL;
}
}
@@ -1034,7 +1034,11 @@ public final class CorsFilter implements
"DELETE", "TRACE", "CONNECT"));
/**
* {@link Collection} of non-simple HTTP methods. Case sensitive.
+ * @deprecated Not used. Will be removed in Tomcat 9.0.x onwards. All HTTP
+ * methods not in {@link #HTTP_METHODS} are assumed to be
+ * non-simple.
*/
+ @Deprecated
public static final Collection<String> COMPLEX_HTTP_METHODS =
new HashSet<>(Arrays.asList("PUT", "DELETE", "TRACE", "CONNECT"));
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
