Merge pull request #20 from jestabro/regex-user-info

T5940: relax regex of uri user information for 1.3.x compatibility

1 files changed, 1 insertions, 1 deletions

diff --git a/src/url.ml b/src/url.ml
index 2f3367b..3d77544 100644
--- a/src/url.ml
+++ b/src/url.ml
@@ -30,7 +30,7 @@ let regex_matches regex s =
 
 let host_path_format =
   Pcre.regexp
-  {|^//(?:[a-zA-Z0-9\-\._~]+(?::[a-zA-Z0-9\-\._~]*)?@)?([a-zA-Z0-9\-\._~]+|\[[a-zA-Z0-9:\.]+\])(?::([0-9]+))?(/.*)?$|}
+  {|^//(?:[^/?#]+(?::[^/?#]*)?@)?([a-zA-Z0-9\-\._~]+|\[[a-zA-Z0-9:\.]+\])(?::([0-9]+))?(/.*)?$|}
 
 let host_name_format = Pcre.regexp {|^[a-zA-Z0-9]+([\-\._~]{1}[a-zA-Z0-9]+)*$|}
 let ipv4_addr_format = Pcre.regexp {|^(([1-9]\d{0,2}|0)\.){3}([1-9]\d{0,2}|0)$|}