From a159698e15e25e9376e0afa1d9961798f686d7bc Mon Sep 17 00:00:00 2001
From: markt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Date: Sun, 5 Jun 2011 10:21:25 +0000
Subject: [PATCH] Correctly handle range requests when using sendfile and the
 APR/native HTTP connector.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1132367 13f79535-47bb-0310-9956-ffa450edef68
---
 java/org/apache/coyote/http11/Http11AprProcessor.java |  2 +-
 webapps/docs/changelog.xml                            | 10 ++++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/java/org/apache/coyote/http11/Http11AprProcessor.java b/java/org/apache/coyote/http11/Http11AprProcessor.java
index 37fa1b224..d1bc3c756 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();
+                    "org.apache.tomcat.sendfile.end")).longValue() - sendfileData.pos;
             return true;
         }
         return false;
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 7b2f9e6ae..35ad9e789 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -42,6 +42,16 @@
   General, Catalina, Coyote, Jasper, Cluster, Web applications, Extras, Tribes,
   Other
 -->
+<section name="Tomcat 7.0.16 (markt)">
+  <subsection name="Coyote">
+    <changelog>
+      <fix>
+        Correctly handle range requests when using sendfile and the APR/native
+        HTTP connector. (markt)
+      </fix>
+    </changelog>
+  </subsection>
+</section>
 <section name="Tomcat 7.0.15 (markt)">
   <subsection name="Catalina">
     <changelog>
-- 
2.11.0