From: kkolinko <kkolinko@13f79535-47bb-0310-9956-ffa450edef68>
Date: Sun, 9 Jan 2011 08:07:02 +0000 (+0000)
Subject: Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50413#c6
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=2d8476cdb3f57bad07bfb6aea874aeffbab56a2c;p=tomcat7.0

Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50413#c6
Serve the error page regardless of "Range" header in the original request.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1056889 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/java/org/apache/catalina/servlets/DefaultServlet.java b/java/org/apache/catalina/servlets/DefaultServlet.java
index 0fc2ec451..5cd351061 100644
--- a/java/org/apache/catalina/servlets/DefaultServlet.java
+++ b/java/org/apache/catalina/servlets/DefaultServlet.java
@@ -883,7 +883,8 @@ public class DefaultServlet
 
         }
 
-        if ( (cacheEntry.context != null) 
+        if ( (cacheEntry.context != null)
+                || isError
                 || ( ((ranges == null) || (ranges.isEmpty()))
                         && (request.getHeader("Range") == null) )
                 || (ranges == FULL) ) {