Merge remote-tracking branch 'origin/jetty-9.4.x'

jetty-http2/http2-server/src/main/java/org/eclipse/jetty/http2/server/HTTP2ServerConnectionFactory.java

@@ -50,7 +50,7 @@ public class HTTP2ServerConnectionFactory extends AbstractHTTP2ServerConnectionF
         super(httpConfiguration);
     }
 
-    protected HTTP2ServerConnectionFactory(@Name("config") HttpConfiguration httpConfiguration,String... protocols)
+    public HTTP2ServerConnectionFactory(@Name("config") HttpConfiguration httpConfiguration,String... protocols)
     {
         super(httpConfiguration,protocols);
     }

jetty-http2/http2-server/src/main/java/org/eclipse/jetty/http2/server/RawHTTP2ServerConnectionFactory.java

@@ -33,6 +33,12 @@ public class RawHTTP2ServerConnectionFactory extends AbstractHTTP2ServerConnecti
         this.listener = listener;
     }
 
+    public RawHTTP2ServerConnectionFactory(HttpConfiguration httpConfiguration, ServerSessionListener listener, String... protocols)
+    {
+        super(httpConfiguration,protocols);
+        this.listener = listener;
+    }
+
     @Override
     protected ServerSessionListener newSessionListener(Connector connector, EndPoint endPoint)
     {

jetty-servlet/src/test/java/org/eclipse/jetty/servlet/ServletHandlerTest.java

@@ -26,7 +26,6 @@ import java.util.EnumSet;
 
 import javax.servlet.DispatcherType;
 
-import org.eclipse.jetty.server.handler.HandlerWrapper;
 import org.junit.Before;
 import org.junit.Test;