From a34696383cfcb95267572057435ec00bd9d6b4f3 Mon Sep 17 00:00:00 2001 From: markt Date: Sun, 16 Nov 2008 20:54:03 +0000 Subject: [PATCH] Port sendfile fix from 6.0.x to trunk git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@718115 13f79535-47bb-0310-9956-ffa450edef68 --- java/org/apache/tomcat/util/net/AprEndpoint.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/java/org/apache/tomcat/util/net/AprEndpoint.java b/java/org/apache/tomcat/util/net/AprEndpoint.java index 57a929ad3..6b0cebdc0 100644 --- a/java/org/apache/tomcat/util/net/AprEndpoint.java +++ b/java/org/apache/tomcat/util/net/AprEndpoint.java @@ -1797,11 +1797,9 @@ public class AprEndpoint { // 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. -- 2.11.0