From: markt Date: Tue, 7 Jun 2011 09:22:44 +0000 (+0000) Subject: Revert r1132367. There is no issue. I got confused between AprEndpoint.SendfileData... X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=7db0938e44409cb5a491a64e3654e5cb124f52b5;p=tomcat7.0 Revert r1132367. There is no issue. I got confused between AprEndpoint.SendfileData and NioEndpoint.SendfileData git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1132920 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/java/org/apache/coyote/http11/Http11AprProcessor.java b/java/org/apache/coyote/http11/Http11AprProcessor.java index d1bc3c756..37fa1b224 100644 --- a/java/org/apache/coyote/http11/Http11AprProcessor.java +++ b/java/org/apache/coyote/http11/Http11AprProcessor.java @@ -831,7 +831,7 @@ public class Http11AprProcessor extends AbstractHttp11Processor { sendfileData.start = ((Long) request.getAttribute( "org.apache.tomcat.sendfile.start")).longValue(); sendfileData.end = ((Long) request.getAttribute( - "org.apache.tomcat.sendfile.end")).longValue() - sendfileData.pos; + "org.apache.tomcat.sendfile.end")).longValue(); return true; } return false; diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index 4fb1b5976..b260dc0fd 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -46,10 +46,6 @@ - Correctly handle range requests when using sendfile and the APR/native - HTTP connector. (markt) - - When parsing the port in the HTTP host header, treat the port as a base 10 integer rather than a hexadecimal one. (rjung/markt/kkolinko)