Fix http tests and io.server.connection docs

diff --git a/basis/http/http-tests.factor b/basis/http/http-tests.factor
index a48c1ec48de4387c63f0b27e7641d79616671560..7be7c43399edd6fa9db5896a0040eb149112efa8 100644 (file)
--- a/basis/http/http-tests.factor
+++ b/basis/http/http-tests.factor
@@ -3,7 +3,7 @@ multiline io.streams.string io.encodings.utf8 io.encodings.8-bit
 io.encodings.binary io.encodings.string io.encodings.ascii kernel
 arrays splitting sequences assocs io.sockets db db.sqlite
 continuations urls hashtables accessors namespaces xml.data
-io.encodings.8-bit.latin1 ;
+io.encodings.8-bit.latin1 random ;
 IN: http.tests
 
 [ "text/plain" "UTF-8" ] [ "text/plain" parse-content-type ] unit-test
@@ -232,7 +232,7 @@ test-db [
             0 >>insecure
             f >>secure
         start-server
-        sockets>> first addr>> port>>
+        servers>> random addr>> port>>
     ] with-scope "port" set ;
 
 [ ] [

diff --git a/basis/io/servers/connection/connection-docs.factor b/basis/io/servers/connection/connection-docs.factor
index 73225c407f3fe9cb8816d1f26b5cf04ea917012f..4dd8efdbe3e42fc456fa907784794b1174e4fbd4 100644 (file)
--- a/basis/io/servers/connection/connection-docs.factor
+++ b/basis/io/servers/connection/connection-docs.factor
@@ -126,11 +126,11 @@ HELP: with-threaded-server
 { $description "Runs a server and calls a quotation, stopping the server once the quotation returns." } ;
 
 HELP: secure-port
-{ $values { "n" { $maybe integer } } }
+{ $values { "n/f" { $maybe integer } } }
 { $description "Outputs one of the port numbers on which the current threaded server accepts secure socket connections. Outputs " { $link f } " if the current threaded server does not accept secure socket connections." }
 { $notes "Can only be used from the dynamic scope of a " { $link handle-client* } " call." } ;
 
 HELP: insecure-port
-{ $values { "n" { $maybe integer } } }
+{ $values { "n/f" { $maybe integer } } }
 { $description "Outputs one of the port numbers on which the current threaded server accepts ordinary socket connections. Outputs " { $link f } " if the current threaded server does not accept ordinary socket connections." }
 { $notes "Can only be used from the dynamic scope of a " { $link handle-client* } " call." } ;

diff --git a/basis/tools/deploy/deploy-tests.factor b/basis/tools/deploy/deploy-tests.factor
index d36a855842aecee1f861409b9c94ff0aa1e89e8a..fa446ad44cf6b4bfdc5f00608e095af3d59a0702 100644 (file)
--- a/basis/tools/deploy/deploy-tests.factor
+++ b/basis/tools/deploy/deploy-tests.factor
@@ -69,7 +69,7 @@ M: quit-responder call-responder*
             0 >>insecure
             f >>secure
         start-server
-        sockets>> first addr>> port>>
+        servers>> first addr>> port>>
         dup number>string "resource:temp/port-number" ascii set-file-contents
     ] with-scope
     "port" set ;