JBossWeb SVN: r1870 - in trunk: webapps/docs and 1 other directory. - jbossweb-commits

Wednesday, 23 November 2011

Author: remy.maucherat(a)jboss.com
Date: 2011-11-23 04:52:37 -0500 (Wed, 23 Nov 2011)
New Revision: 1870

Modified:
   trunk/java/org/apache/coyote/http11/Http11AprProcessor.java
   trunk/java/org/apache/coyote/http11/Http11Processor.java
   trunk/webapps/docs/changelog.xml
Log:
AS7-2739: Use the keepalive flag to close the connection in async or event mode.

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

--- trunk/java/org/apache/coyote/http11/Http11AprProcessor.java	2011-11-18 17:03:59 UTC
(rev 1869)
+++ trunk/java/org/apache/coyote/http11/Http11AprProcessor.java	2011-11-23 09:52:37 UTC
(rev 1870)
@@ -799,7 +799,7 @@
             boolean pipelined = inputBuffer.nextRequest();
             outputBuffer.nextRequest();
             recycle();
-            return (pipelined) ? SocketState.CLOSED : SocketState.OPEN;
+            return (pipelined || !keepAlive) ? SocketState.CLOSED : SocketState.OPEN;
         } else {
             return SocketState.LONG;
         }

Modified: trunk/java/org/apache/coyote/http11/Http11Processor.java
===================================================================
--- trunk/java/org/apache/coyote/http11/Http11Processor.java	2011-11-18 17:03:59 UTC (rev
1869)
+++ trunk/java/org/apache/coyote/http11/Http11Processor.java	2011-11-23 09:52:37 UTC (rev
1870)
@@ -776,7 +776,7 @@
             boolean pipelined = inputBuffer.nextRequest();
             outputBuffer.nextRequest();
             recycle();
-            return (pipelined) ? SocketState.CLOSED : SocketState.OPEN;
+            return (pipelined || !keepAlive) ? SocketState.CLOSED : SocketState.OPEN;
         } else {
             return SocketState.LONG;
         }

Modified: trunk/webapps/docs/changelog.xml
===================================================================
--- trunk/webapps/docs/changelog.xml	2011-11-18 17:03:59 UTC (rev 1869)
+++ trunk/webapps/docs/changelog.xml	2011-11-23 09:52:37 UTC (rev 1870)
@@ -16,7 +16,7 @@
 
 <body>
 
-<section name="JBoss Web 7.0.3.Final (remm)">
+<section name="JBoss Web 7.0.4.Final (remm)">
   <subsection name="Catalina">
     <changelog>
       <update>
@@ -29,6 +29,10 @@
       <fix>
          Filter out multibyte chars when writing a char chunk. (rjung)
       </fix>
+      <fix>
+         <jira>AS7-2739</jira>: Allow using the keepalive disable
configuration
+         when using the async or event modes. (remm)
+      </fix>
     </changelog>
   </subsection>
 </section>


    

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

JBossWeb SVN: r1870 - in trunk: webapps/docs and 1 other directory.