Merge pull request quarkusio#39046 from geoand/quarkusio#39041

Make sure Response and RestResponse work properly with IPv6 addresses
aloubyansky · Feb 28, 2024 · 83f85d8 · 83f85d8
2 parents af5b4b0 + 86fc0b2
commit 83f85d8
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/...r/runtime/src/main/java/org/jboss/resteasy/reactive/server/jaxrs/ResponseBuilderImpl.java b/...r/runtime/src/main/java/org/jboss/resteasy/reactive/server/jaxrs/ResponseBuilderImpl.java
@@ -28,7 +28,7 @@ public Response.ResponseBuilder location(URI location) {
                 try {
                     String host = req.getRequestHost();
                     int port = -1;
-                    int index = host.indexOf(":");
+                    int index = host.lastIndexOf(":");
                     if (index > -1) {
                         port = Integer.parseInt(host.substring(index + 1));
                         host = host.substring(0, index);
@@ -69,7 +69,7 @@ public Response.ResponseBuilder contentLocation(URI location) {
                 try {
                     String host = req.getRequestHost();
                     int port = -1;
-                    int index = host.indexOf(":");
+                    int index = host.lastIndexOf(":");
                     if (index > -1) {
                         port = Integer.parseInt(host.substring(index + 1));
                         host = host.substring(0, index);

diff --git a/...ntime/src/main/java/org/jboss/resteasy/reactive/server/jaxrs/RestResponseBuilderImpl.java b/...ntime/src/main/java/org/jboss/resteasy/reactive/server/jaxrs/RestResponseBuilderImpl.java
@@ -28,7 +28,7 @@ public RestResponse.ResponseBuilder<T> location(URI location) {
                 try {
                     String host = req.getRequestHost();
                     int port = -1;
-                    int index = host.indexOf(":");
+                    int index = host.lastIndexOf(":");
                     if (index > -1) {
                         port = Integer.parseInt(host.substring(index + 1));
                         host = host.substring(0, index);
@@ -69,7 +69,7 @@ public RestResponse.ResponseBuilder<T> contentLocation(URI location) {
                 try {
                     String host = req.getRequestHost();
                     int port = -1;
-                    int index = host.indexOf(":");
+                    int index = host.lastIndexOf(":");
                     if (index > -1) {
                         port = Integer.parseInt(host.substring(index + 1));
                         host = host.substring(0, index);