Release 2.3.5 #3771

e5l · 2023-10-02T11:22:00Z

No description provided.

When using the Apache5 engine, total concurrent requests to a single route were limited to 5 requests. This is due to the code which tried to increase the concurrency to the ktor-standard 1000 concurrent having a typo and setting the total max connections twice and missing the max connections completely. (cherry picked from commit fa5cba1)

* Avoid crashing when TLS TCP socket is closed When using a plain TCP socket with TLS, two worker jobs are spawned: - cio-tls-input-loop - cio-tls-output-loop These worker jobs live in their own scope, and exceptions they throw can't easily be caught by the caller: the only option is to install a `CoroutineExceptionHandler` for the whole TLS socket, which is quite hacky and may hide bugs. When the TCP socket is closed, this is only caught when trying to write on the output channel, which throws a `ClosedSendChannelException`. We now catch that exception and cleanly stop the background job. Fixes https://youtrack.jetbrains.com/issue/KTOR-5178/TLSSocket-cannot-catch-the-exception-thrown-by-appDataOutputLoop Fixes https://youtrack.jetbrains.com/issue/KTOR-4360/Android-Impossible-to-catch-the-ClosedSendChannelException-when-TLS-connection-socket-is-closed * fixup! Avoid crashing when TLS TCP socket is closed (cherry picked from commit 1905329)

(cherry picked from commit 53fa31a)

* KTOR-5540 Fix darwin ws pong message * Update ktor-client/ktor-client-darwin/darwin/test/DarwinEngineTest.kt Co-authored-by: Vitor Hugo Schwaab <vitor@schwaab.dev> --------- Co-authored-by: Rustam <rxsinukov@gmail.com> Co-authored-by: Vitor Hugo Schwaab <vitor@schwaab.dev> (cherry picked from commit 375b0d3)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> (cherry picked from commit a0ae1eb)

* KTOR-6292 Make client use Dispatchers.IO by default (cherry picked from commit a22852c)

* Fix mingwX64 compilation * Update kotlin to 1.9.10 * Fix CallLogging tests * Fix js compilation (cherry picked from commit 8a9f4a5)

Stexxe · 2023-10-04T05:28:10Z

ktor-client/ktor-client-android/api/ktor-client-android.api

@@ -8,7 +8,6 @@ public final class io/ktor/client/engine/android/AndroidClientEngine : io/ktor/c
 	public fun execute (Lio/ktor/client/request/HttpRequestData;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public synthetic fun getConfig ()Lio/ktor/client/engine/HttpClientEngineConfig;
 	public fun getConfig ()Lio/ktor/client/engine/android/AndroidEngineConfig;
-	public fun getDispatcher ()Lkotlinx/coroutines/CoroutineDispatcher;


Isn't this an API-breaking change?

Nope, we dropped the override field but still have it in the base

Stexxe · 2023-10-04T05:30:34Z

ktor-client/ktor-client-core/common/src/io/ktor/client/engine/HttpClientEngineConfig.kt

@@ -14,6 +14,10 @@ public open class HttpClientEngineConfig {
    /**
     * Specifies network threads count advice.
     */
+    @Deprecated(
+        "The [threadsCount] property is deprecated. The [Dispatchers.IO] is used by default.",


Is it okay to have a deprecation error in a patch release?

Let me make it as warning

Stexxe · 2023-10-04T05:32:39Z

ktor-client/ktor-client-plugins/ktor-client-logging/api/ktor-client-logging.api

@@ -5,6 +5,7 @@ public final class io/ktor/client/plugins/logging/LogLevel : java/lang/Enum {
 	public static final field INFO Lio/ktor/client/plugins/logging/LogLevel;
 	public static final field NONE Lio/ktor/client/plugins/logging/LogLevel;
 	public final fun getBody ()Z
+	public static fun getEntries ()Lkotlin/enums/EnumEntries;


New API in a patch release

getEntries is default enum field generated by the kotlin compiler

Stexxe · 2023-10-04T05:32:54Z

ktor-http/api/ktor-http.api

@@ -40,6 +40,7 @@ public final class io/ktor/http/CacheControl$NoStore : io/ktor/http/CacheControl
 public final class io/ktor/http/CacheControl$Visibility : java/lang/Enum {
 	public static final field Private Lio/ktor/http/CacheControl$Visibility;
 	public static final field Public Lio/ktor/http/CacheControl$Visibility;
+	public static fun getEntries ()Lkotlin/enums/EnumEntries;


Stexxe · 2023-10-04T05:33:41Z

ktor-io/posix/src/io/ktor/utils/io/ByteReadChannelNative.kt

    public suspend fun readAvailable(dst: CPointer<ByteVar>, offset: Int, length: Int): Int

    /**
     * Reads all available bytes to [dst] buffer and returns immediately or suspends if no bytes available
     * @return number of bytes were read or `-1` if the channel has been closed
     */
+    @OptIn(ExperimentalForeignApi::class)
    public suspend fun readAvailable(dst: CPointer<ByteVar>, offset: Long, length: Long): Int


is it okay to have an OptIn annotation in a patch release?

yep, it's kotlin native and triggered by the kotlin version

(cherry picked from commit 87181e4)

marychatte

lgtm

* KTOR-6221: Fix reduced concurrent reqs in Apache5 (ktorio#3738) When using the Apache5 engine, total concurrent requests to a single route were limited to 5 requests. This is due to the code which tried to increase the concurrency to the ktor-standard 1000 concurrent having a typo and setting the total max connections twice and missing the max connections completely. (cherry picked from commit fa5cba1) * Avoid crashing when TLS TCP socket is closed (ktorio#3690) * Avoid crashing when TLS TCP socket is closed When using a plain TCP socket with TLS, two worker jobs are spawned: - cio-tls-input-loop - cio-tls-output-loop These worker jobs live in their own scope, and exceptions they throw can't easily be caught by the caller: the only option is to install a `CoroutineExceptionHandler` for the whole TLS socket, which is quite hacky and may hide bugs. When the TCP socket is closed, this is only caught when trying to write on the output channel, which throws a `ClosedSendChannelException`. We now catch that exception and cleanly stop the background job. Fixes https://youtrack.jetbrains.com/issue/KTOR-5178/TLSSocket-cannot-catch-the-exception-thrown-by-appDataOutputLoop Fixes https://youtrack.jetbrains.com/issue/KTOR-4360/Android-Impossible-to-catch-the-ClosedSendChannelException-when-TLS-connection-socket-is-closed * fixup! Avoid crashing when TLS TCP socket is closed (cherry picked from commit 1905329) * KTOR-6229 Fix hostname verification in CIO (ktorio#3746) (cherry picked from commit 53fa31a) * KTOR-5540 Fix darwin ws pong message (ktorio#3747) * KTOR-5540 Fix darwin ws pong message * Update ktor-client/ktor-client-darwin/darwin/test/DarwinEngineTest.kt Co-authored-by: Vitor Hugo Schwaab <vitor@schwaab.dev> --------- Co-authored-by: Rustam <rxsinukov@gmail.com> Co-authored-by: Vitor Hugo Schwaab <vitor@schwaab.dev> (cherry picked from commit 375b0d3) * Update netty monorepo to v4.1.97.Final (ktorio#3627) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> (cherry picked from commit a0ae1eb) * KTOR-6292 Make client use Dispatchers.IO by default (ktorio#3748) * KTOR-6292 Make client use Dispatchers.IO by default (cherry picked from commit a22852c) * Update kotlin to 1.9.10 (ktorio#3761) * Fix mingwX64 compilation * Update kotlin to 1.9.10 * Fix CallLogging tests * Fix js compilation (cherry picked from commit 8a9f4a5) * fixup! Update kotlin to 1.9.10 (ktorio#3761) * KTOR-6286 Update xmlutil to 0.86.2 (ktorio#3770) (cherry picked from commit 87181e4) --------- Co-authored-by: Sebastian Mayr <smayr@atlassian.com> Co-authored-by: Bastien Teinturier <31281497+t-bast@users.noreply.github.com> Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Mariia Skripchenko <61115099+marychatte@users.noreply.github.com>

Sebmaster and others added 6 commits October 2, 2023 13:07

KTOR-6229 Fix hostname verification in CIO (#3746)

0501bb8

(cherry picked from commit 53fa31a)

Update netty monorepo to v4.1.97.Final (#3627)

f55d24e

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> (cherry picked from commit a0ae1eb)

KTOR-6292 Make client use Dispatchers.IO by default (#3748)

5fd1d2f

* KTOR-6292 Make client use Dispatchers.IO by default (cherry picked from commit a22852c)

e5l self-assigned this Oct 2, 2023

e5l force-pushed the 2.3.5-eap branch 6 times, most recently from 61c2424 to e1a35c3 Compare October 3, 2023 10:52

Update kotlin to 1.9.10 (#3761)

63ff963

* Fix mingwX64 compilation * Update kotlin to 1.9.10 * Fix CallLogging tests * Fix js compilation (cherry picked from commit 8a9f4a5)

e5l force-pushed the 2.3.5-eap branch from e1a35c3 to 63ff963 Compare October 3, 2023 11:26

e5l marked this pull request as ready for review October 3, 2023 12:07

e5l requested review from Stexxe and marychatte October 3, 2023 12:07

Stexxe requested changes Oct 4, 2023

View reviewed changes

fixup! Update kotlin to 1.9.10 (#3761)

b77dc5d

e5l requested a review from Stexxe October 4, 2023 07:15

KTOR-6286 Update xmlutil to 0.86.2 (#3770)

3d53b99

(cherry picked from commit 87181e4)

marychatte approved these changes Oct 4, 2023

View reviewed changes

Stexxe approved these changes Oct 4, 2023

View reviewed changes

e5l merged commit 51e7e5f into 2.3.5 Oct 4, 2023

e5l deleted the 2.3.5-eap branch October 4, 2023 10:56

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Release 2.3.5 #3771

Release 2.3.5 #3771

e5l commented Oct 2, 2023

Stexxe Oct 4, 2023 •

edited

Loading

e5l Oct 4, 2023

Stexxe Oct 4, 2023

e5l Oct 4, 2023

Stexxe Oct 4, 2023

e5l Oct 4, 2023

Stexxe Oct 4, 2023

e5l Oct 4, 2023

Stexxe Oct 4, 2023

e5l Oct 4, 2023

marychatte left a comment

Release 2.3.5 #3771

Release 2.3.5 #3771

Conversation

e5l commented Oct 2, 2023

Stexxe Oct 4, 2023 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

marychatte left a comment

Choose a reason for hiding this comment

Stexxe Oct 4, 2023 •

edited

Loading