From 7089853638d500cf64f9440d1fb564ca92480698 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 14 Mar 2024 16:40:00 +0100 Subject: [PATCH] fix(deps): update dependency io.netty.incubator:netty-incubator-codec-http3 to v0.0.27.final (#10603) --- gradle/libs.versions.toml | 2 +- .../io/micronaut/http/server/netty/HttpPipelineBuilder.java | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index bcfde91fb2..98bfc5e84c 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -68,7 +68,7 @@ managed-kotlin-coroutines = "1.7.3" managed-methvin-directory-watcher = "0.18.0" managed-netty = "4.1.107.Final" managed-netty-iouring = "0.0.25.Final" -managed-netty-http3 = "0.0.25.Final" +managed-netty-http3 = "0.0.27.Final" managed-netty-tcnative = "2.0.65.Final" managed-reactive-streams = "1.0.4" # This should be kept aligned with https://github.com/micronaut-projects/micronaut-reactor/blob/master/gradle.properties from the BOM diff --git a/http-server-netty/src/main/java/io/micronaut/http/server/netty/HttpPipelineBuilder.java b/http-server-netty/src/main/java/io/micronaut/http/server/netty/HttpPipelineBuilder.java index 56f4a1be82..27dbe8c280 100644 --- a/http-server-netty/src/main/java/io/micronaut/http/server/netty/HttpPipelineBuilder.java +++ b/http-server-netty/src/main/java/io/micronaut/http/server/netty/HttpPipelineBuilder.java @@ -246,8 +246,8 @@ void insertPcapLoggingHandler(Channel ch, String qualifier) { path = path.replace("{remoteAddress}", resolveIfNecessary(ch.remoteAddress())); } if (quic && ch instanceof QuicStreamChannel qsc) { - path = path.replace("{localAddress}", resolveIfNecessary(qsc.parent().localAddress())); - path = path.replace("{remoteAddress}", resolveIfNecessary(qsc.parent().remoteAddress())); + path = path.replace("{localAddress}", resolveIfNecessary(qsc.parent().localSocketAddress())); + path = path.replace("{remoteAddress}", resolveIfNecessary(qsc.parent().remoteSocketAddress())); } path = path.replace("{random}", Long.toHexString(ThreadLocalRandom.current().nextLong())); path = path.replace("{timestamp}", Instant.now().toString()); @@ -260,7 +260,7 @@ void insertPcapLoggingHandler(Channel ch, String qualifier) { PcapWriteHandler.Builder builder = PcapWriteHandler.builder(); if (quic && ch instanceof QuicStreamChannel qsc) { - builder.forceTcpChannel((InetSocketAddress) qsc.parent().localAddress(), (InetSocketAddress) qsc.parent().remoteAddress(), true); + builder.forceTcpChannel((InetSocketAddress) qsc.parent().localSocketAddress(), (InetSocketAddress) qsc.parent().remoteSocketAddress(), true); } ch.pipeline().addLast(builder.build(new FileOutputStream(path)));