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
The following commit(s) were added to refs/heads/8.5.x by this push: new 979d8fa Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=63968 class cast 979d8fa is described below commit 979d8fa00e56f46bb3fe44171c1d472545da2fdf Author: Mark Thomas <ma...@apache.org> AuthorDate: Wed Nov 27 16:59:33 2019 +0000 Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=63968 class cast Fix ClassCastException in the Expires filter which was a regression in the fix for bug 63909. --- java/org/apache/catalina/filters/ExpiresFilter.java | 2 +- webapps/docs/changelog.xml | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/java/org/apache/catalina/filters/ExpiresFilter.java b/java/org/apache/catalina/filters/ExpiresFilter.java index 9590f81..8f1dab4 100644 --- a/java/org/apache/catalina/filters/ExpiresFilter.java +++ b/java/org/apache/catalina/filters/ExpiresFilter.java @@ -1294,7 +1294,7 @@ public class ExpiresFilter extends FilterBase { if (innerRequest instanceof org.apache.catalina.servlet4preview.http.HttpServletRequest) { org.apache.catalina.servlet4preview.http.HttpServletRequest servlet4Request = - (org.apache.catalina.servlet4preview.http.HttpServletRequest) request; + (org.apache.catalina.servlet4preview.http.HttpServletRequest) innerRequest; if (servlet4Request.getHttpServletMapping().getMappingMatch() == MappingMatch.DEFAULT && response.getStatus() == HttpServletResponse.SC_NOT_MODIFIED) { diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index efc034a..483f98d 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -57,6 +57,11 @@ changes introduced in 9.0.28. URLs constructed from URLs obtained from the cache could not be used to access resources. (markt) </fix> + <fix> + <bug>63968</bug>: Fix <code>ClassCastException</code> in the + <code>Expires</code> filter which was a regression in the fix for + <bug>63909</bug>. (markt) + </fix> </changelog> </subsection> <subsection name="Coyote"> --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org