Skip to content

Commit 860c4f6

Browse files
committed
优化 solon-server-tomcat 适配
1 parent c3f44e0 commit 860c4f6

File tree

2 files changed

+20
-15
lines changed

2 files changed

+20
-15
lines changed

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

Lines changed: 19 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -31,20 +31,6 @@
3131
* @since 2019/3/28 15:49
3232
*/
3333
public class TomcatServer extends TomcatServerBase {
34-
@Override
35-
protected Connector addConnector(int port) throws Throwable {
36-
Connector connector = _server.getConnector();
37-
38-
connector.setPort(port);
39-
connector.setMaxPostSize(ServerProps.request_maxBodySizeAsInt());
40-
connector.setProperty("maxHttpHeaderSize", String.valueOf(ServerProps.request_maxHeaderSize));
41-
connector.setProperty("relaxedQueryChars", "[]|{}");
42-
connector.setURIEncoding(ServerProps.request_encoding);
43-
connector.setUseBodyEncodingForURI(true);
44-
45-
return connector;
46-
}
47-
4834
@Override
4935
protected Context initContext() {
5036
String _tempdir = IoUtil.getTempDirAsString("solon-server");
@@ -76,4 +62,23 @@ protected Context initContext() {
7662

7763
return context;
7864
}
65+
66+
@Override
67+
protected void addConnector(int port) throws Throwable {
68+
Connector connector = new Connector("HTTP/1.1");
69+
70+
connector.setPort(port);
71+
connector.setMaxPostSize(ServerProps.request_maxBodySizeAsInt());
72+
connector.setMaxPartHeaderSize(ServerProps.request_maxHeaderSize);
73+
74+
connector.setProperty("maxHttpHeaderSize", String.valueOf(ServerProps.request_maxHeaderSize));
75+
connector.setProperty("maxSwallowSize", String.valueOf(ServerProps.request_maxBodySize));
76+
77+
connector.setProperty("relaxedQueryChars", "[]|{}");
78+
connector.setURIEncoding(ServerProps.request_encoding);
79+
connector.setUseBodyEncodingForURI(true);
80+
81+
82+
_server.getService().addConnector(connector);
83+
}
7984
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,5 +56,5 @@ public void stop() throws Throwable {
5656

5757
protected abstract Context initContext() throws Throwable;
5858

59-
protected abstract Connector addConnector(int port) throws Throwable;
59+
protected abstract void addConnector(int port) throws Throwable;
6060
}

0 commit comments

Comments
 (0)