KTOR-5591 Fix takeFrom(URL) method with underscore in host (#3417)

ktorio · Feb 24, 2023 · c9327e7 · c9327e7
1 parent 5ba3db9
commit c9327e7
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/ktor-http/jvm/src/io/ktor/http/URLUtilsJvm.kt b/ktor-http/jvm/src/io/ktor/http/URLUtilsJvm.kt
@@ -44,9 +44,12 @@ public fun URLBuilder.takeFrom(uri: URI): URLBuilder {
 }
 
 /**
- * Take URI components from [url]
+ * Take URL components from [url]
  */
-public fun URLBuilder.takeFrom(url: URL): URLBuilder = takeFrom(url.toURI())
+public fun URLBuilder.takeFrom(url: URL): URLBuilder = when {
+    url.host.contains('_') -> takeFrom(url.toString())
+    else -> takeFrom(url.toURI())
+}
 
 /**
  * Convert [Url] to [URI]

diff --git a/ktor-http/jvm/test/io/ktor/tests/http/URLBuilderTest.kt b/ktor-http/jvm/test/io/ktor/tests/http/URLBuilderTest.kt
@@ -110,4 +110,12 @@ class URLBuilderTestJvm {
             takeFrom(URI("/test"))
         }.buildString().let { url -> assertEquals("http://localhost:9093/test", url) }
     }
+
+    @Test
+    fun testUnderscoreInHost() {
+        assertEquals(
+            "http://my_service:8080",
+            URLBuilder().takeFrom(URL("http://my_service:8080")).buildString()
+        )
+    }
 }