KTOR-7625: Url.segments parsing fix

ktorio · Oct 28, 2024 · 451f664 · 451f664
1 parent 95426ce
commit 451f664
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/ktor-http/common/src/io/ktor/http/Url.kt b/ktor-http/common/src/io/ktor/http/Url.kt
@@ -137,7 +137,7 @@ public class Url internal constructor(
      **/
     public val segments: List<String> by lazy {
         if (pathSegments.isEmpty()) return@lazy emptyList()
-        val start = if (pathSegments.first().isEmpty()) 1 else 0
+        val start = if (pathSegments.first().isEmpty() && pathSegments.size > 1) 1 else 0
         val end = if (pathSegments.last().isEmpty()) pathSegments.lastIndex else pathSegments.lastIndex + 1
         pathSegments.subList(start, end)
     }

diff --git a/ktor-http/common/test/io/ktor/tests/http/UrlTest.kt b/ktor-http/common/test/io/ktor/tests/http/UrlTest.kt
@@ -34,6 +34,8 @@ class UrlTest {
         val relative = Url("docs")
         val relativeWithTrailing = Url("docs/")
         val empty = Url("https://ktor.io")
+        val emptyWithTrailing = Url("http://ktor.io/")
+
 
         val expected = listOf("docs")
         assertContentEquals(expected, full.segments)
@@ -42,6 +44,7 @@ class UrlTest {
         assertContentEquals(expected, relative.segments)
         assertContentEquals(expected, relativeWithTrailing.segments)
         assertContentEquals(emptyList<String>(), empty.segments)
+        assertContentEquals(emptyList(), emptyWithTrailing.segments)
     }
 
     @Test