An abstract implementation of {@link Connector} that provides a {@link ConnectionFactory} mechanism - * for creating {@link Connection} instances for various protocols (HTTP, SSL, SPDY, etc).
+ * for creating {@link Connection} instances for various protocols (HTTP, SSL, etc). * ** Each Connection factory type is responsible for the configuration of the protocols that it accepts. Thus to * configure the HTTP protocol, you pass a {@link HttpConfiguration} instance to the {@link HttpConnectionFactory} - * (or the SPDY factories that can also provide HTTP Semantics). Similarly the {@link SslConnectionFactory} is + * (or other factories that can also provide HTTP Semantics). Similarly the {@link SslConnectionFactory} is * configured by passing it a {@link SslContextFactory} and a next protocol name. * *
* {@link ConnectionFactory}s may also create temporary {@link Connection} instances that will exchange bytes - * over the connection to determine what is the next protocol to use. For example the NPN protocol is an extension - * of SSL to allow a protocol to be specified during the SSL handshake. NPN is used by the SPDY protocol to - * negotiate the version of SPDY or HTTP that the client and server will speak. Thus to accept a SPDY connection, the - * connector will be configured with {@link ConnectionFactory}s for "SSL-NPN", "NPN", "spdy/3", "spdy/2", "http/1.1" - * with the default protocol being "SSL-NPN". Thus a newly accepted connection uses "SSL-NPN", which specifies a - * SSLConnectionFactory with "NPN" as the next protocol. Thus an SslConnection instance is created chained to an NPNConnection - * instance. The NPN connection then negotiates with the client to determined the next protocol, which could be - * "spdy/3", "spdy/2" or the default of "http/1.1". Once the next protocol is determined, the NPN connection - * calls {@link #getConnectionFactory(String)} to create a connection instance that will replace the NPN connection as - * the connection chained to the SSLConnection. + * over the connection to determine what is the next protocol to use. For example the ALPN protocol is an extension + * of SSL to allow a protocol to be specified during the SSL handshake. ALPN is used by the HTTP/2 protocol to + * negotiate the protocol that the client and server will speak. Thus to accept a HTTP/2 connection, the + * connector will be configured with {@link ConnectionFactory}s for "SSL-ALPN", "h2", "http/1.1" + * with the default protocol being "SSL-ALPN". Thus a newly accepted connection uses "SSL-ALPN", which specifies a + * SSLConnectionFactory with "ALPN" as the next protocol. Thus an SSL connection instance is created chained to an ALPN + * connection instance. The ALPN connection then negotiates with the client to determined the next protocol, which + * could be "h2" or the default of "http/1.1". Once the next protocol is determined, the ALPN connection + * calls {@link #getConnectionFactory(String)} to create a connection instance that will replace the ALPN connection as + * the connection chained to the SSL connection. *
*
This class is a holder of HTTP configuration for use by the * {@link HttpChannel} class. Typically a HTTPConfiguration instance * is instantiated and passed to a {@link ConnectionFactory} that can - * create HTTP channels (eg HTTP, AJP or SPDY).
+ * create HTTP channels (e.g. HTTP, AJP or FCGI). *The configuration held by this class is not for the wire protocol, * but for the interpretation and handling of HTTP requests that could * be transported by a variety of protocols. diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/ServerConnector.java b/jetty-server/src/main/java/org/eclipse/jetty/server/ServerConnector.java index 63cf8b5bda0..e2bed86dcb8 100644 --- a/jetty-server/src/main/java/org/eclipse/jetty/server/ServerConnector.java +++ b/jetty-server/src/main/java/org/eclipse/jetty/server/ServerConnector.java @@ -47,7 +47,7 @@ import org.eclipse.jetty.util.thread.Scheduler; /** * This {@link Connector} implementation is the primary connector for the * Jetty server over TCP/IP. By the use of various {@link ConnectionFactory} instances it is able - * to accept connections for HTTP, SPDY and WebSocket, either directly or over SSL. + * to accept connections for HTTP, HTTP/2 and WebSocket, either directly or over SSL. *
* The connector is a fully asynchronous NIO based implementation that by default will * use all the commons services (eg {@link Executor}, {@link Scheduler}) of the diff --git a/tests/test-webapps/test-jetty-webapp/src/test/java/org/eclipse/jetty/TestServer.java b/tests/test-webapps/test-jetty-webapp/src/test/java/org/eclipse/jetty/TestServer.java index a2f959cf2d3..8d64d000154 100644 --- a/tests/test-webapps/test-jetty-webapp/src/test/java/org/eclipse/jetty/TestServer.java +++ b/tests/test-webapps/test-jetty-webapp/src/test/java/org/eclipse/jetty/TestServer.java @@ -21,7 +21,6 @@ package org.eclipse.jetty; import java.io.File; import java.io.IOException; import java.lang.management.ManagementFactory; - import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -93,43 +92,7 @@ public class TestServer httpConnector.setIdleTimeout(30000); server.addConnector(httpConnector); - /* - // SSL configurations - SslContextFactory sslContextFactory = new SslContextFactory(); - sslContextFactory.setKeyStorePath(jetty_root + "/jetty-server/src/main/config/etc/keystore"); - sslContextFactory.setKeyStorePassword("OBF:1vny1zlo1x8e1vnw1vn61x8g1zlu1vn4"); - sslContextFactory.setKeyManagerPassword("OBF:1u2u1wml1z7s1z7a1wnl1u2g"); - sslContextFactory.setTrustStorePath(jetty_root + "/jetty-server/src/main/config/etc/keystore"); - sslContextFactory.setTrustStorePassword("OBF:1vny1zlo1x8e1vnw1vn61x8g1zlu1vn4"); - sslContextFactory.setExcludeCipherSuites( - "SSL_RSA_WITH_DES_CBC_SHA", - "SSL_DHE_RSA_WITH_DES_CBC_SHA", - "SSL_DHE_DSS_WITH_DES_CBC_SHA", - "SSL_RSA_EXPORT_WITH_RC4_40_MD5", - "SSL_RSA_EXPORT_WITH_DES40_CBC_SHA", - "SSL_DHE_RSA_EXPORT_WITH_DES40_CBC_SHA", - "SSL_DHE_DSS_EXPORT_WITH_DES40_CBC_SHA"); - - - // Spdy Connector - SPDYServerConnectionFactory.checkNPNAvailable(); - PushStrategy push = new ReferrerPushStrategy(); - HTTPSPDYServerConnectionFactory spdy2 = new HTTPSPDYServerConnectionFactory(2,config,push); - spdy2.setInputBufferSize(8192); - spdy2.setInitialWindowSize(32768); - HTTPSPDYServerConnectionFactory spdy3 = new HTTPSPDYServerConnectionFactory(3,config,push); - spdy2.setInputBufferSize(8192); - NPNServerConnectionFactory npn = new NPNServerConnectionFactory(spdy3.getProtocol(),spdy2.getProtocol(),http.getProtocol()); - npn.setDefaultProtocol(http.getProtocol()); - npn.setInputBufferSize(1024); - SslConnectionFactory ssl = new SslConnectionFactory(sslContextFactory,npn.getProtocol()); - ServerConnector spdyConnector = new ServerConnector(server,ssl,npn,spdy3,spdy2,http); - spdyConnector.setPort(8443); - spdyConnector.setIdleTimeout(15000); - server.addConnector(spdyConnector); - - */ - + // Handlers HandlerCollection handlers = new HandlerCollection(); ContextHandlerCollection contexts = new ContextHandlerCollection();