Author: markt
Date: Fri Feb 19 22:59:08 2016
New Revision: 1731308
URL: http://svn.apache.org/viewvc?rev=1731308&view=rev
Log:
Back-port the send file unit test
Added:
tomcat/tc6.0.x/trunk/test/org/apache/catalina/connector/TestSendFile.java
- copied, changed from r1731306,
tomcat/tc7.0.x/trunk/test/org/apache/catalina/connector/TestSendFile.java
Copied:
tomcat/tc6.0.x/trunk/test/org/apache/catalina/connector/TestSendFile.java (from
r1731306,
tomcat/tc7.0.x/trunk/test/org/apache/catalina/connector/TestSendFile.java)
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/test/org/apache/catalina/connector/TestSendFile.java?p2=tomcat/tc6.0.x/trunk/test/org/apache/catalina/connector/TestSendFile.java&p1=tomcat/tc7.0.x/trunk/test/org/apache/catalina/connector/TestSendFile.java&r1=1731306&r2=1731308&rev=1731308&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/test/org/apache/catalina/connector/TestSendFile.java
(original)
+++ tomcat/tc6.0.x/trunk/test/org/apache/catalina/connector/TestSendFile.java
Fri Feb 19 22:59:08 2016
@@ -36,7 +36,6 @@ import static org.junit.Assert.assertEqu
import org.junit.Test;
import org.apache.catalina.Context;
-import org.apache.catalina.Globals;
import org.apache.catalina.startup.Tomcat;
import org.apache.catalina.startup.TomcatBaseTest;
import org.apache.tomcat.util.buf.ByteChunk;
@@ -134,10 +133,10 @@ public class TestSendFile extends Tomcat
resp.setContentType("'application/octet-stream");
resp.setCharacterEncoding("ISO-8859-1");
resp.setContentLength((int) f.length());
- if
(Boolean.TRUE.equals(req.getAttribute(Globals.SENDFILE_SUPPORTED_ATTR))) {
- req.setAttribute(Globals.SENDFILE_FILENAME_ATTR,
f.getAbsolutePath());
- req.setAttribute(Globals.SENDFILE_FILE_START_ATTR, new
Long(0));
- req.setAttribute(Globals.SENDFILE_FILE_END_ATTR, new
Long(f.length()));
+ if
(Boolean.TRUE.equals(req.getAttribute("org.apache.tomcat.sendfile.support"))) {
+ req.setAttribute("org.apache.tomcat.sendfile.filename",
f.getAbsolutePath());
+ req.setAttribute("org.apache.tomcat.sendfile.start", new
Long(0));
+ req.setAttribute("org.apache.tomcat.sendfile.end", new
Long(f.length()));
} else {
byte[] c = new byte[8192];
BufferedInputStream in = null;
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
