| commit | 7405ec5dcdb468f71fb36a107855e23a6992508f | [log] [tgz] |
|---|---|---|
| author | Mark Emlyn David Thomas <markt@apache.org> | Tue Jun 04 11:35:58 2013 +0000 |
| committer | Mark Emlyn David Thomas <markt@apache.org> | Tue Jun 04 11:35:58 2013 +0000 |
| tree | aa3511662e338a32f197eae8496a4d0be279f735 | |
| parent | 72edec73ed27d32c54f0ed07a2c4cc879851dd20 [diff] |
Review comments from kkolinko git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1489390 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/java/org/apache/catalina/filters/CorsFilter.java b/java/org/apache/catalina/filters/CorsFilter.java index 2bc2220..baf1bba 100644 --- a/java/org/apache/catalina/filters/CorsFilter.java +++ b/java/org/apache/catalina/filters/CorsFilter.java
@@ -759,7 +759,7 @@ } } catch (NumberFormatException e) { throw new ServletException( - sm.getString("corsFilter.invalidPreFlightMaxAge"), e); + sm.getString("corsFilter.invalidPreflightMaxAge"), e); } }
diff --git a/java/org/apache/catalina/filters/LocalStrings.properties b/java/org/apache/catalina/filters/LocalStrings.properties index 4991a58..66116e4 100644 --- a/java/org/apache/catalina/filters/LocalStrings.properties +++ b/java/org/apache/catalina/filters/LocalStrings.properties
@@ -14,7 +14,7 @@ # limitations under the License. addDefaultCharset.unsupportedCharset=Specified character set [{0}] is not supported -corsFilter.invalidPreFlightMaxAge=Unable to parse preflightMaxAge +corsFilter.invalidPreflightMaxAge=Unable to parse preflightMaxAge corsFilter.nullRequest=HttpServletRequest object is null corsFilter.nullRequestType=CORSRequestType object is null corsFilter.onlyHttp=CORS doesn't support non-HTTP request or response
diff --git a/webapps/docs/images/cors-flowchart.png b/webapps/docs/images/cors-flowchart.png new file mode 100644 index 0000000..9abb09d --- /dev/null +++ b/webapps/docs/images/cors-flowchart.png Binary files differ
