tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Felix Schumacher <felix.schumac...@internetallee.de>
Subject Re: svn commit: r1145383 - in /tomcat/trunk: java/org/apache/tomcat/util/net/NioEndpoint.java webapps/docs/changelog.xml
Date Tue, 12 Jul 2011 05:49:56 GMT

Hi Mark,

markt@apache.org schrieb:

>Author: markt
>Date: Mon Jul 11 22:27:06 2011
>New Revision: 1145383
>
>URL: http://svn.apache.org/viewvc?rev=1145383&view=rev
>Log:
>Protect against infinite loops in the HTTP NIO connector if sendfile is
>configured to send more data than is available in the file. (markt)
>
>Modified:
>    tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
>    tomcat/trunk/webapps/docs/changelog.xml
>
>Modified: tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
>URL:
>http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java?rev=1145383&r1=1145382&r2=1145383&view=diff
>==============================================================================
>--- tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
>(original)
>+++ tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java Mon
>Jul 11 22:27:06 2011
>@@ -1240,6 +1240,13 @@ public class NioEndpoint extends Abstrac
>                         sd.pos += written;
>                         sd.length -= written;
>                         attachment.access();
>+                    } else {
>+                        // Unusual not to be unable to transfer any
>bytes
There really are too many negations for me to understand the meaning of the above, but I think
you mean "able".

Regards
 Felix
>+                        // Check the length was set correctly
>+                        if (sd.fchannel.size() <= sd.pos) {
>+                            throw new IOException("Sendfile configured
>to " +
>+                                    "send more data than was
>available");
>+                        }
>                     }
>                 }
>                 if ( sd.length <= 0 && sc.getOutboundRemaining()<=0) {
>



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


Mime
View raw message