Author: markt
Date: Wed Apr 29 09:24:38 2015
New Revision: 1676699
URL: http://svn.apache.org/r1676699
Log:
Remove some more SPDY plumbing
Removed:
tomcat/trunk/java/org/apache/coyote/http11/NpnHandler.java
Modified:
tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java
tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java
tomcat/trunk/java/org/apache/coyote/http11/Http11Nio2Protocol.java
tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java
Modified: tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java?rev=1676699&r1=1676698&r2=1676699&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java Wed
Apr 29 09:24:38 2015
@@ -327,17 +327,6 @@ public abstract class AbstractHttp11Prot
getEndpoint().setMaxKeepAliveRequests(mkar);
}
- protected NpnHandler<S> npnHandler;
- @SuppressWarnings("unchecked")
- public void setNpnHandler(String impl) {
- try {
- Class<?> c = Class.forName(impl);
- npnHandler = (NpnHandler<S>) c.newInstance();
- } catch (Exception ex) {
- getLog().warn("Failed to init light protocol " + impl, ex);
- }
- }
-
// ----------------------------------------------- HTTPS specific
properties
// -------------------------------------------- Handled via an
SSLHostConfig
Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java?rev=1676699&r1=1676698&r2=1676699&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java Wed Apr
29 09:24:38 2015
@@ -21,7 +21,6 @@ import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
import org.apache.tomcat.util.net.AprEndpoint;
import org.apache.tomcat.util.net.AprEndpoint.Poller;
-import org.apache.tomcat.util.net.SocketStatus;
import org.apache.tomcat.util.net.SocketWrapperBase;
@@ -171,15 +170,6 @@ public class Http11AprProtocol extends A
}
- @Override
- public void start() throws Exception {
- super.start();
- if (npnHandler != null) {
- long sslCtx = ((AprEndpoint) getEndpoint()).getJniSslContext();
- npnHandler.init(getEndpoint(), sslCtx, getAdapter());
- }
- }
-
// -------------------- Connection handler --------------------
protected static class Http11ConnectionHandler
@@ -206,28 +196,6 @@ public class Http11AprProtocol extends A
}
@Override
- public SocketState process(SocketWrapperBase<Long> socket,
- SocketStatus status) {
- if (getProtocol().npnHandler != null) {
- Processor processor = null;
- if (status == SocketStatus.OPEN_READ) {
- processor = connections.get(socket.getSocket());
-
- }
- if (processor == null) {
- // if not null - handled by http11
- SocketState socketState =
getProtocol().npnHandler.process(socket, status);
- // handled by npn protocol.
- if (socketState == SocketState.CLOSED ||
- socketState == SocketState.LONG) {
- return socketState;
- }
- }
- }
- return super.process(socket, status);
- }
-
- @Override
protected void longPoll(SocketWrapperBase<Long> socket, Processor
processor) {
if (processor.isAsync()) {
Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11Nio2Protocol.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11Nio2Protocol.java?rev=1676699&r1=1676698&r2=1676699&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/Http11Nio2Protocol.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11Nio2Protocol.java Wed Apr
29 09:24:38 2015
@@ -23,7 +23,6 @@ import org.apache.tomcat.util.net.Nio2Ch
import org.apache.tomcat.util.net.Nio2Endpoint;
import org.apache.tomcat.util.net.Nio2Endpoint.Handler;
import org.apache.tomcat.util.net.Nio2Endpoint.Nio2SocketWrapper;
-import org.apache.tomcat.util.net.SocketStatus;
import org.apache.tomcat.util.net.SocketWrapperBase;
@@ -47,16 +46,6 @@ public class Http11Nio2Protocol extends
protected Log getLog() { return log; }
- @Override
- public void start() throws Exception {
- super.start();
- if (npnHandler != null) {
- npnHandler.init(getEndpoint(), 0, getAdapter());
- }
- }
-
-
-
// -------------------- Pool setup --------------------
public void setAcceptorThreadPriority(int threadPriority) {
@@ -118,18 +107,6 @@ public class Http11Nio2Protocol extends
}
}
- @Override
- public SocketState process(SocketWrapperBase<Nio2Channel> socket,
- SocketStatus status) {
- if (getProtocol().npnHandler != null) {
- SocketState ss = getProtocol().npnHandler.process(socket,
status);
- if (ss != SocketState.OPEN) {
- return ss;
- }
- }
- return super.process(socket, status);
- }
-
@Override
public void release(SocketWrapperBase<Nio2Channel> socket,
Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java?rev=1676699&r1=1676698&r2=1676699&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java Wed Apr
29 09:24:38 2015
@@ -25,7 +25,6 @@ import org.apache.juli.logging.LogFactor
import org.apache.tomcat.util.net.NioChannel;
import org.apache.tomcat.util.net.NioEndpoint;
import org.apache.tomcat.util.net.NioEndpoint.Handler;
-import org.apache.tomcat.util.net.SocketStatus;
import org.apache.tomcat.util.net.SocketWrapperBase;
@@ -54,15 +53,6 @@ public class Http11NioProtocol extends A
protected Log getLog() { return log; }
- @Override
- public void start() throws Exception {
- super.start();
- if (npnHandler != null) {
- npnHandler.init(getEndpoint(), 0, getAdapter());
- }
- }
-
-
// -------------------- Pool setup --------------------
public void setPollerThreadCount(int count) {
@@ -169,18 +159,6 @@ public class Http11NioProtocol extends A
}
}
- @Override
- public SocketState process(SocketWrapperBase<NioChannel> socket,
- SocketStatus status) {
- if (getProtocol().npnHandler != null) {
- SocketState ss = getProtocol().npnHandler.process(socket,
status);
- if (ss != SocketState.OPEN) {
- return ss;
- }
- }
- return super.process(socket, status);
- }
-
@Override
public void release(SocketWrapperBase<NioChannel> socket,
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
