Author: markt
Date: Wed May 18 17:16:26 2011
New Revision: 1124340
URL: http://svn.apache.org/viewvc?rev=1124340&view=rev
Log:
If an error status is set during async processing, don't drop the connection
and let the async processing handle it
Modified:
tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java
tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java
tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java
Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java?rev=1124340&r1=1124339&r2=1124340&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java Wed May
18 17:16:26 2011
@@ -311,7 +311,8 @@ public class Http11AprProcessor extends
// committed, so we can't try and set headers.
if(keepAlive && !error) { // Avoid checking twice.
error = response.getErrorException() != null ||
- statusDropsConnection(response.getStatus());
+ (!isAsync() &&
+ statusDropsConnection(response.getStatus()));
}
} catch (InterruptedIOException e) {
error = true;
Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java?rev=1124340&r1=1124339&r2=1124340&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java Wed May
18 17:16:26 2011
@@ -401,7 +401,8 @@ public class Http11NioProcessor extends
// committed, so we can't try and set headers.
if(keepAlive && !error) { // Avoid checking twice.
error = response.getErrorException() != null ||
- statusDropsConnection(response.getStatus());
+ (!isAsync() &&
+ statusDropsConnection(response.getStatus()));
}
// Comet support
SelectionKey key =
socket.getIOChannel().keyFor(socket.getPoller().getSelector());
Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java?rev=1124340&r1=1124339&r2=1124340&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java Wed May 18
17:16:26 2011
@@ -322,7 +322,8 @@ public class Http11Processor extends Abs
// committed, so we can't try and set headers.
if(keepAlive && !error) { // Avoid checking twice.
error = response.getErrorException() != null ||
- statusDropsConnection(response.getStatus());
+ (!isAsync() &&
+ statusDropsConnection(response.getStatus()));
}
} catch (InterruptedIOException e) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
