Author: jim
Date: Thu Jan 20 19:17:53 2011
New Revision: 1061469
URL: http://svn.apache.org/viewvc?rev=1061469&view=rev
Log:
Merge r1056889 from trunk:
Submitted by: kkolinko
Reviewed/backported by: jim
Modified:
tomcat/tc5.5.x/trunk/STATUS.txt
tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/servlets/DefaultServlet.java
Modified: tomcat/tc5.5.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/STATUS.txt?rev=1061469&r1=1061468&r2=1061469&view=diff
==============================================================================
--- tomcat/tc5.5.x/trunk/STATUS.txt (original)
+++ tomcat/tc5.5.x/trunk/STATUS.txt Thu Jan 20 19:17:53 2011
@@ -38,13 +38,6 @@ PATCHES PROPOSED TO BACKPORT:
+1: kkolinko, markt, jim
-1:
-* Additional patch for bug 50413:
- Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50413#c6
- Serve the error page regardless of "Range" header in the original request.
- http://svn.apache.org/viewvc?rev=1056889&view=rev
- +1: kkolinko, markt, jim
- -1:
-
* Remove JSSE13Factory, JSSE13SocketFactory classes,
because
- TC 5.5 runs on JRE 1.4+ and that comes bundled with JSSE 1.4,
Modified:
tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/servlets/DefaultServlet.java
URL:
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/servlets/DefaultServlet.java?rev=1061469&r1=1061468&r2=1061469&view=diff
==============================================================================
---
tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/servlets/DefaultServlet.java
(original)
+++
tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/servlets/DefaultServlet.java
Thu Jan 20 19:17:53 2011
@@ -892,6 +892,7 @@ public class DefaultServlet
}
if ( (cacheEntry.context != null)
+ || isError
|| ( ((ranges == null) || (ranges.isEmpty()))
&& (request.getHeader("Range") == null) )
|| (ranges == FULL) ) {
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
