From c090f179a7c3bab138aa14bf08abaab9e3cd27d3 Mon Sep 17 00:00:00 2001
From: Greg Wilkins
Date: Fri, 13 Feb 2015 15:06:24 +1100
Subject: 459845 - Support upgrade from http1 to http2/websocket

Added jetty-http2c.xml and http2c.mod
---
 jetty-server/src/main/config/etc/jetty-http.xml             |  2 +-
 .../org/eclipse/jetty/server/HttpConnectionFactory.java     | 13 ++-----------
 2 files changed, 3 insertions(+), 12 deletions(-)

(limited to 'jetty-server/src')

diff --git a/jetty-server/src/main/config/etc/jetty-http.xml b/jetty-server/src/main/config/etc/jetty-http.xml
index 8456a14d4b..adeeaae331 100644
--- a/jetty-server/src/main/config/etc/jetty-http.xml
+++ b/jetty-server/src/main/config/etc/jetty-http.xml
@@ -20,7 +20,7 @@
   <!-- =========================================================== -->
   <Call name="addConnector">
     <Arg>
-      <New class="org.eclipse.jetty.server.ServerConnector">
+      <New id="httpConnector" class="org.eclipse.jetty.server.ServerConnector">
         <Arg name="server"><Ref refid="Server" /></Arg>
         <Arg name="acceptors" type="int"><Property name="http.acceptors" default="-1"/></Arg>
         <Arg name="selectors" type="int"><Property name="http.selectors" default="-1"/></Arg>
diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/HttpConnectionFactory.java b/jetty-server/src/main/java/org/eclipse/jetty/server/HttpConnectionFactory.java
index 577a9f82c9..9926325146 100644
--- a/jetty-server/src/main/java/org/eclipse/jetty/server/HttpConnectionFactory.java
+++ b/jetty-server/src/main/java/org/eclipse/jetty/server/HttpConnectionFactory.java
@@ -41,6 +41,8 @@ public class HttpConnectionFactory extends AbstractConnectionFactory implements
     {
         super(HttpVersion.HTTP_1_1.asString());
         _config=config;
+        if (config==null)
+            throw new IllegalArgumentException("Null HttpConfiguration");
         addBean(_config);
     }
 
@@ -50,17 +52,6 @@ public class HttpConnectionFactory extends AbstractConnectionFactory implements
         return _config;
     }
 
-    @Deprecated
-    public boolean isDispatchIO()
-    {
-        return false;
-    }
-
-    @Deprecated
-    public void setDispatchIO(boolean dispatchIO)
-    {
-    }
-
     @Override
     public Connection newConnection(Connector connector, EndPoint endPoint)
     {
-- 
cgit v1.2.3