Return-Path: Delivered-To: apmail-jakarta-tomcat-dev-archive@www.apache.org Received: (qmail 87737 invoked from network); 3 Jul 2005 00:20:36 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 3 Jul 2005 00:20:35 -0000 Received: (qmail 47392 invoked by uid 500); 3 Jul 2005 00:20:32 -0000 Delivered-To: apmail-jakarta-tomcat-dev-archive@jakarta.apache.org Received: (qmail 46463 invoked by uid 500); 3 Jul 2005 00:20:30 -0000 Mailing-List: contact tomcat-dev-help@jakarta.apache.org; run by ezmlm Precedence: bulk List-Unsubscribe: List-Help: List-Post: List-Id: "Tomcat Developers List" Reply-To: "Tomcat Developers List" Delivered-To: mailing list tomcat-dev@jakarta.apache.org Received: (qmail 46449 invoked by uid 500); 3 Jul 2005 00:20:29 -0000 Received: (qmail 46446 invoked by uid 99); 3 Jul 2005 00:20:29 -0000 X-ASF-Spam-Status: No, hits=0.2 required=10.0 tests=NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.29) with SMTP; Sat, 02 Jul 2005 17:20:29 -0700 Received: (qmail 87700 invoked by uid 1135); 3 Jul 2005 00:20:27 -0000 Date: 3 Jul 2005 00:20:27 -0000 Message-ID: <20050703002027.87699.qmail@minotaur.apache.org> From: remm@apache.org To: jakarta-tomcat-connectors-cvs@apache.org Subject: cvs commit: jakarta-tomcat-connectors/http11/src/java/org/apache/coyote/http11 Http11AprProcessor.java X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N remm 2005/07/02 17:20:27 Modified: util/java/org/apache/tomcat/util/net AprEndpoint.java http11/src/java/org/apache/coyote/http11 Http11AprProcessor.java Log: - Hopefully fix the algorithm. The return value is according to the comments. - Open socket will be set to true if either the socket was already closed in sendfile or if it went to the sendfile poller. Revision Changes Path 1.56 +3 -4 jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/net/AprEndpoint.java Index: AprEndpoint.java =================================================================== RCS file: /home/cvs/jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/net/AprEndpoint.java,v retrieving revision 1.55 retrieving revision 1.56 diff -u -r1.55 -r1.56 --- AprEndpoint.java 2 Jul 2005 17:36:34 -0000 1.55 +++ AprEndpoint.java 3 Jul 2005 00:20:27 -0000 1.56 @@ -1155,9 +1155,8 @@ data.pos, data.end, 0); if (nw < 0) { if (!(-nw == Status.EAGAIN)) { - /* The socket will be destroyed on the - * return from the processSocket call - */ + Socket.destroy(data.socket); + data.socket = 0; return false; } else { // Break the loop and add the socket to poller. @@ -1184,7 +1183,7 @@ addS.add(data); addS.notify(); } - return true; + return false; } /** 1.20 +1 -4 jakarta-tomcat-connectors/http11/src/java/org/apache/coyote/http11/Http11AprProcessor.java Index: Http11AprProcessor.java =================================================================== RCS file: /home/cvs/jakarta-tomcat-connectors/http11/src/java/org/apache/coyote/http11/Http11AprProcessor.java,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- Http11AprProcessor.java 2 Jul 2005 17:36:35 -0000 1.19 +++ Http11AprProcessor.java 3 Jul 2005 00:20:27 -0000 1.20 @@ -886,12 +886,9 @@ sendfileData.socket = socket; sendfileData.keepAlive = keepAlive; if (!endpoint.getSendfile().add(sendfileData)) { - keepAlive = false; - openSocket = false; - } else { openSocket = true; + break; } - break; } } --------------------------------------------------------------------- To unsubscribe, e-mail: tomcat-dev-unsubscribe@jakarta.apache.org For additional commands, e-mail: tomcat-dev-help@jakarta.apache.org