From 663859d2e5a97edefebf9ac36206903d7dd33a3e Mon Sep 17 00:00:00 2001 From: Jonathan Coates Date: Sun, 20 Dec 2020 19:57:31 +0000 Subject: [PATCH] Fix double URL decode Closes #613 --- .../core/apis/http/request/HttpRequestHandler.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/main/java/dan200/computercraft/core/apis/http/request/HttpRequestHandler.java b/src/main/java/dan200/computercraft/core/apis/http/request/HttpRequestHandler.java index fbd102be6..bebfdbea2 100644 --- a/src/main/java/dan200/computercraft/core/apis/http/request/HttpRequestHandler.java +++ b/src/main/java/dan200/computercraft/core/apis/http/request/HttpRequestHandler.java @@ -21,10 +21,8 @@ import io.netty.handler.codec.http.*; import java.io.Closeable; -import java.io.UnsupportedEncodingException; import java.net.URI; import java.net.URISyntaxException; -import java.net.URLDecoder; import java.nio.charset.Charset; import java.nio.charset.StandardCharsets; import java.util.HashMap; @@ -244,9 +242,9 @@ private URI getRedirect( HttpResponseStatus status, HttpHeaders headers ) try { - return uri.resolve( new URI( URLDecoder.decode( location, "UTF-8" ) ) ); + return uri.resolve( new URI( location ) ); } - catch( UnsupportedEncodingException | IllegalArgumentException | URISyntaxException e ) + catch( IllegalArgumentException | URISyntaxException e ) { return null; }