From 986bf1b2f97bc5835d99655fd779fb1ab6798db3 Mon Sep 17 00:00:00 2001 From: John Benediktsson Date: Wed, 4 Nov 2015 07:45:46 -0800 Subject: [PATCH] Revert "Auto load urls.secure when needed" This reverts commit bb7740091eac7e88c240f19a92d6e9111aa78533. --- basis/urls/urls.factor | 4 ++-- core/vocabs/vocabs.factor | 3 --- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/basis/urls/urls.factor b/basis/urls/urls.factor index 3c38961bc4..bc99601f76 100644 --- a/basis/urls/urls.factor +++ b/basis/urls/urls.factor @@ -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 ] [ 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 ; diff --git a/core/vocabs/vocabs.factor b/core/vocabs/vocabs.factor index 21fab738f5..66f706eac7 100644 --- a/core/vocabs/vocabs.factor +++ b/core/vocabs/vocabs.factor @@ -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 ; -- 2.34.1