KTOR-6281 Darwin: EOFException when sending multipart data using Ktor (#3782)

72d71ccb · Rustam · GitHub · 127a0ca2 · 72d71ccb · 72d71ccb
--- a/ktor-client/ktor-client-tests/common/test/io/ktor/client/tests/ContentTest.kt
+++ b/ktor-client/ktor-client-tests/common/test/io/ktor/client/tests/ContentTest.kt
@@ -247,6 +247,26 @@ class ContentTest : ClientLoader(5 * 60) {
        }
    }

+    @Test
+    fun testLargeFormWithBinaryData() = clientTests {
+        val formData = {
+            formData {
+                append(
+                    key = "image",
+                    value = ByteArray(100 * 1024) { 0 },
+                    headers = Headers.build {
+                        append(HttpHeaders.ContentType, "image/jpeg")
+                        append(HttpHeaders.ContentDisposition, "filename=image.jpeg")
+                    },
+                )
+            }
+        }
+
+        test { client ->
+            client.submitFormWithBinaryData("$TEST_SERVER/content/upload", formData()).body<ByteArray>()
+        }
+    }
+
    @Test
    fun testMultipartWithByteReadChannel() = clientTests {
        test { client ->

--- a/ktor-io/posix/src/io/ktor/utils/io/ByteChannelNative.kt
+++ b/ktor-io/posix/src/io/ktor/utils/io/ByteChannelNative.kt
@@ -129,7 +129,7 @@ internal class ByteChannelNative(
            awaitSuspend(1)
        }

-        if (!readable.canRead()) {
+        if (readable.remaining < availableForRead) {
            prepareFlushedBytes()
        }


--- a/ktor-server/ktor-server-plugins/ktor-server-compression/jvm/src/io/ktor/server/plugins/compression/Compression.kt
+++ b/ktor-server/ktor-server-plugins/ktor-server-compression/jvm/src/io/ktor/server/plugins/compression/Compression.kt
@@ -178,7 +178,6 @@ internal val DecompressionListAttribute: AttributeKey<List<String>> = AttributeK
 public val ApplicationRequest.appliedDecoders: List<String>
    get() = call.attributes.getOrNull(DecompressionListAttribute) ?: emptyList()

-
 private fun PipelineResponse.isSSEResponse(): Boolean {
    return headers[HttpHeaders.ContentType] == ContentType.Text.EventStream.toString()
 }