Author: markt
Date: Sun Nov 16 12:54:03 2008
New Revision: 718115
URL: http://svn.apache.org/viewvc?rev=718115&view=rev
Log:
Port sendfile fix from 6.0.x to trunk
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java?rev=718115&r1=718114&r2=718115&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java Sun Nov 16
12:54:03 2008
@@ -1797,11 +1797,9 @@
// Destroy file descriptor pool, which
should close the file
Pool.destroy(state.fdpool);
Socket.timeoutSet(state.socket, soTimeout
* 1000);
- // If all done hand this socket off to a
worker for
+ // If all done put the socket back in the
poller for
// processing of further requests
- if (!processSocket(state.socket)) {
- Socket.destroy(state.socket);
- }
+ getPoller().add(state.socket);
} else {
// Close the socket since this is
// the end of not keep-alive request.
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
