urls.secure: roll this into urls since we ship libressl on windows now.

locals-and-roots
Doug Coleman 2016-03-29 11:40:42 -07:00
parent 01eb69e626
commit fe3031bc96
4 changed files with 9 additions and 17 deletions

View File

@ -1,8 +0,0 @@
! Copyright (C) 2008, 2010 Slava Pestov.
! See http://factorcode.org/license.txt for BSD license.
USING: kernel urls urls.private io.sockets io.sockets.secure ;
IN: urls.secure
UNION: abstract-inet inet inet4 inet6 ;
M: abstract-inet >secure-addr <secure> ;

View File

@ -1 +0,0 @@
Support for https:// URLs

View File

@ -1,11 +1,9 @@
! Copyright (C) 2008, 2011 Slava Pestov. ! Copyright (C) 2008, 2011 Slava Pestov.
! See http://factorcode.org/license.txt for BSD license. ! See http://factorcode.org/license.txt for BSD license.
USING: accessors arrays assocs combinators fry io.pathnames
USING: accessors arrays assocs combinators fry hashtables io.pathnames io.sockets io.sockets.secure kernel lexer linked-assocs make
io.sockets kernel lexer linked-assocs make math.parser namespaces math.parser namespaces peg.ebnf present sequences splitting
peg.ebnf present sequences splitting strings strings.parser strings strings.parser urls.encoding vocabs.loader ;
urls.encoding vocabs.loader ;
IN: urls IN: urls
TUPLE: url protocol username password host port path query anchor ; TUPLE: url protocol username password host port path query anchor ;
@ -193,8 +191,12 @@ PRIVATE>
: ensure-port ( url -- url' ) : ensure-port ( url -- url' )
clone dup protocol>> '[ _ protocol-port or ] change-port ; clone dup protocol>> '[ _ protocol-port or ] change-port ;
! Secure sockets
UNION: abstract-inet inet inet4 inet6 ;
M: abstract-inet >secure-addr <secure> ;
! Literal syntax ! Literal syntax
SYNTAX: URL" lexer get skip-blank parse-short-string >url suffix! ; SYNTAX: URL" lexer get skip-blank parse-short-string >url suffix! ;
{ "urls" "prettyprint" } "urls.prettyprint" require-when { "urls" "prettyprint" } "urls.prettyprint" require-when
{ "urls" "io.sockets.secure" } "urls.secure" require-when

View File

@ -5,7 +5,6 @@ USING: accessors assocs calendar calendar.elapsed
colors.constants colors.hex combinators concurrency.combinators colors.constants colors.hex combinators concurrency.combinators
formatting fry hashtables http.client io io.styles json.reader formatting fry hashtables http.client io io.styles json.reader
kernel make math math.parser sequences ui urls vocabs ; kernel make math math.parser sequences ui urls vocabs ;
"urls.secure" require ! required for https
IN: hacker-news IN: hacker-news