Merge remote-tracking branch 'origin/main' into 3.3.0-eap

# Conflicts:
#	gradle.properties

Author: osipxd

CHANGELOG.md

@@ -1,3 +1,18 @@
+# 3.2.3
+> Published 29 July 2025
+
+### Improvements
+* Server only accepts `yaml` as the configuration file suffix ([KTOR-8712](https://youtrack.jetbrains.com/issue/KTOR-8712))
+* JS / WASM error when process global is undefined ([KTOR-8686](https://youtrack.jetbrains.com/issue/KTOR-8686))
+* DI async duplicate resolution ([KTOR-8681](https://youtrack.jetbrains.com/issue/KTOR-8681))
+
+### Bugfixes
+* CIO: Expect 100-continue response is missing a final `\r\n` ([KTOR-8687](https://youtrack.jetbrains.com/issue/KTOR-8687))
+* Intermittent "ParserException: No colon in HTTP header" when parsing multipart request ([KTOR-8523](https://youtrack.jetbrains.com/issue/KTOR-8523))
+* Infinite loop in ByteReadChannel.readFully ([KTOR-8682](https://youtrack.jetbrains.com/issue/KTOR-8682))
+* ShutDownUrl: The server cannot shut down since 3.2.0 ([KTOR-8674](https://youtrack.jetbrains.com/issue/KTOR-8674))
+
+
 # 3.2.2
 > Published 14 July 2025
 

ktor-client/ktor-client-cio/common/src/io/ktor/client/engine/cio/CIOEngine.kt

@@ -111,8 +111,10 @@ internal class CIOEngine(
         val port: Int
         val protocol: URLProtocol = url.protocol
 
-        if (proxy != null) {
-            val proxyAddress = proxy.resolveAddress()
+        val actualProxy = proxy ?: lookupGlobalProxy(url)
+
+        if (actualProxy != null) {
+            val proxyAddress = actualProxy.resolveAddress()
             host = proxyAddress.hostname
             port = proxyAddress.port
         } else {
@@ -127,7 +129,7 @@ internal class CIOEngine(
             Endpoint(
                 host,
                 port,
-                proxy,
+                actualProxy,
                 secure,
                 config,
                 connectionFactory,

ktor-client/ktor-client-cio/common/src/io/ktor/client/engine/cio/Proxy.kt

@@ -0,0 +1,10 @@
+/*
+ * Copyright 2014-2025 JetBrains s.r.o and contributors. Use of this source code is governed by the Apache 2.0 license.
+ */
+
+package io.ktor.client.engine.cio
+
+import io.ktor.client.engine.ProxyConfig
+import io.ktor.http.Url
+
+internal expect fun lookupGlobalProxy(url: Url): ProxyConfig?

ktor-client/ktor-client-cio/jvm/src/io/ktor/client/engine/cio/Proxy.jvm.kt

@@ -0,0 +1,39 @@
+/*
+ * Copyright 2014-2025 JetBrains s.r.o and contributors. Use of this source code is governed by the Apache 2.0 license.
+ */
+
+package io.ktor.client.engine.cio
+
+import io.ktor.client.engine.ProxyConfig
+import io.ktor.http.Url
+import io.ktor.http.toURI
+import java.net.Proxy
+import java.net.ProxySelector
+import java.net.URISyntaxException
+
+internal actual fun lookupGlobalProxy(url: Url): ProxyConfig? {
+    val url = try {
+        url.toURI()
+    } catch (_: URISyntaxException) {
+        null
+    }
+
+    if (url == null) {
+        return null
+    }
+
+    val proxies = ProxySelector.getDefault().select(url)
+
+    return if (proxies.isNotEmpty()) {
+        val proxy = proxies.first()
+
+        // When no proxy is available, the list will contain one element with type DIRECT
+        if (proxies.size == 1 && proxy.type() == Proxy.Type.DIRECT) {
+            null
+        } else {
+            proxy
+        }
+    } else {
+        null
+    }
+}

ktor-client/ktor-client-cio/nonJvm/src/io/ktor/client/engine/cio/Proxy.nonJvm.kt

@@ -0,0 +1,10 @@
+/*
+ * Copyright 2014-2025 JetBrains s.r.o and contributors. Use of this source code is governed by the Apache 2.0 license.
+ */
+
+package io.ktor.client.engine.cio
+
+import io.ktor.client.engine.ProxyConfig
+import io.ktor.http.Url
+
+internal actual fun lookupGlobalProxy(url: Url): ProxyConfig? = null

ktor-client/ktor-client-tests/jvm/test/io/ktor/client/tests/ProxyJvmTest.kt

@@ -0,0 +1,55 @@
+/*
+ * Copyright 2014-2025 JetBrains s.r.o and contributors. Use of this source code is governed by the Apache 2.0 license.
+ */
+
+package io.ktor.client.tests
+
+import io.ktor.client.call.body
+import io.ktor.client.engine.ProxyBuilder
+import io.ktor.client.request.get
+import io.ktor.client.test.base.*
+import io.ktor.http.Url
+import kotlin.test.Test
+import kotlin.test.assertEquals
+
+class ProxyJvmTest : ClientLoader() {
+
+    @Test
+    fun globalProxyProperty() = clientTests(only("CIO")) {
+        val proxyUrl = Url(TCP_SERVER)
+        System.setProperty("http.proxyHost", proxyUrl.host)
+        System.setProperty("http.proxyPort", proxyUrl.port.toString())
+
+        test { client ->
+            try {
+                val response = client.get("http://google.com").body<String>()
+                assertEquals("proxy", response)
+            } finally {
+                System.clearProperty("http.proxyHost")
+                System.clearProperty("http.proxyPort")
+            }
+        }
+    }
+
+    @Test
+    fun configuredProxyHasPriorityOverGlobalOne() = clientTests(only("CIO")) {
+        System.setProperty("http.proxyHost", "localhost")
+        System.setProperty("http.proxyPort", "1")
+
+        config {
+            engine {
+                proxy = ProxyBuilder.http(Url(TCP_SERVER))
+            }
+        }
+
+        test { client ->
+            try {
+                val response = client.get("http://google.com").body<String>()
+                assertEquals("proxy", response)
+            } finally {
+                System.clearProperty("http.proxyHost")
+                System.clearProperty("http.proxyPort")
+            }
+        }
+    }
+}

ktor-server/ktor-server-cio/common/src/io/ktor/server/cio/CIOApplicationEngine.kt

@@ -120,6 +120,7 @@ public class CIOApplicationEngine(
                     handleRequest(request)
                 }
             }
+
             else -> {
                 val settings = HttpServerSettings(
                     host = connectorSpec.host,
@@ -136,7 +137,7 @@ public class CIOApplicationEngine(
     }
 
     private fun addHandlerForExpectedHeader(output: ByteWriteChannel, call: CIOApplicationCall) {
-        val continueResponse = "HTTP/1.1 100 Continue\r\n"
+        val continueResponse = "HTTP/1.1 100 Continue$CRLF$CRLF"
         val expectHeaderValue = "100-continue"
 
         val expectedHeaderPhase = PipelinePhase("ExpectedHeaderPhase")
@@ -249,3 +250,5 @@ public class CIOApplicationEngine(
         }
     }
 }
+
+private const val CRLF = "\r\n"

ktor-server/ktor-server-cio/common/test/io/ktor/tests/server/cio/CIOEngineTest.kt

@@ -92,6 +92,7 @@ class CIOHttpServerTest : HttpServerCommonTestSuite<CIOApplicationEngine, CIOApp
             writePostHeaders(writeChannel, body.length)
             val continueResponse = readChannel.readUTF8Line()
             assertEquals("HTTP/1.1 100 Continue", continueResponse)
+            assertTrue { readChannel.readUTF8Line()?.isEmpty() ?: false }
 
             writePostBody(writeChannel, body)
             val response = readAvailable(readChannel)

ktor-server/ktor-server-config-yaml/jvm/src/io/ktor/server/config/yaml/YamlConfigJvm.kt

@@ -20,7 +20,7 @@ import java.io.File
 public actual fun YamlConfig(path: String?): YamlConfig? {
     val resolvedPath = when {
         path == null -> DEFAULT_YAML_FILENAME
-        path.endsWith(".yaml") -> path
+        path.endsWith(".yaml") || path.endsWith(".yml") -> path
         else -> return null
     }
     val resource = Thread.currentThread().contextClassLoader.getResource(resolvedPath)

ktor-server/ktor-server-config-yaml/jvm/test-resources/application-custom.yml

@@ -0,0 +1,8 @@
+ktor:
+    deployment:
+        port: 2345
+    auth:
+        users:
+            - c
+            - d
+            - e