Revert "Auto load urls.secure when needed"

This reverts commit bb7740091e.
db4
John Benediktsson 2015-11-04 07:45:46 -08:00
parent 7b18618b3e
commit 986bf1b2f9
2 changed files with 2 additions and 5 deletions

View File

@ -4,7 +4,7 @@
USING: accessors arrays assocs combinators fry hashtables
io.pathnames io.sockets kernel lexer make math.parser
namespaces peg.ebnf present sequences splitting strings
strings.parser urls.encoding vocabs vocabs.loader ;
strings.parser urls.encoding vocabs.loader ;
IN: urls
@ -187,7 +187,7 @@ PRIVATE>
[ protocol>> protocol-port ]
tri or <inet>
] [ protocol>> ] bi
secure-protocol? [ "urls.secure" ensure-vocab-loaded >secure-addr ] when ;
secure-protocol? [ >secure-addr ] when ;
: set-url-addr ( url addr -- url )
[ host>> >>host ] [ port>> >>port ] bi ;

View File

@ -161,6 +161,3 @@ M: string require ( vocab -- )
: load-vocab ( name -- vocab )
[ require ] [ lookup-vocab ] bi ;
: ensure-vocab-loaded ( name -- )
dup lookup-vocab [ drop ] [ require ] if ;