Author: markt
Date: Fri Aug 16 11:26:34 2013
New Revision: 1514659
URL: http://svn.apache.org/r1514659
Log:
Back-porting JSR-356
Old and new upgrade mechanisms have a isUpgrade() method on the processor and
they need to be differentiated. Calls to the old version can easily be replaced
so do so.
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/coyote/AbstractProtocol.java
tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java
Modified: tomcat/tc7.0.x/trunk/java/org/apache/coyote/AbstractProtocol.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/coyote/AbstractProtocol.java?rev=1514659&r1=1514658&r2=1514659&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/coyote/AbstractProtocol.java (original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/coyote/AbstractProtocol.java Fri Aug
16 11:26:34 2013
@@ -588,7 +588,7 @@ public abstract class AbstractProtocol i
state = processor.asyncDispatch(status);
} else if (processor.isComet()) {
state = processor.event(status);
- } else if (processor.isUpgrade()) {
+ } else if (processor.getUpgradeInbound() != null) {
state = processor.upgradeDispatch();
} else {
state = processor.process(socket);
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java?rev=1514659&r1=1514658&r2=1514659&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java
Fri Aug 16 11:26:34 2013
@@ -1103,7 +1103,7 @@ public abstract class AbstractHttp11Proc
return SocketState.CLOSED;
} else if (isAsync() || comet) {
return SocketState.LONG;
- } else if (isUpgrade()) {
+ } else if (getUpgradeInbound() != null) {
return SocketState.UPGRADING;
} else {
if (sendfileInProgress) {
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
