Return-Path: 
 <dev-return-63542-apmail-tomcat-dev-archive=tomcat.apache.org@tomcat.apache.org>
Delivered-To: apmail-tomcat-dev-archive@www.apache.org
Received: (qmail 69793 invoked from network); 18 Oct 2005 23:05:03 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199)
  by minotaur.apache.org with SMTP; 18 Oct 2005 23:05:03 -0000
Received: (qmail 30577 invoked by uid 500); 18 Oct 2005 23:05:00 -0000
Delivered-To: apmail-tomcat-dev-archive@tomcat.apache.org
Received: (qmail 29716 invoked by uid 500); 18 Oct 2005 23:04:57 -0000
Mailing-List: contact dev-help@tomcat.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:dev-help@tomcat.apache.org>
List-Unsubscribe: <mailto:dev-unsubscribe@tomcat.apache.org>
List-Post: <mailto:dev@tomcat.apache.org>
List-Id: <dev.tomcat.apache.org>
Reply-To: "Tomcat Developers List" <dev@tomcat.apache.org>
Delivered-To: mailing list dev@tomcat.apache.org
Received: (qmail 29700 invoked by uid 500); 18 Oct 2005 23:04:57 -0000
Delivered-To: apmail-jakarta-tomcat-dev@jakarta.apache.org
Received: (qmail 29696 invoked by uid 99); 18 Oct 2005 23:04:57 -0000
X-ASF-Spam-Status: No, hits=-9.4 required=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME
X-Spam-Check-By: apache.org
Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194)
    by apache.org (qpsmtpd/0.29) with SMTP; Tue, 18 Oct 2005 16:04:56 -0700
Received: (qmail 69553 invoked by uid 65534); 18 Oct 2005 23:04:36 -0000
Message-ID: <20051018230436.69552.qmail@minotaur.apache.org>
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r326292 - in /tomcat:
 connectors/trunk/util/java/org/apache/tomcat/util/net/AprEndpoint.java
 container/tc5.5.x/webapps/docs/changelog.xml
Date: Tue, 18 Oct 2005 23:04:36 -0000
To: tomcat-dev@jakarta.apache.org
From: remm@apache.org
X-Mailer: svnmailer-1.0.5
X-Virus-Checked: Checked by ClamAV on apache.org
X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N

Author: remm
Date: Tue Oct 18 16:04:30 2005
New Revision: 326292

URL: http://svn.apache.org/viewcvs?rev=326292&view=rev
Log:
- 37121: Sendfile always needs to be given the length of data to write,
  not the end of the range. Ranged requests behaved in a weird way and ended
  with an error status because of that.

Modified:
    tomcat/connectors/trunk/util/java/org/apache/tomcat/util/net/AprEndpoint.java
    tomcat/container/tc5.5.x/webapps/docs/changelog.xml

Modified: tomcat/connectors/trunk/util/java/org/apache/tomcat/util/net/AprEndpoint.java
URL: http://svn.apache.org/viewcvs/tomcat/connectors/trunk/util/java/org/apache/tomcat/util/net/AprEndpoint.java?rev=326292&r1=326291&r2=326292&view=diff
==============================================================================
--- tomcat/connectors/trunk/util/java/org/apache/tomcat/util/net/AprEndpoint.java (original)
+++ tomcat/connectors/trunk/util/java/org/apache/tomcat/util/net/AprEndpoint.java Tue Oct 18 16:04:30 2005
@@ -1341,7 +1341,7 @@
                 Socket.timeoutSet(data.socket, 0);
                 while (true) {
                     long nw = Socket.sendfile(data.socket, data.fd, null, null,
-                                              data.pos, data.end, 0);
+                                              data.pos, data.end - data.pos, 0);
                     if (nw < 0) {
                         if (!(-nw == Status.EAGAIN)) {
                             Socket.destroy(data.socket);

Modified: tomcat/container/tc5.5.x/webapps/docs/changelog.xml
URL: http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/webapps/docs/changelog.xml?rev=326292&r1=326291&r2=326292&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/webapps/docs/changelog.xml (original)
+++ tomcat/container/tc5.5.x/webapps/docs/changelog.xml Tue Oct 18 16:04:30 2005
@@ -71,6 +71,10 @@
       <add>
         <bug>36630</bug>: Added extra log output for class instantiation failure. (yoavs)
       </add>
+      <fix>
+        <bug>37121</bug>: Sendfile always needs to be given the length of data to write,
+        which fixes ranged requests. (remm)
+      </fix>
     </changelog>
   </subsection>
   <subsection name="Jasper">



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org