Revert "[UNDERTOW-1591][UNDERTOW-2123] Always decode pathInfo and servletPath as required by Servlet specification."

This reverts commit f49d1d9.

Author: rmartinc

servlet/src/main/java/io/undertow/servlet/spec/HttpServletRequestImpl.java

@@ -18,7 +18,6 @@
 
 package io.undertow.servlet.spec;
 
-import io.undertow.UndertowOptions;
 import io.undertow.security.api.SecurityContext;
 import io.undertow.security.idm.Account;
 import io.undertow.server.HttpServerExchange;
@@ -56,7 +55,6 @@
 import java.io.UnsupportedEncodingException;
 import java.net.InetAddress;
 import java.net.InetSocketAddress;
-import java.net.URLDecoder;
 import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
 import java.nio.charset.UnsupportedCharsetException;
@@ -291,29 +289,16 @@ public String getMethod() {
 
     @Override
     public String getPathInfo() {
-        final ServletPathMatch match = exchange.getAttachment(ServletRequestContext.ATTACHMENT_KEY).getServletPathMatch();
-        return match != null ? decodeURL(match.getRemaining()) : null;
-    }
-
-    private String decodeURL(final String s) {
-        try {
-            return s != null && s.length() > 0 ? URLDecoder.decode(s, getURLEncoding()) : s;
-        } catch (UnsupportedEncodingException ignored) {
-            throw new IllegalStateException(); // cannot happen
+        ServletPathMatch match = exchange.getAttachment(ServletRequestContext.ATTACHMENT_KEY).getServletPathMatch();
+        if (match != null) {
+            return match.getRemaining();
         }
-    }
-
-    private String getURLEncoding() {
-        return exchange.getConnection().getUndertowOptions().get(UndertowOptions.URL_CHARSET, StandardCharsets.UTF_8.name());
+        return null;
     }
 
     @Override
     public String getPathTranslated() {
-        ServletPathMatch match = exchange.getAttachment(ServletRequestContext.ATTACHMENT_KEY).getServletPathMatch();
-        if (match != null) {
-            return servletContext.getRealPath(match.getRemaining());
-        }
-        return null;
+        return servletContext.getRealPath(getPathInfo());
     }
 
     @Override
@@ -453,8 +438,11 @@ public StringBuffer getRequestURL() {
 
     @Override
     public String getServletPath() {
-        final ServletPathMatch match = exchange.getAttachment(ServletRequestContext.ATTACHMENT_KEY).getServletPathMatch();
-        return match != null ? decodeURL(match.getMatched()) : "";
+        ServletPathMatch match = exchange.getAttachment(ServletRequestContext.ATTACHMENT_KEY).getServletPathMatch();
+        if (match != null) {
+            return match.getMatched();
+        }
+        return "";
     }
 
     @Override
@@ -1183,11 +1171,7 @@ public String getOriginalServletPath() {
         if(uri != null) {
             return uri;
         }
-        ServletPathMatch match = exchange.getAttachment(ServletRequestContext.ATTACHMENT_KEY).getServletPathMatch();
-        if (match != null) {
-            return match.getMatched();
-        }
-        return "";
+        return getServletPath();
     }
 
     public String getOriginalPathInfo() {
@@ -1199,11 +1183,7 @@ public String getOriginalPathInfo() {
         if(uri != null) {
             return uri;
         }
-        ServletPathMatch match = exchange.getAttachment(ServletRequestContext.ATTACHMENT_KEY).getServletPathMatch();
-        if (match != null) {
-            return match.getRemaining();
-        }
-        return null;
+        return getPathInfo();
     }
 
     public String getOriginalContextPath() {