From 7d1f6c3c2699de688e0666c1c0c606cdc9444e3d Mon Sep 17 00:00:00 2001
From: Santiago Pericasgeertsen <santiago.pericasgeertsen@oracle.com>
Date: Mon, 23 Oct 2023 15:00:00 -0400
Subject: [PATCH] Use explicit instead of default encoding.

Signed-off-by: Santiago Pericasgeertsen <santiago.pericasgeertsen@oracle.com>
---
 .../io/helidon/webserver/ListenerConfigBlueprint.java  |  2 +-
 .../io/helidon/webserver/ProxyProtocolHandler.java     | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/webserver/webserver/src/main/java/io/helidon/webserver/ListenerConfigBlueprint.java b/webserver/webserver/src/main/java/io/helidon/webserver/ListenerConfigBlueprint.java
index ac0ebd84a47..c9d5396ccef 100644
--- a/webserver/webserver/src/main/java/io/helidon/webserver/ListenerConfigBlueprint.java
+++ b/webserver/webserver/src/main/java/io/helidon/webserver/ListenerConfigBlueprint.java
@@ -333,7 +333,7 @@ interface ListenerConfigBlueprint {
      *
      * @return proxy support status
      */
-    @ConfiguredOption("false")
+    @Option.Default("false")
     boolean enableProxyProtocol();
 
     /**
diff --git a/webserver/webserver/src/main/java/io/helidon/webserver/ProxyProtocolHandler.java b/webserver/webserver/src/main/java/io/helidon/webserver/ProxyProtocolHandler.java
index 70fa610a060..663d2d916ad 100644
--- a/webserver/webserver/src/main/java/io/helidon/webserver/ProxyProtocolHandler.java
+++ b/webserver/webserver/src/main/java/io/helidon/webserver/ProxyProtocolHandler.java
@@ -108,7 +108,7 @@ static ProxyProtocolData handleV1Protocol(PushbackInputStream inputStream) throw
 
             // protocol and family
             n = readUntil(inputStream, buffer, (byte) ' ', (byte) '\r');
-            String familyProtocol = new String(buffer, 0, n);
+            String familyProtocol = new String(buffer, 0, n, StandardCharsets.US_ASCII);
             var family = Family.fromString(familyProtocol);
             var protocol = Protocol.fromString(familyProtocol);
             byte b = readNext(inputStream);
@@ -124,22 +124,22 @@ static ProxyProtocolData handleV1Protocol(PushbackInputStream inputStream) throw
 
             // source address
             n = readUntil(inputStream, buffer, (byte) ' ');
-            var sourceAddress = new String(buffer, 0, n);
+            var sourceAddress = new String(buffer, 0, n, StandardCharsets.US_ASCII);
             match(inputStream, (byte) ' ');
 
             // destination address
             n = readUntil(inputStream, buffer, (byte) ' ');
-            var destAddress = new String(buffer, 0, n);
+            var destAddress = new String(buffer, 0, n, StandardCharsets.US_ASCII);
             match(inputStream, (byte) ' ');
 
             // source port
             n = readUntil(inputStream, buffer, (byte) ' ');
-            int sourcePort = Integer.parseInt(new String(buffer, 0, n));
+            int sourcePort = Integer.parseInt(new String(buffer, 0, n, StandardCharsets.US_ASCII));
             match(inputStream, (byte) ' ');
 
             // destination port
             n = readUntil(inputStream, buffer, (byte) '\r');
-            int destPort = Integer.parseInt(new String(buffer, 0, n));
+            int destPort = Integer.parseInt(new String(buffer, 0, n, StandardCharsets.US_ASCII));
             match(inputStream, (byte) '\r');
             match(inputStream, (byte) '\n');