From ee48d43aac693df7a8f157f888c6b06006c9f35f Mon Sep 17 00:00:00 2001
From: Anna Koskinen <Ansku@users.noreply.github.com>
Date: Mon, 7 Sep 2020 17:58:10 +0300
Subject: Update ServletPortletHelper.java (#12087) (#12100)

This is needed to get /UIDL working behind a reverse proxy. Without the change pathInfo would be "/UIDL" but prefix would be "/UIDL/" in line 105.

Authored-by: Clemens von Schwerin <clemens.vonschwerin@gmail.com>
---
 server/src/main/java/com/vaadin/server/ServletPortletHelper.java | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/server/src/main/java/com/vaadin/server/ServletPortletHelper.java b/server/src/main/java/com/vaadin/server/ServletPortletHelper.java
index 82ea4a9d1d..d0daff471a 100644
--- a/server/src/main/java/com/vaadin/server/ServletPortletHelper.java
+++ b/server/src/main/java/com/vaadin/server/ServletPortletHelper.java
@@ -98,6 +98,10 @@ public class ServletPortletHelper implements Serializable {
             prefix = '/' + prefix;
         }
 
+        if (!pathInfo.endsWith("/") && prefix.endsWith("/")) {
+            pathInfo += '/';
+        }
+
         if (pathInfo.startsWith(prefix)) {
             return true;
         }
-- 
cgit v1.2.3