添加 solon-server-tomcat-jakarta http2 支持

Author: noear

solon-jakarta-projects/solon-server/solon-server-tomcat-jakarta/src/main/java/org/noear/solon/server/tomcat/TomcatServer.java

@@ -19,7 +19,9 @@
 import org.apache.catalina.Wrapper;
 import org.apache.catalina.connector.Connector;
 import org.apache.catalina.startup.Tomcat;
-import org.apache.coyote.http11.Http11NioProtocol;
+import org.apache.coyote.ProtocolHandler;
+import org.apache.coyote.http11.Http11Nio2Protocol;
+import org.apache.coyote.http2.Http2Protocol;
 import org.apache.tomcat.util.net.SSLHostConfig;
 import org.apache.tomcat.util.net.SSLHostConfigCertificate;
 import org.noear.solon.core.util.IoUtil;
@@ -32,6 +34,7 @@
 import org.noear.solon.server.tomcat.ssl.TomcatSslContext;
 
 import javax.net.ssl.SSLContext;
+import java.io.IOException;
 
 /**
  * @author Yukai
@@ -88,28 +91,12 @@ protected Context initContext() {
     }
 
     @Override
-    protected void addConnector(int port, boolean isMain) throws Throwable {
+    protected void addConnector(int port, boolean isMain) throws IOException {
         //::protocol
-        final Http11NioProtocol protocol = new Http11NioProtocol();
+        ProtocolHandler protocol = createHttp11Protocol(isMain);
 
-        if (ServerProps.request_maxHeaderSize > 0) {
-            protocol.setMaxHttpHeaderSize(ServerProps.request_maxHeaderSize);
-        }
-
-        if (ServerProps.request_maxBodySize > 0) {
-            protocol.setMaxSwallowSize(ServerProps.request_maxBodySizeAsInt());
-        }
-
-        protocol.setRelaxedQueryChars("[]|{}");
-
-        if (isMain) {
-            //for protocol ssl
-            if (sslConfig.isSslEnable()) {
-                protocol.setSSLEnabled(true);
-                protocol.setSecure(true);
-                protocol.addSslHostConfig(createSSLHostConfig(sslConfig.getSslContext()));
-                isSecure = true;
-            }
+        if (isMain && enableHttp2) {
+            protocol.addUpgradeProtocol(new Http2Protocol());
         }
 
 
@@ -134,6 +121,33 @@ protected void addConnector(int port, boolean isMain) throws Throwable {
         _server.getService().addConnector(connector);
     }
 
+    private ProtocolHandler createHttp11Protocol(boolean isMain) throws IOException {
+        final Http11Nio2Protocol protocol = new Http11Nio2Protocol();
+
+        if (ServerProps.request_maxHeaderSize > 0) {
+            protocol.setMaxHttpHeaderSize(ServerProps.request_maxHeaderSize);
+        }
+
+        if (ServerProps.request_maxBodySize > 0) {
+            protocol.setMaxSwallowSize(ServerProps.request_maxBodySizeAsInt());
+        }
+
+        protocol.setRelaxedQueryChars("[]|{}");
+
+        if (isMain) {
+            //for protocol ssl
+            if (sslConfig.isSslEnable()) {
+                protocol.setSSLEnabled(true);
+                protocol.setSecure(true);
+                protocol.addSslHostConfig(createSSLHostConfig(sslConfig.getSslContext()));
+                isSecure = true;
+            }
+        }
+
+        return protocol;
+    }
+
+
     private static SSLHostConfig createSSLHostConfig(final SSLContext sslContext) {
         final SSLHostConfig sslHostConfig = new SSLHostConfig();
 

solon-jakarta-projects/solon-server/solon-server-tomcat-jakarta/src/main/java/org/noear/solon/server/tomcat/TomcatServerBase.java

@@ -28,6 +28,7 @@
 import org.slf4j.LoggerFactory;
 
 import javax.net.ssl.SSLContext;
+import java.io.IOException;
 import java.util.LinkedHashSet;
 import java.util.Set;
 import java.util.concurrent.Executor;
@@ -72,7 +73,7 @@ public void enableHttp2(boolean enable) {
         this.enableHttp2 = enable;
     }
 
-    public boolean isEnableHttp2(){
+    public boolean isEnableHttp2() {
         return enableHttp2;
     }
 
@@ -94,7 +95,6 @@ public HttpServerProps getProps() {
     }
 
 
-
     @Override
     public void start(String host, int port) throws Throwable {
         _server = new Tomcat();
@@ -126,7 +126,7 @@ public void stop() throws Throwable {
         }
     }
 
-    protected abstract Context initContext() throws Throwable;
+    protected abstract Context initContext() throws IOException;
 
-    protected abstract void addConnector(int port, boolean isMain) throws Throwable;
-}
+    protected abstract void addConnector(int port, boolean isMain) throws IOException;
+}