UNDERTOW-752 Remove SPDY support

undertow-io · Jun 23, 2016 · bad866b · bad866b
1 parent fa1fc5d
commit bad866b
Show file tree

Hide file tree

Showing 55 changed files with 27 additions and 5,153 deletions.
diff --git a/core/pom.xml b/core/pom.xml
@@ -267,31 +267,6 @@
                                     <reportsDirectory>${project.build.directory}/surefire-ajp-reports</reportsDirectory>
                                 </configuration>
                             </execution>
-                            <execution>
-                                <id>proxy-spdy</id>
-                                <phase>test</phase>
-                                <goals>
-                                    <goal>test</goal>
-                                </goals>
-                                <configuration>
-                                    <enableAssertions>true</enableAssertions>
-                                    <runOrder>reversealphabetical</runOrder>
-                                    <systemPropertyVariables>
-                                        <test.spdy>true</test.spdy>
-                                        <test.dump>${dump}</test.dump>
-                                        <test.bufferSize>${bufferSize}</test.bufferSize>
-                                        <default.server.address>localhost</default.server.address>
-                                        <default.server.port>7777</default.server.port>
-                                        <java.util.logging.manager>org.jboss.logmanager.LogManager
-                                        </java.util.logging.manager>
-                                        <test.level>${test.level}</test.level>
-                                        <java.net.preferIPv6Addresses>${test.ipv6}</java.net.preferIPv6Addresses>
-                                        <alpn-boot-string>${alpn-boot-string}</alpn-boot-string>
-                                        <sun.net.useExclusiveBind>false</sun.net.useExclusiveBind>
-                                    </systemPropertyVariables>
-                                    <reportsDirectory>${project.build.directory}/surefire-spdy-reports</reportsDirectory>
-                                </configuration>
-                            </execution>
                             <execution>
                                 <id>proxy-https</id>
                                 <phase>test</phase>

diff --git a/core/src/main/java/io/undertow/Undertow.java b/core/src/main/java/io/undertow/Undertow.java
@@ -27,7 +27,6 @@
 import io.undertow.server.protocol.http.AlpnOpenListener;
 import io.undertow.server.protocol.http.HttpOpenListener;
 import io.undertow.server.protocol.http2.Http2OpenListener;
-import io.undertow.server.protocol.spdy.SpdyOpenListener;
 import org.xnio.ChannelListener;
 import org.xnio.ChannelListeners;
 import org.xnio.IoUtils;
@@ -169,15 +168,9 @@ public synchronized void start() {
                         HttpOpenListener httpOpenListener = new HttpOpenListener(buffers, undertowOptions);
                         httpOpenListener.setRootHandler(rootHandler);
 
-                        boolean spdy = serverOptions.get(UndertowOptions.ENABLE_SPDY, false);
                         boolean http2 = serverOptions.get(UndertowOptions.ENABLE_HTTP2, false);
-                        if(spdy || http2) {
+                        if(http2) {
                             AlpnOpenListener alpn = new AlpnOpenListener(buffers, undertowOptions, httpOpenListener);
-                            if(spdy) {
-                                SpdyOpenListener spdyListener = new SpdyOpenListener(buffers, new DefaultByteBufferPool(false, 1024, -1, 2, 0), undertowOptions);
-                                spdyListener.setRootHandler(rootHandler);
-                                alpn.addProtocol(SpdyOpenListener.SPDY_3_1, spdyListener, 5);
-                            }
                             if(http2) {
                                 Http2OpenListener http2Listener = new Http2OpenListener(buffers, undertowOptions);
                                 http2Listener.setRootHandler(rootHandler);

diff --git a/core/src/main/java/io/undertow/UndertowMessages.java b/core/src/main/java/io/undertow/UndertowMessages.java
@@ -295,8 +295,8 @@ public interface UndertowMessages {
     @Message(id = 88, value = "SPDY control frames cannot have body content")
     IOException controlFrameCannotHaveBodyContent();
 
-    @Message(id = 89, value = "SPDY not supported")
+//    @Message(id = 89, value = "SPDY not supported")
-    IOException spdyNotSupported();
+//    IOException spdyNotSupported();
 
     @Message(id = 90, value = "No ALPN implementation available (tried Jetty ALPN and JDK9)")
     IOException alpnNotAvailable();
@@ -307,8 +307,8 @@ public interface UndertowMessages {
     @Message(id = 92, value = "A SPDY header was too large to fit in a response buffer, if you want to support larger headers please increase the buffer size")
     IllegalStateException headersTooLargeToFitInHeapBuffer();
 
-    @Message(id = 93, value = "A SPDY stream was reset by the remote endpoint")
+//    @Message(id = 93, value = "A SPDY stream was reset by the remote endpoint")
-    IOException spdyStreamWasReset();
+//    IOException spdyStreamWasReset();
 
     @Message(id = 94, value = "Blocking await method called from IO thread. Blocking IO must be dispatched to a worker thread or deadlocks will result.")
     IOException awaitCalledFromIoThread();

diff --git a/core/src/main/java/io/undertow/UndertowOptions.java b/core/src/main/java/io/undertow/UndertowOptions.java
@@ -177,7 +177,10 @@ public class UndertowOptions {
 
     /**
      * If we should attempt to use SPDY for HTTPS connections.
+     *
+     * SPDY is no longer supported, use HTTP/2 instead
      */
+    @Deprecated
     public static final Option<Boolean> ENABLE_SPDY = Option.simple(UndertowOptions.class, "ENABLE_SPDY", Boolean.class);
 
     /**

diff --git a/core/src/main/java/io/undertow/client/http/HttpClientProvider.java b/core/src/main/java/io/undertow/client/http/HttpClientProvider.java
@@ -25,7 +25,6 @@
 import io.undertow.client.ClientConnection;
 import io.undertow.client.ClientProvider;
 import io.undertow.client.http2.Http2ClientProvider;
-import io.undertow.client.spdy.SpdyClientProvider;
 import org.xnio.ChannelListener;
 import org.xnio.IoFuture;
 import org.xnio.OptionMap;
@@ -133,17 +132,12 @@ public void handleEvent(StreamConnection connection) {
 
     private void handleConnected(final StreamConnection connection, final ClientCallback<ClientConnection> listener, final ByteBufferPool bufferPool, final OptionMap options, URI uri) {
 
-        boolean spdy = options.get(UndertowOptions.ENABLE_SPDY, false);
         boolean h2 = options.get(UndertowOptions.ENABLE_HTTP2, false);
-        if(connection instanceof SslConnection && (h2 | spdy)) {
+        if(connection instanceof SslConnection && (h2)) {
             List<ALPNClientSelector.ALPNProtocol> protocolList = new ArrayList<>();
             if(h2) {
                 protocolList.add(Http2ClientProvider.alpnProtocol(listener, uri, bufferPool, options));
             }
-            if(spdy) {
-                protocolList.add(SpdyClientProvider.alpnProtocol(listener, uri, bufferPool, options, SpdyClientProvider.SPDY_3_1));
-                protocolList.add(SpdyClientProvider.alpnProtocol(listener, uri, bufferPool, options, SpdyClientProvider.SPDY_3));
-            }
 
             ALPNClientSelector.runAlpn((SslConnection) connection, new ChannelListener<SslConnection>() {
                 @Override