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

diff --git a/basis/urls/secure/secure.factor b/basis/urls/secure/secure.factor
deleted file mode 100644 (file)
index 6961a8e..0000000
--- a/basis/urls/secure/secure.factor
+++ /dev/null
@@ -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> ;

diff --git a/basis/urls/secure/summary.txt b/basis/urls/secure/summary.txt
deleted file mode 100644 (file)
index 31692c0..0000000
--- a/basis/urls/secure/summary.txt
+++ /dev/null
@@ -1 +0,0 @@
-Support for https:// URLs

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

diff --git a/extra/hacker-news/hacker-news.factor b/extra/hacker-news/hacker-news.factor
index df720b38ff31f7104afc032267b58ebc9bff33d1..7baa71d490077864e2d923ae30737945c66f62e0 100644 (file)
--- a/extra/hacker-news/hacker-news.factor
+++ b/extra/hacker-news/hacker-news.factor
@@ -5,7 +5,6 @@ USING: accessors assocs calendar calendar.elapsed
 colors.constants colors.hex combinators concurrency.combinators
 formatting fry hashtables http.client io io.styles json.reader
 kernel make math math.parser sequences ui urls vocabs ;
-"urls.secure" require ! required for https
 
 IN: hacker-news