Attachment 35750 Details for Bug 62150 – Patch

[patch] Patch

requesturi.patch (text/plain), 1.31 KB, created by Remy Maucherat on 2018-03-02 09:07:10 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Remy Maucherat

Created: 2018-03-02 09:07:10 UTC

Size: 1.31 KB

patch

obsolete

>Index: java/org/apache/catalina/core/ApplicationContext.java
>===================================================================
>--- java/org/apache/catalina/core/ApplicationContext.java	(revision 1825624)
>+++ java/org/apache/catalina/core/ApplicationContext.java	(working copy)
>@@ -422,6 +422,7 @@
>         if (normalizedPath == null) {
>             return null;
>         }
>+        String baseUri = normalizedPath;
> 
>         if (getContext().getDispatchersUseEncodedPaths()) {
>             // Decode
>@@ -443,13 +444,13 @@
>             }
> 
>             // URI needs to include the context path
>-            uri = URLEncoder.DEFAULT.encode(getContextPath(), StandardCharsets.UTF_8) + uri;
>+            uri = URLEncoder.DEFAULT.encode(getContextPath(), StandardCharsets.UTF_8) + baseUri;
>         } else {
>             // uri is passed to the constructor for ApplicationDispatcher and is
>             // ultimately used as the value for getRequestURI() which returns
>             // encoded values. Therefore, since the value passed in for path
>             // was decoded, encode uri here.
>-            uri = URLEncoder.DEFAULT.encode(getContextPath() + uri, StandardCharsets.UTF_8);
>+            uri = URLEncoder.DEFAULT.encode(getContextPath() + baseUri, StandardCharsets.UTF_8);
>         }
> 
>         pos = normalizedPath.length();
>

Actions: View | Diff

Attachments on bug 62150: 35750