tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r1132920 - in /tomcat/trunk: java/org/apache/coyote/http11/Http11AprProcessor.java webapps/docs/changelog.xml
Date Tue, 07 Jun 2011 09:22:44 GMT
Author: markt
Date: Tue Jun  7 09:22:44 2011
New Revision: 1132920

URL: http://svn.apache.org/viewvc?rev=1132920&view=rev
Log:
Revert r1132367. There is no issue. I got confused between AprEndpoint.SendfileData and NioEndpoint.SendfileData

Modified:
    tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java
    tomcat/trunk/webapps/docs/changelog.xml

Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java?rev=1132920&r1=1132919&r2=1132920&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java Tue Jun  7 09:22:44
2011
@@ -831,7 +831,7 @@ public class Http11AprProcessor extends 
             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;

Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1132920&r1=1132919&r2=1132920&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Tue Jun  7 09:22:44 2011
@@ -46,10 +46,6 @@
   <subsection name="Coyote">
     <changelog>
       <fix>
-        Correctly handle range requests when using sendfile and the APR/native
-        HTTP connector. (markt)
-      </fix>
-      <fix>
         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) 
       </fix>



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


Mime
View raw message