From 990a9c74b93b3124dae554e6246b9b75504a5d23 Mon Sep 17 00:00:00 2001
From: Juergen Hoeller <hoellerj@vmware.com>
Date: Wed, 4 Nov 2020 23:42:28 +0100
Subject: [PATCH] Restore removal of trailing semicolon content

See gh-26012
---
 .../java/org/springframework/web/util/UrlPathHelper.java   | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/spring-web/src/main/java/org/springframework/web/util/UrlPathHelper.java b/spring-web/src/main/java/org/springframework/web/util/UrlPathHelper.java
index 493535e09c..06b3c243a9 100644
--- a/spring-web/src/main/java/org/springframework/web/util/UrlPathHelper.java
+++ b/spring-web/src/main/java/org/springframework/web/util/UrlPathHelper.java
@@ -618,10 +618,11 @@ public class UrlPathHelper {
 		}
 		StringBuilder sb = new StringBuilder(requestUri);
 		while (semicolonIndex != -1) {
-			int slashIndex = requestUri.indexOf('/', semicolonIndex);
-			if (slashIndex >= 0) {
-				sb.delete(semicolonIndex, slashIndex);
+			int slashIndex = requestUri.indexOf('/', semicolonIndex + 1);
+			if (slashIndex == -1) {
+				slashIndex = sb.length();
 			}
+			sb.delete(semicolonIndex, slashIndex);
 			semicolonIndex = sb.indexOf(";", semicolonIndex);
 		}
 		return sb.toString();