Author: fhanik
Date: Thu Apr 17 06:40:43 2008
New Revision: 649095
URL: http://svn.apache.org/viewvc?rev=649095&view=rev
Log:
Apply patch
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=649095&r1=649094&r2=649095&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Apr 17 06:40:43 2008
@@ -55,12 +55,6 @@
+0: remm: do we really want to fix these sort of "bugs" ?
-1:
-* Fix NIO/Sendfile problem
- http://svn.apache.org/viewvc?rev=644858&view=rev
- http://svn.apache.org/viewvc?rev=644860&view=rev
- +1: fhanik, markt, pero
- -1:
-
* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=42662
http://svn.apache.org/viewvc?view=rev&revision=645184
+1: fhanik
Modified: tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java?rev=649095&r1=649094&r2=649095&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java Thu
Apr 17 06:40:43 2008
@@ -1607,10 +1607,11 @@
}
if ( sd.length <= 0 ) {
attachment.setSendfileData(null);
- if ( sd.keepAlive )
+ if ( sd.keepAlive ) {
if (reg) reg(sk,attachment,SelectionKey.OP_READ);
- else
+ } else {
cancelledKey(sk,SocketStatus.STOP,false);
+ }
} else if ( attachment.interestOps() == 0 && reg ) {
reg(sk,attachment,SelectionKey.OP_WRITE);
}
Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=649095&r1=649094&r2=649095&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Thu Apr 17 06:40:43 2008
@@ -103,6 +103,10 @@
<subsection name="Coyote">
<changelog>
<update>
+ NIO: Fix bug in NIO sendfile, symptoms during heavy traffic is that
connection don't get closed. For previous versions, one can disable sendfile to
work
+ around the problem. (fhanik)
+ </update>
+ <update>
APR: Allow to specify the "random device" to use to collect the
entropy. (jfclere)
</update>
<update>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
