diff --git a/basis/urls/urls.factor b/basis/urls/urls.factor index 19bae087af..e35292e9d7 100644 --- a/basis/urls/urls.factor +++ b/basis/urls/urls.factor @@ -148,13 +148,6 @@ M: string >url ] [ url-decode >>anchor ] bi* ; -> dup [ - % password>> [ ":" % % ] when* "@" % - ] [ 2drop ] if ; - : protocol-port ( protocol -- port ) { { "http" [ 80 ] } @@ -166,6 +159,11 @@ M: string >url > dup [ + % password>> [ ":" % % ] when* "@" % + ] [ 2drop ] if ; + : url-port ( url -- port/f ) [ port>> ] [ port>> ] [ protocol>> protocol-port ] tri = [ drop f ] when ;