From c63ecdafff03fee855ede51577336dc65c693780 Mon Sep 17 00:00:00 2001 From: jaguililla Date: Sat, 4 Nov 2023 22:24:29 +0100 Subject: [PATCH 1/2] Set next release version --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index e2b869ecd8..b4a30c02d4 100644 --- a/gradle.properties +++ b/gradle.properties @@ -5,7 +5,7 @@ org.gradle.warning.mode=all org.gradle.console=plain # Gradle -version=3.4.2 +version=3.4.3 group=com.hexagonkt description=The atoms of your platform From 6a841382aba1830f72e46eb17b8d46316d902977 Mon Sep 17 00:00:00 2001 From: jaguililla Date: Sun, 5 Nov 2023 11:12:01 +0100 Subject: [PATCH 2/2] Support extra configuration in Netty Epoll adapter --- .../http/server/netty/NettyServerAdapter.kt | 4 ++++ .../api/http_server_netty_epoll.api | 4 ++-- .../server/netty/epoll/NettyEpollServerAdapter.kt | 15 ++++++++++++++- 3 files changed, 20 insertions(+), 3 deletions(-) diff --git a/http/http_server_netty/src/main/kotlin/com/hexagonkt/http/server/netty/NettyServerAdapter.kt b/http/http_server_netty/src/main/kotlin/com/hexagonkt/http/server/netty/NettyServerAdapter.kt index 8d92084738..8d95773743 100644 --- a/http/http_server_netty/src/main/kotlin/com/hexagonkt/http/server/netty/NettyServerAdapter.kt +++ b/http/http_server_netty/src/main/kotlin/com/hexagonkt/http/server/netty/NettyServerAdapter.kt @@ -58,6 +58,10 @@ open class NettyServerAdapter( soKeepAlive = true, shutdownQuietSeconds = 0, shutdownTimeoutSeconds = 0, + keepAliveHandler = true, + httpAggregatorHandler = true, + chunkedHandler = true, + enableWebsockets = true, ) override fun runtimePort(): Int = diff --git a/http/http_server_netty_epoll/api/http_server_netty_epoll.api b/http/http_server_netty_epoll/api/http_server_netty_epoll.api index 4b3900a44b..8893262011 100644 --- a/http/http_server_netty_epoll/api/http_server_netty_epoll.api +++ b/http/http_server_netty_epoll/api/http_server_netty_epoll.api @@ -1,7 +1,7 @@ public final class com/hexagonkt/http/server/netty/epoll/NettyEpollServerAdapter : com/hexagonkt/http/server/netty/NettyServerAdapter { public fun ()V - public fun (IIIIZZ)V - public synthetic fun (IIIIZZILkotlin/jvm/internal/DefaultConstructorMarker;)V + public fun (IIIIZZJJZZZZ)V + public synthetic fun (IIIIZZJJZZZZILkotlin/jvm/internal/DefaultConstructorMarker;)V public fun groupSupplier (I)Lio/netty/channel/MultithreadEventLoopGroup; public fun serverBootstrapSupplier (Lio/netty/channel/MultithreadEventLoopGroup;Lio/netty/channel/MultithreadEventLoopGroup;)Lio/netty/bootstrap/ServerBootstrap; } diff --git a/http/http_server_netty_epoll/src/main/kotlin/com/hexagonkt/http/server/netty/epoll/NettyEpollServerAdapter.kt b/http/http_server_netty_epoll/src/main/kotlin/com/hexagonkt/http/server/netty/epoll/NettyEpollServerAdapter.kt index 8f6c2932c2..293ffb33b2 100644 --- a/http/http_server_netty_epoll/src/main/kotlin/com/hexagonkt/http/server/netty/epoll/NettyEpollServerAdapter.kt +++ b/http/http_server_netty_epoll/src/main/kotlin/com/hexagonkt/http/server/netty/epoll/NettyEpollServerAdapter.kt @@ -21,6 +21,12 @@ class NettyEpollServerAdapter( private val soBacklog: Int = 4 * 1_024, private val soReuseAddr: Boolean = true, private val soKeepAlive: Boolean = true, + shutdownQuietSeconds: Long = 0, + shutdownTimeoutSeconds: Long = 0, + keepAliveHandler: Boolean = true, + httpAggregatorHandler: Boolean = true, + chunkedHandler: Boolean = true, + enableWebsockets: Boolean = true, ) : NettyServerAdapter( bossGroupThreads, workerGroupThreads, @@ -28,9 +34,16 @@ class NettyEpollServerAdapter( soBacklog, soReuseAddr, soKeepAlive, + shutdownQuietSeconds, + shutdownTimeoutSeconds, + keepAliveHandler, + httpAggregatorHandler, + chunkedHandler, + enableWebsockets, ) { - constructor() : this(1, 0, Jvm.cpuCount * 2, 4 * 1_024, true, true) + constructor() : + this(1, 0, Jvm.cpuCount * 2, 4 * 1_024, true, true, 0, 0, true, true, true, true) override fun groupSupplier(it: Int): MultithreadEventLoopGroup = EpollEventLoopGroup(it)