Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix UriComponentsBuilder.fromUriString parsing error

Browse Source 
This commit fixes cases where part of the URI was mistaken for the
userinfo when:
* the URI did not contain any path
* the query string contained the "@"

Issue: SPR-11970
(cherry picked from commit a4484bb)
This commit is contained in:
Brian Clozel
2014-07-09 16:58:11 +02:00
committed by Juergen Hoeller
parent 10a039000b
commit a3a76d8c15
2 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-web/src/main/java/org/springframework/web/util/UriComponentsBuilder.java
View File

@@ -62,7 +62,7 @@ public class UriComponentsBuilder {
private static final String HTTP_PATTERN = "(?i)(http|https):";
private static final String USERINFO_PATTERN = "([^@/]*)";
private static final String USERINFO_PATTERN = "([^@\\[/?#]*)";
private static final String HOST_IPV4_PATTERN = "[^\\[/?#:]*";