projects
/
wix.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(from parent 1:
78e1187
)
resolve ambiguity between urls and email addresses
master
author
Adam Megacz
<adam@megacz.com>
Sat, 16 Apr 2011 04:39:55 +0000
(21:39 -0700)
committer
Adam Megacz
<adam@megacz.com>
Sat, 16 Apr 2011 04:39:55 +0000
(21:39 -0700)
src/url.g
patch
|
blob
|
history
diff --git
a/src/url.g
b/src/url.g
index
4ff664a
..
d848a37
100644
(file)
--- 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]