Author: markt
Date: Fri Aug 16 11:34:57 2013
New Revision: 1514661
URL: http://svn.apache.org/r1514661
Log:
Back-porting JSR-356
Rename ActionCode.UPGRADE to ActionCode.UPGRADE_TOMCAT to mark this as the
Tomcat proprietary upgrade mechanism.
Add a new ActionCode.UPGRADE action for the Servlet 3.1 based upgrade mechanism.
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/Request.java
tomcat/tc7.0.x/trunk/java/org/apache/coyote/ActionCode.java
tomcat/tc7.0.x/trunk/java/org/apache/coyote/ajp/AbstractAjpProcessor.java
tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java
Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/Request.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/Request.java?rev=1514661&r1=1514660&r2=1514661&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/Request.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/Request.java Fri
Aug 16 11:34:57 2013
@@ -2824,7 +2824,7 @@ public class Request
public void doUpgrade(UpgradeInbound inbound)
throws IOException {
- coyoteRequest.action(ActionCode.UPGRADE, inbound);
+ coyoteRequest.action(ActionCode.UPGRADE_TOMCAT, inbound);
// Output required by RFC2616. Protocol specific headers should have
// already been set.
Modified: tomcat/tc7.0.x/trunk/java/org/apache/coyote/ActionCode.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/coyote/ActionCode.java?rev=1514661&r1=1514660&r2=1514661&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/coyote/ActionCode.java (original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/coyote/ActionCode.java Fri Aug 16
11:34:57 2013
@@ -197,7 +197,12 @@ public enum ActionCode {
ASYNC_IS_ERROR,
/**
- * Callback to trigger the HTTP upgrade process.
+ * Callback to trigger Tomcat's proprietary HTTP upgrade process.
+ */
+ UPGRADE_TOMCAT,
+
+ /**
+ * Callback to trigger the Servlet 3.1 based HTTP upgrade process.
*/
UPGRADE
}
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/coyote/ajp/AbstractAjpProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/coyote/ajp/AbstractAjpProcessor.java?rev=1514661&r1=1514660&r2=1514661&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/coyote/ajp/AbstractAjpProcessor.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/coyote/ajp/AbstractAjpProcessor.java
Fri Aug 16 11:34:57 2013
@@ -459,7 +459,7 @@ public abstract class AbstractAjpProcess
((AtomicBoolean) param).set(asyncStateMachine.isAsyncTimingOut());
} else if (actionCode == ActionCode.ASYNC_IS_ERROR) {
((AtomicBoolean) param).set(asyncStateMachine.isAsyncError());
- } else if (actionCode == ActionCode.UPGRADE) {
+ } else if (actionCode == ActionCode.UPGRADE_TOMCAT) {
// HTTP connections only. Unsupported for AJP.
// NOOP
} else {
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=1514661&r1=1514660&r2=1514661&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:34:57 2013
@@ -844,7 +844,7 @@ public abstract class AbstractHttp11Proc
((AtomicBoolean) param).set(asyncStateMachine.isAsyncTimingOut());
} else if (actionCode == ActionCode.ASYNC_IS_ERROR) {
((AtomicBoolean) param).set(asyncStateMachine.isAsyncError());
- } else if (actionCode == ActionCode.UPGRADE) {
+ } else if (actionCode == ActionCode.UPGRADE_TOMCAT) {
upgradeInbound = (UpgradeInbound) param;
// Stop further HTTP output
getOutputBuffer().finished = true;
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
