Author: markt
Date: Tue Apr 7 11:26:24 2015
New Revision: 1671809
URL: http://svn.apache.org/r1671809
Log:
Remove NPN plumbing used by experimental SPDY support.
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/coyote/ajp/AjpNio2Protocol.java
tomcat/tc8.0.x/trunk/java/org/apache/coyote/ajp/AjpNioProtocol.java
tomcat/tc8.0.x/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java
tomcat/tc8.0.x/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java
tomcat/tc8.0.x/trunk/java/org/apache/coyote/http11/Http11Nio2Protocol.java
tomcat/tc8.0.x/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java
tomcat/tc8.0.x/trunk/java/org/apache/coyote/http11/Http11Protocol.java
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
Modified: tomcat/tc8.0.x/trunk/java/org/apache/coyote/ajp/AjpNio2Protocol.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/coyote/ajp/AjpNio2Protocol.java?rev=1671809&r1=1671808&r2=1671809&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/coyote/ajp/AjpNio2Protocol.java
(original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/coyote/ajp/AjpNio2Protocol.java Tue
Apr 7 11:26:24 2015
@@ -16,8 +16,6 @@
*/
package org.apache.coyote.ajp;
-import javax.net.ssl.SSLEngine;
-
import org.apache.coyote.AbstractProtocol;
import org.apache.coyote.Processor;
import org.apache.juli.logging.Log;
@@ -150,10 +148,6 @@ public class AjpNio2Protocol extends Abs
}
@Override
- public void onCreateSSLEngine(SSLEngine engine) {
- }
-
- @Override
public void closeAll() {
for (Nio2Channel channel : connections.keySet()) {
((Nio2Endpoint)
proto.endpoint).closeSocket(channel.getSocket(), SocketStatus.STOP);
Modified: tomcat/tc8.0.x/trunk/java/org/apache/coyote/ajp/AjpNioProtocol.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/coyote/ajp/AjpNioProtocol.java?rev=1671809&r1=1671808&r2=1671809&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/coyote/ajp/AjpNioProtocol.java
(original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/coyote/ajp/AjpNioProtocol.java Tue Apr
7 11:26:24 2015
@@ -19,8 +19,6 @@ package org.apache.coyote.ajp;
import java.nio.channels.SocketChannel;
import java.util.Iterator;
-import javax.net.ssl.SSLEngine;
-
import org.apache.coyote.AbstractProtocol;
import org.apache.coyote.Processor;
import org.apache.juli.logging.Log;
@@ -177,9 +175,5 @@ public class AjpNioProtocol extends Abst
register(processor);
return processor;
}
-
- @Override
- public void onCreateSSLEngine(SSLEngine engine) {
- }
}
}
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java?rev=1671809&r1=1671808&r2=1671809&view=diff
==============================================================================
---
tomcat/tc8.0.x/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java
(original)
+++
tomcat/tc8.0.x/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java
Tue Apr 7 11:26:24 2015
@@ -270,17 +270,6 @@ public abstract class AbstractHttp11Prot
endpoint.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);
- }
- }
-
// ------------------------------------------------------------- Common
code
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java?rev=1671809&r1=1671808&r2=1671809&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java
(original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java
Tue Apr 7 11:26:24 2015
@@ -211,15 +211,6 @@ public class Http11AprProtocol extends A
}
- @Override
- public void start() throws Exception {
- super.start();
- if (npnHandler != null) {
- long sslCtx = ((AprEndpoint) endpoint).getJniSslContext();
- npnHandler.init(endpoint, sslCtx, getAdapter());
- }
- }
-
// -------------------- Connection handler --------------------
protected static class Http11ConnectionHandler
@@ -262,28 +253,6 @@ public class Http11AprProtocol extends A
}
@Override
- public SocketState process(SocketWrapper<Long> socket,
- SocketStatus status) {
- if (proto.npnHandler != null) {
- Processor<Long> processor = null;
- if (status == SocketStatus.OPEN_READ) {
- processor = connections.get(socket.getSocket());
-
- }
- if (processor == null) {
- // if not null - this is a former comet request, handled
by http11
- SocketState socketState = proto.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 initSsl(SocketWrapper<Long> socket,
Processor<Long> processor) {
// NOOP for APR
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/coyote/http11/Http11Nio2Protocol.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/coyote/http11/Http11Nio2Protocol.java?rev=1671809&r1=1671808&r2=1671809&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/coyote/http11/Http11Nio2Protocol.java
(original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/coyote/http11/Http11Nio2Protocol.java
Tue Apr 7 11:26:24 2015
@@ -20,7 +20,6 @@ import java.io.IOException;
import java.nio.ByteBuffer;
import java.nio.channels.ReadPendingException;
-import javax.net.ssl.SSLEngine;
import javax.servlet.http.HttpUpgradeHandler;
import org.apache.coyote.AbstractProtocol;
@@ -71,13 +70,6 @@ public class Http11Nio2Protocol extends
return ((Nio2Endpoint)endpoint);
}
- @Override
- public void start() throws Exception {
- super.start();
- if (npnHandler != null) {
- npnHandler.init(getEndpoint(), 0, getAdapter());
- }
- }
// -------------------- Properties--------------------
@@ -165,18 +157,6 @@ public class Http11Nio2Protocol extends
}
}
- @Override
- public SocketState process(SocketWrapper<Nio2Channel> socket,
- SocketStatus status) {
- if (proto.npnHandler != null) {
- SocketState ss = proto.npnHandler.process(socket, status);
- if (ss != SocketState.OPEN) {
- return ss;
- }
- }
- return super.process(socket, status);
- }
-
/**
* Expected to be used by the handler once the processor is no longer
@@ -266,13 +246,6 @@ public class Http11Nio2Protocol extends
}
@Override
- public void onCreateSSLEngine(SSLEngine engine) {
- if (proto.npnHandler != null) {
- proto.npnHandler.onCreateEngine(engine);
- }
- }
-
- @Override
public void closeAll() {
for (Nio2Channel channel : connections.keySet()) {
((Nio2Endpoint)
proto.endpoint).closeSocket(channel.getSocket(), SocketStatus.STOP);
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java?rev=1671809&r1=1671808&r2=1671809&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java
(original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java
Tue Apr 7 11:26:24 2015
@@ -21,7 +21,6 @@ import java.nio.ByteBuffer;
import java.nio.channels.SocketChannel;
import java.util.Iterator;
-import javax.net.ssl.SSLEngine;
import javax.servlet.http.HttpUpgradeHandler;
import org.apache.coyote.AbstractProtocol;
@@ -35,7 +34,6 @@ import org.apache.tomcat.util.net.NioEnd
import org.apache.tomcat.util.net.NioEndpoint.Handler;
import org.apache.tomcat.util.net.SSLImplementation;
import org.apache.tomcat.util.net.SecureNioChannel;
-import org.apache.tomcat.util.net.SocketStatus;
import org.apache.tomcat.util.net.SocketWrapper;
@@ -76,13 +74,6 @@ public class Http11NioProtocol extends A
return ((NioEndpoint)endpoint);
}
- @Override
- public void start() throws Exception {
- super.start();
- if (npnHandler != null) {
- npnHandler.init(getEndpoint(), 0, getAdapter());
- }
- }
// -------------------- Properties--------------------
@@ -211,18 +202,6 @@ public class Http11NioProtocol extends A
}
}
- @Override
- public SocketState process(SocketWrapper<NioChannel> socket,
- SocketStatus status) {
- if (proto.npnHandler != null) {
- SocketState ss = proto.npnHandler.process(socket, status);
- if (ss != SocketState.OPEN) {
- return ss;
- }
- }
- return super.process(socket, status);
- }
-
/**
* Expected to be used by the handler once the processor is no longer
@@ -297,12 +276,5 @@ public class Http11NioProtocol extends A
proto.getEndpoint().getSelectorPool(),
proto.getUpgradeAsyncWriteBufferSize());
}
-
- @Override
- public void onCreateSSLEngine(SSLEngine engine) {
- if (proto.npnHandler != null) {
- proto.npnHandler.onCreateEngine(engine);
- }
- }
}
}
Modified: tomcat/tc8.0.x/trunk/java/org/apache/coyote/http11/Http11Protocol.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/coyote/http11/Http11Protocol.java?rev=1671809&r1=1671808&r2=1671809&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/coyote/http11/Http11Protocol.java
(original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/coyote/http11/Http11Protocol.java Tue
Apr 7 11:26:24 2015
@@ -30,7 +30,6 @@ import org.apache.tomcat.util.net.Abstra
import org.apache.tomcat.util.net.JIoEndpoint;
import org.apache.tomcat.util.net.JIoEndpoint.Handler;
import org.apache.tomcat.util.net.SSLImplementation;
-import org.apache.tomcat.util.net.SocketStatus;
import org.apache.tomcat.util.net.SocketWrapper;
@@ -93,13 +92,6 @@ public class Http11Protocol extends Abst
}
}
- @Override
- public void start() throws Exception {
- super.start();
- if (npnHandler != null) {
- npnHandler.init(endpoint, 0, getAdapter());
- }
- }
// ----------------------------------------------------- JMX related
methods
@@ -135,18 +127,6 @@ public class Http11Protocol extends Abst
return proto.sslImplementation;
}
- @Override
- public SocketState process(SocketWrapper<Socket> socket,
- SocketStatus status) {
- if (proto.npnHandler != null) {
- SocketState ss = proto.npnHandler.process(socket, status);
- if (ss != SocketState.OPEN) {
- return ss;
- }
- }
- return super.process(socket, status);
- }
-
/**
* Expected to be used by the handler once the processor is no longer
* required.
Modified: tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java?rev=1671809&r1=1671808&r2=1671809&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java
(original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java Tue
Apr 7 11:26:24 2015
@@ -552,7 +552,6 @@ public class Nio2Endpoint extends Abstra
engine.setEnabledProtocols(enabledProtocols);
configureUseServerCipherSuitesOrder(engine);
- handler.onCreateSSLEngine(engine);
return engine;
}
@@ -809,7 +808,6 @@ public class Nio2Endpoint extends Abstra
public void release(SocketWrapper<Nio2Channel> socket);
public void closeAll();
public SSLImplementation getSslImplementation();
- public void onCreateSSLEngine(SSLEngine engine);
}
/**
Modified: tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java?rev=1671809&r1=1671808&r2=1671809&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
(original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java Tue
Apr 7 11:26:24 2015
@@ -580,7 +580,6 @@ public class NioEndpoint extends Abstrac
engine.setEnabledProtocols(enabledProtocols);
configureUseServerCipherSuitesOrder(engine);
- handler.onCreateSSLEngine(engine);
return engine;
}
@@ -1433,7 +1432,6 @@ public class NioEndpoint extends Abstrac
public void release(SocketWrapper<NioChannel> socket);
public void release(SocketChannel socket);
public SSLImplementation getSslImplementation();
- public void onCreateSSLEngine(SSLEngine engine);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
