markt 2004/11/22 11:37:06
Modified: catalina/src/share/org/apache/catalina/servlets
DefaultServlet.java
Log:
Port Remy's fix for ensuring mime boundaries start with a new line
Revision Changes Path
1.64 +6 -2
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/servlets/DefaultServlet.java
Index: DefaultServlet.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/servlets/DefaultServlet.java,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- DefaultServlet.java 26 Aug 2004 21:38:13 -0000 1.63
+++ DefaultServlet.java 22 Nov 2004 19:37:06 -0000 1.64
@@ -1241,7 +1241,7 @@
// Parsing the range list
while (commaTokenizer.hasMoreTokens()) {
- String rangeDefinition = commaTokenizer.nextToken();
+ String rangeDefinition = commaTokenizer.nextToken().trim();
Range currentRange = new Range();
currentRange.length = fileLength;
@@ -1851,6 +1851,7 @@
Range currentRange = (Range) ranges.nextElement();
// Writing MIME header.
+ ostream.println();
ostream.println("--" + mimeSeparation);
if (contentType != null)
ostream.println("Content-Type: " + contentType);
@@ -1871,6 +1872,7 @@
}
+ ostream.println();
ostream.print("--" + mimeSeparation + "--");
// Rethrow any exception that has occurred
@@ -1905,6 +1907,7 @@
Range currentRange = (Range) ranges.nextElement();
// Writing MIME header.
+ writer.println();
writer.println("--" + mimeSeparation);
if (contentType != null)
writer.println("Content-Type: " + contentType);
@@ -1925,6 +1928,7 @@
}
+ writer.println();
writer.print("--" + mimeSeparation + "--");
// Rethrow any exception that has occurred
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
