remm 2004/05/17 14:39:33
Modified: catalina/src/share/org/apache/catalina/servlets
DefaultServlet.java
Log:
- Trim when parsing ranges.
- MIME boundaries start with CRLF.
Revision Changes Path
1.22 +6 -2
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/servlets/DefaultServlet.java
Index: DefaultServlet.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/servlets/DefaultServlet.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- DefaultServlet.java 8 May 2004 22:33:22 -0000 1.21
+++ DefaultServlet.java 17 May 2004 21:39:33 -0000 1.22
@@ -1190,7 +1190,7 @@
// Parsing the range list
while (commaTokenizer.hasMoreTokens()) {
- String rangeDefinition = commaTokenizer.nextToken();
+ String rangeDefinition = commaTokenizer.nextToken().trim();
Range currentRange = new Range();
currentRange.length = fileLength;
@@ -2017,6 +2017,7 @@
Range currentRange = (Range) ranges.nextElement();
// Writing MIME header.
+ ostream.println();
ostream.println("--" + mimeSeparation);
if (contentType != null)
ostream.println("Content-Type: " + contentType);
@@ -2037,6 +2038,7 @@
}
+ ostream.println();
ostream.print("--" + mimeSeparation + "--");
// Rethrow any exception that has occurred
@@ -2071,6 +2073,7 @@
Range currentRange = (Range) ranges.nextElement();
// Writing MIME header.
+ writer.println();
writer.println("--" + mimeSeparation);
if (contentType != null)
writer.println("Content-Type: " + contentType);
@@ -2091,6 +2094,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]
