Merge branch '5.2.x' into master

2020-10-07 12:45:51 +01:00
parent 7d7ed88739 eb11c6fa23
commit 1c1bc41e24
4 changed files with 55 additions and 3 deletions
--- a/spring-web/src/test/java/org/springframework/web/util/UrlPathHelperTests.java
+++ b/spring-web/src/test/java/org/springframework/web/util/UrlPathHelperTests.java
@@ -126,7 +126,7 @@ public class UrlPathHelperTests {
 		assertThat(helper.getRequestUri(request)).isEqualTo("/foo;a=b;c=d");

 		request.setRequestURI("/foo;jsessionid=c0o7fszeb1");
-		assertThat(helper.getRequestUri(request)).isEqualTo("/foo;jsessionid=c0o7fszeb1");
+		assertThat(helper.getRequestUri(request)).isEqualTo("/foo");
 	}

 	@Test