JBossWeb SVN: r1779 - in trunk: java/org/apache/tomcat/util/net and 1 other directories. - jbossweb-commits

Tuesday, 12 July 2011

Author: remy.maucherat(a)jboss.com
Date: 2011-07-12 06:25:24 -0400 (Tue, 12 Jul 2011)
New Revision: 1779

Modified:
   trunk/java/org/apache/coyote/http11/Http11AprProcessor.java
   trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
   trunk/webapps/docs/changelog.xml
Log:
- Fix double close when a sendfile error occurs.

Modified: trunk/java/org/apache/coyote/http11/Http11AprProcessor.java
===================================================================

--- trunk/java/org/apache/coyote/http11/Http11AprProcessor.java	2011-07-11 13:39:07 UTC
(rev 1778)
+++ trunk/java/org/apache/coyote/http11/Http11AprProcessor.java	2011-07-12 10:25:24 UTC
(rev 1779)
@@ -938,7 +938,11 @@
                 sendfileData.socket = socket;
                 sendfileData.keepAlive = keepAlive && !pipelined;
                 if (!endpoint.getSendfile().add(sendfileData)) {
-                    openSocket = true;
+                    if (sendfileData.socket == 0) {
+                        error = true;
+                    } else {
+                        openSocket = true;
+                    }
                     break;
                 }
             }

Modified: trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
===================================================================
--- trunk/java/org/apache/tomcat/util/net/AprEndpoint.java	2011-07-11 13:39:07 UTC (rev
1778)
+++ trunk/java/org/apache/tomcat/util/net/AprEndpoint.java	2011-07-12 10:25:24 UTC (rev
1779)
@@ -2208,7 +2208,7 @@
                                                data.pos, data.end - data.pos, 0);
                     if (nw < 0) {
                         if (!(-nw == Status.EAGAIN)) {
-                            Socket.destroy(data.socket);
+                            Pool.destroy(data.fdpool);
                             data.socket = 0;
                             return false;
                         } else {

Modified: trunk/webapps/docs/changelog.xml
===================================================================
--- trunk/webapps/docs/changelog.xml	2011-07-11 13:39:07 UTC (rev 1778)
+++ trunk/webapps/docs/changelog.xml	2011-07-12 10:25:24 UTC (rev 1779)
@@ -16,6 +16,24 @@
 
 <body>
 
+<section name="JBoss Web 7.0.1.Final (remm)">
+  <subsection name="Catalina">
+    <changelog>
+      <fix>
+        <jira>205</jira>: Filter out some generic callback events which are
not
+        relevant for Servlet 3 async. (remm)
+      </fix>
+    </changelog>
+  </subsection>
+  <subsection name="Coyote">
+    <changelog>
+      <fix>
+        Fix handling of sendfile errors when calling add. (markt)
+      </fix>
+    </changelog>
+  </subsection>
+</section>
+
 <section name="JBoss Web 7.0.0.Final (remm)">
   <subsection name="Coyote">
     <changelog>


    

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

JBossWeb SVN: r1779 - in trunk: java/org/apache/tomcat/util/net and 1 other directories.