Author: markt
Date: Sat Nov 24 17:40:52 2012
New Revision: 1413217
URL: http://svn.apache.org/viewvc?rev=1413217&view=rev
Log:
upgradeDispatch() needs socket status to differentiate between read and
write
Modified:
tomcat/trunk/java/org/apache/coyote/AbstractProcessor.java
tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java
tomcat/trunk/java/org/apache/coyote/Processor.java
tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProcessor.java
tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java
tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeProcessor.java
tomcat/trunk/java/org/apache/coyote/spdy/SpdyProcessor.java
Modified: tomcat/trunk/java/org/apache/coyote/AbstractProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/AbstractProcessor.java?rev=1413217&r1=1413216&r2=1413217&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/AbstractProcessor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/AbstractProcessor.java Sat Nov 24
17:40:52 2012
@@ -130,7 +130,7 @@ public abstract class AbstractProcessor<
*/
@Override
public abstract SocketState process(SocketWrapper<S> socket)
- throws IOException;
+ throws IOException;
/**
* Process in-progress Comet requests. These will start as HTTP requests.
@@ -150,7 +150,8 @@ public abstract class AbstractProcessor<
* upgrade.
*/
@Override
- public abstract SocketState upgradeDispatch() throws IOException;
+ public abstract SocketState upgradeDispatch(SocketStatus status)
+ throws IOException;
@Override
public abstract javax.servlet.http.ProtocolHandler getHttpUpgradeHandler();
Modified: tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java?rev=1413217&r1=1413216&r2=1413217&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java Sat Nov 24
17:40:52 2012
@@ -614,7 +614,7 @@ public abstract class AbstractProtocol i
} else if (processor.isComet()) {
state = processor.event(status);
} else if (processor.isUpgrade()) {
- state = processor.upgradeDispatch();
+ state = processor.upgradeDispatch(status);
} else {
state = processor.process(socket);
}
Modified: tomcat/trunk/java/org/apache/coyote/Processor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/Processor.java?rev=1413217&r1=1413216&r2=1413217&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/Processor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/Processor.java Sat Nov 24 17:40:52 2012
@@ -39,7 +39,7 @@ public interface Processor<S> {
SocketState asyncPostProcess();
javax.servlet.http.ProtocolHandler getHttpUpgradeHandler();
- SocketState upgradeDispatch() throws IOException;
+ SocketState upgradeDispatch(SocketStatus status) throws IOException;
boolean isComet();
boolean isAsync();
Modified: tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProcessor.java?rev=1413217&r1=1413216&r2=1413217&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProcessor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProcessor.java Sat Nov
24 17:40:52 2012
@@ -529,7 +529,7 @@ public abstract class AbstractAjpProcess
@Override
- public SocketState upgradeDispatch() throws IOException {
+ public SocketState upgradeDispatch(SocketStatus status) throws IOException
{
// Should never reach this code but in case we do...
throw new IOException(
sm.getString("ajpprocessor.httpupgrade.notsupported"));
Modified:
tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java?rev=1413217&r1=1413216&r2=1413217&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java Sat
Nov 24 17:40:52 2012
@@ -1549,7 +1549,7 @@ public abstract class AbstractHttp11Proc
@Override
- public SocketState upgradeDispatch() throws IOException {
+ public SocketState upgradeDispatch(SocketStatus status) throws IOException
{
// Should never reach this code but in case we do...
// TODO
throw new IOException(
Modified:
tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeProcessor.java?rev=1413217&r1=1413216&r2=1413217&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeProcessor.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeProcessor.java
Sat Nov 24 17:40:52 2012
@@ -80,7 +80,8 @@ public abstract class UpgradeProcessor<S
}
@Override
- public final SocketState upgradeDispatch() throws IOException {
+ public final SocketState upgradeDispatch(SocketStatus status)
+ throws IOException {
// TODO Handle read/write ready for non-blocking IO
return SocketState.UPGRADED;
Modified: tomcat/trunk/java/org/apache/coyote/spdy/SpdyProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/spdy/SpdyProcessor.java?rev=1413217&r1=1413216&r2=1413217&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/spdy/SpdyProcessor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/spdy/SpdyProcessor.java Sat Nov 24
17:40:52 2012
@@ -493,7 +493,7 @@ public class SpdyProcessor extends Abstr
}
@Override
- public SocketState upgradeDispatch() throws IOException {
+ public SocketState upgradeDispatch(SocketStatus status) throws IOException
{
return null;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
