KTOR-5383 Fix parsing server host and port when using NettyConnection… (

#4014) * KTOR-5383 Fix parsing server host and port when using NettyConnectionPoint and CIOConnectionPoint (cherry picked from commit d5b4053)
ktorio · Apr 5, 2024 · df04b16 · df04b16
1 parent 7d3f6a9
commit df04b16
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/ktor-server/ktor-server-cio/jvmAndNix/src/io/ktor/server/cio/CIOApplicationRequest.kt b/ktor-server/ktor-server-cio/jvmAndNix/src/io/ktor/server/cio/CIOApplicationRequest.kt
@@ -77,14 +77,14 @@ internal class CIOConnectionPoint(
 
     override val serverPort: Int
         get() = hostHeaderValue
-            ?.substringAfter(":", defaultPort.toString())?.toInt()
+            ?.substringAfterLast(":", defaultPort.toString())?.toInt()
             ?: localPort
 
     override val localHost: String
         get() = localNetworkAddress?.hostname ?: "localhost"
 
     override val serverHost: String
-        get() = hostHeaderValue?.substringBefore(":") ?: localHost
+        get() = hostHeaderValue?.substringBeforeLast(":") ?: localHost
 
     override val localAddress: String
         get() = localNetworkAddress?.address ?: "localhost"

diff --git a/ktor-server/ktor-server-netty/jvm/src/io/ktor/server/netty/http1/NettyConnectionPoint.kt b/ktor-server/ktor-server-netty/jvm/src/io/ktor/server/netty/http1/NettyConnectionPoint.kt
@@ -45,7 +45,7 @@ internal class NettyConnectionPoint(
             ?: "localhost"
 
     override val serverHost: String
-        get() = request.headers().get(HttpHeaders.Host)?.substringBefore(":") ?: localHost
+        get() = request.headers().get(HttpHeaders.Host)?.substringBeforeLast(":") ?: localHost
 
     override val localAddress: String
         get() = (context.channel().localAddress() as? InetSocketAddress)?.hostString ?: "localhost"
@@ -57,7 +57,7 @@ internal class NettyConnectionPoint(
         get() = (context.channel().localAddress() as? InetSocketAddress)?.port ?: defaultPort
 
     override val serverPort: Int
-        get() = request.headers().get(HttpHeaders.Host)?.substringAfter(":", defaultPort.toString())?.toInt()
+        get() = request.headers().get(HttpHeaders.Host)?.substringAfterLast(":", defaultPort.toString())?.toInt()
             ?: localPort
 
     override val remoteHost: String