From dev-return-203841-archive-asf-public=cust-asf.ponee.io@tomcat.apache.org Wed Nov 27 17:00:06 2019 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [207.244.88.153]) by mx-eu-01.ponee.io (Postfix) with SMTP id B8730180648 for ; Wed, 27 Nov 2019 18:00:05 +0100 (CET) Received: (qmail 23407 invoked by uid 500); 27 Nov 2019 17:00:04 -0000 Mailing-List: contact dev-help@tomcat.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: "Tomcat Developers List" Delivered-To: mailing list dev@tomcat.apache.org Received: (qmail 23397 invoked by uid 99); 27 Nov 2019 17:00:04 -0000 Received: from ec2-52-202-80-70.compute-1.amazonaws.com (HELO gitbox.apache.org) (52.202.80.70) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 27 Nov 2019 17:00:04 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id 44C9C8B690; Wed, 27 Nov 2019 17:00:04 +0000 (UTC) Date: Wed, 27 Nov 2019 17:00:04 +0000 To: "dev@tomcat.apache.org" Subject: [tomcat] branch 8.5.x updated: Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=63968 class cast MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Message-ID: <157487400398.23517.17045255496310825861@gitbox.apache.org> From: markt@apache.org X-Git-Host: gitbox.apache.org X-Git-Repo: tomcat X-Git-Refname: refs/heads/8.5.x X-Git-Reftype: branch X-Git-Oldrev: 7d2365d4e302717140946e019b63f05598b4a080 X-Git-Newrev: 979d8fa00e56f46bb3fe44171c1d472545da2fdf X-Git-Rev: 979d8fa00e56f46bb3fe44171c1d472545da2fdf X-Git-NotificationType: ref_changed_plus_diff X-Git-Multimail-Version: 1.5.dev Auto-Submitted: auto-generated 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 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) + + 63968: Fix ClassCastException in the + Expires filter which was a regression in the fix for + 63909. (markt) + --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org For additional commands, e-mail: dev-help@tomcat.apache.org