From: Adam Megacz Date: Sat, 16 Apr 2011 04:39:55 +0000 (-0700) Subject: resolve ambiguity between urls and email addresses X-Git-Url: http://git.megacz.com/?p=wix.git;a=commitdiff_plain;h=2fdc976aeea80bfc11544b6e0752f62c5066fd38 resolve ambiguity between urls and email addresses --- diff --git a/src/url.g b/src/url.g index 4ff664a..d848a37 100644 --- a/src/url.g +++ b/src/url.g @@ -23,8 +23,8 @@ Host = IP:: tok.digit "." tok.digit "." tok.digit "." tok.digit | DNS:: (part:: [a-zA-Z0-9\-]++) ++/ "." Port:: = (":" `tok.Int)? -username:: = [a-zA-Z0-9;/?:&=$\-_.+]++ -password:: = [a-zA-Z0-9;/?:&=$\-_.+]++ +username:: = [a-zA-Z0-9;?:&=$\-_.+]++ // slashes in usernames conflict with urls +password:: = [a-zA-Z0-9;?:&=$\-_.+/]++ method:: = [+\-.a-z0-9]+ urlchar = urlc | "%":: "%" [0-9a-fA-F] [0-9a-fA-F]