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: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]