Author: markt
Date: Mon Dec 24 11:04:25 2012
New Revision: 1425629
URL: http://svn.apache.org/viewvc?rev=1425629&view=rev
Log:
Add an upgraded flag to the socket wrapper and set it for connections where an
HTTP upgrade has been completed.
Modified:
tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java
tomcat/trunk/java/org/apache/tomcat/util/net/SocketWrapper.java
Modified: tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java?rev=1425629&r1=1425628&r2=1425629&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java Mon Dec 24
11:04:25 2012
@@ -632,6 +632,7 @@ public abstract class AbstractProtocol i
// Create the light-weight upgrade processor
processor = createUpgradeProcessor(
socket, httpUpgradeHandler);
+ socket.setUpgraded(true);
}
if (getLog().isDebugEnabled()) {
getLog().debug("Socket: [" + socket +
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/SocketWrapper.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/SocketWrapper.java?rev=1425629&r1=1425628&r2=1425629&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/SocketWrapper.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/SocketWrapper.java Mon Dec 24
11:04:25 2012
@@ -27,6 +27,7 @@ public class SocketWrapper<E> {
protected volatile int keepAliveLeft = 100;
protected boolean async = false;
protected boolean keptAlive = false;
+ private boolean upgraded = false;
/*
* Following cached for speed / reduced GC
*/
@@ -48,6 +49,8 @@ public class SocketWrapper<E> {
public boolean isAsync() { return async; }
public void setAsync(boolean async) { this.async = async; }
+ public boolean isUpgraded() { return upgraded; }
+ public void setUpgraded(boolean upgraded) { this.upgraded = upgraded; }
public long getLastAccess() { return lastAccess; }
public void access() { access(System.currentTimeMillis()); }
public void access(long access) { lastAccess = access; }
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
