Author: markt
Date: Sat Nov 24 17:15:32 2012
New Revision: 1413206
URL: http://svn.apache.org/viewvc?rev=1413206&view=rev
Log:
Switch the Processors to use the Servlet 3.1 upgrade objects
- Upgrade process still broken
Modified:
tomcat/trunk/java/org/apache/coyote/AbstractProcessor.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/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=1413206&r1=1413205&r2=1413206&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/AbstractProcessor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/AbstractProcessor.java Sat Nov 24
17:15:32 2012
@@ -19,7 +19,6 @@ package org.apache.coyote;
import java.io.IOException;
import java.util.concurrent.Executor;
-import org.apache.coyote.http11.upgrade.UpgradeInbound;
import org.apache.tomcat.util.net.AbstractEndpoint;
import org.apache.tomcat.util.net.AbstractEndpoint.Handler.SocketState;
import org.apache.tomcat.util.net.SocketStatus;
@@ -154,5 +153,5 @@ public abstract class AbstractProcessor<
public abstract SocketState upgradeDispatch() throws IOException;
@Override
- public abstract UpgradeInbound getUpgradeInbound();
+ public abstract javax.servlet.http.ProtocolHandler getHttpUpgradeHandler();
}
Modified: tomcat/trunk/java/org/apache/coyote/Processor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/Processor.java?rev=1413206&r1=1413205&r2=1413206&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/Processor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/Processor.java Sat Nov 24 17:15:32 2012
@@ -14,13 +14,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.coyote;
import java.io.IOException;
import java.util.concurrent.Executor;
-import org.apache.coyote.http11.upgrade.UpgradeInbound;
import org.apache.tomcat.util.net.AbstractEndpoint.Handler.SocketState;
import org.apache.tomcat.util.net.SSLSupport;
import org.apache.tomcat.util.net.SocketStatus;
@@ -40,7 +38,7 @@ public interface Processor<S> {
SocketState asyncDispatch(SocketStatus status);
SocketState asyncPostProcess();
- UpgradeInbound getUpgradeInbound();
+ javax.servlet.http.ProtocolHandler getHttpUpgradeHandler();
SocketState upgradeDispatch() throws IOException;
boolean isComet();
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=1413206&r1=1413205&r2=1413206&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:15:32 2012
@@ -25,6 +25,8 @@ import java.security.cert.CertificateFac
import java.security.cert.X509Certificate;
import java.util.concurrent.atomic.AtomicBoolean;
+import javax.servlet.http.ProtocolHandler;
+
import org.apache.coyote.AbstractProcessor;
import org.apache.coyote.ActionCode;
import org.apache.coyote.AsyncContextCallback;
@@ -33,7 +35,6 @@ import org.apache.coyote.OutputBuffer;
import org.apache.coyote.Request;
import org.apache.coyote.RequestInfo;
import org.apache.coyote.Response;
-import org.apache.coyote.http11.upgrade.UpgradeInbound;
import org.apache.juli.logging.Log;
import org.apache.tomcat.util.ExceptionUtils;
import org.apache.tomcat.util.buf.ByteChunk;
@@ -536,7 +537,7 @@ public abstract class AbstractAjpProcess
@Override
- public UpgradeInbound getUpgradeInbound() {
+ public ProtocolHandler getHttpUpgradeHandler() {
// Should never reach this code but in case we do...
throw new IllegalStateException(
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=1413206&r1=1413205&r2=1413206&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:15:32 2012
@@ -23,6 +23,8 @@ import java.util.StringTokenizer;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.regex.Pattern;
+import javax.servlet.http.ProtocolHandler;
+
import org.apache.coyote.AbstractProcessor;
import org.apache.coyote.ActionCode;
import org.apache.coyote.AsyncContextCallback;
@@ -36,7 +38,6 @@ import org.apache.coyote.http11.filters.
import org.apache.coyote.http11.filters.SavedRequestInputFilter;
import org.apache.coyote.http11.filters.VoidInputFilter;
import org.apache.coyote.http11.filters.VoidOutputFilter;
-import org.apache.coyote.http11.upgrade.UpgradeInbound;
import org.apache.juli.logging.Log;
import org.apache.tomcat.util.ExceptionUtils;
import org.apache.tomcat.util.buf.Ascii;
@@ -219,10 +220,10 @@ public abstract class AbstractHttp11Proc
/**
- * Listener to which data available events are passed once the associated
- * connection has completed the HTTP upgrade process.
+ * Instance of the new protocol to use after the HTTP connection has been
+ * upgraded.
*/
- protected UpgradeInbound upgradeInbound = null;
+ protected ProtocolHandler httpUpgradeHandler = null;
public AbstractHttp11Processor(AbstractEndpoint endpoint) {
@@ -803,7 +804,7 @@ public abstract class AbstractHttp11Proc
} else if (actionCode == ActionCode.ASYNC_IS_ERROR) {
((AtomicBoolean) param).set(asyncStateMachine.isAsyncError());
} else if (actionCode == ActionCode.UPGRADE) {
- upgradeInbound = (UpgradeInbound) param;
+ httpUpgradeHandler = (ProtocolHandler) param;
// Stop further HTTP output
getOutputBuffer().finished = true;
} else {
@@ -881,7 +882,7 @@ public abstract class AbstractHttp11Proc
}
while (!error && keepAlive && !comet && !isAsync() &&
- upgradeInbound == null && !endpoint.isPaused()) {
+ httpUpgradeHandler == null && !endpoint.isPaused()) {
// Parsing the request header
try {
@@ -1542,7 +1543,7 @@ public abstract class AbstractHttp11Proc
@Override
public boolean isUpgrade() {
- return upgradeInbound != null;
+ return httpUpgradeHandler != null;
}
@@ -1557,8 +1558,8 @@ public abstract class AbstractHttp11Proc
@Override
- public UpgradeInbound getUpgradeInbound() {
- return upgradeInbound;
+ public ProtocolHandler getHttpUpgradeHandler() {
+ return httpUpgradeHandler;
}
@@ -1627,7 +1628,7 @@ public abstract class AbstractHttp11Proc
if (asyncStateMachine != null) {
asyncStateMachine.recycle();
}
- upgradeInbound = null;
+ httpUpgradeHandler = null;
comet = false;
recycleInternal();
}
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=1413206&r1=1413205&r2=1413206&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:15:32 2012
@@ -22,6 +22,8 @@ import java.net.InetAddress;
import java.util.concurrent.Executor;
import java.util.concurrent.atomic.AtomicBoolean;
+import javax.servlet.http.ProtocolHandler;
+
import org.apache.coyote.AbstractProcessor;
import org.apache.coyote.ActionCode;
import org.apache.coyote.AsyncContextCallback;
@@ -30,7 +32,6 @@ import org.apache.coyote.OutputBuffer;
import org.apache.coyote.Request;
import org.apache.coyote.RequestInfo;
import org.apache.coyote.Response;
-import org.apache.coyote.http11.upgrade.UpgradeInbound;
import org.apache.tomcat.spdy.SpdyConnection;
import org.apache.tomcat.spdy.SpdyContext;
import org.apache.tomcat.spdy.SpdyFrame;
@@ -569,8 +570,7 @@ public class SpdyProcessor extends Abstr
}
@Override
- public UpgradeInbound getUpgradeInbound() {
+ public ProtocolHandler getHttpUpgradeHandler() {
return null;
}
-
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
