Making with-server take encodings properly

diff --git a/extra/benchmark/sockets/sockets.factor b/extra/benchmark/sockets/sockets.factor
index 6b1908afb106fe34fed6ad93fdc6019b759c6d6d..b6b20630a179f6e1155ffb55731adaa32d3b1b60 100755 (executable)
--- a/extra/benchmark/sockets/sockets.factor
+++ b/extra/benchmark/sockets/sockets.factor
@@ -1,9 +1,9 @@
-USING: io.sockets io.server io kernel math threads\r
+USING: io.sockets io.server io kernel math threads io.encodings.ascii\r
 debugger tools.time prettyprint concurrency.combinators ;\r
 IN: benchmark.sockets\r
 \r
 : simple-server ( -- )\r
-    7777 local-server "benchmark.sockets" [\r
+    7777 local-server "benchmark.sockets" ascii [\r
         read1 CHAR: x = [\r
             stop-server\r
         ] [\r

diff --git a/extra/concurrency/distributed/distributed.factor b/extra/concurrency/distributed/distributed.factor
index 2c54a872f76458f3773206ec1349289618862bbe..029be9772c56331c09ecc58a82def2cba7c185be 100755 (executable)
--- a/extra/concurrency/distributed/distributed.factor
+++ b/extra/concurrency/distributed/distributed.factor
@@ -2,7 +2,7 @@
 ! See http://factorcode.org/license.txt for BSD license.
 USING: serialize sequences concurrency.messaging
 threads io io.server qualified arrays
-namespaces kernel ;
+namespaces kernel io.encodings.binary ;
 QUALIFIED: io.sockets
 IN: concurrency.distributed
 
@@ -15,7 +15,7 @@ SYMBOL: local-node ( -- addrspec )
     [
         local-node set-global
         "concurrency.distributed"
-        [ handle-node-client ] with-server
+        binary [ handle-node-client ] with-server
     ] 2curry f spawn drop ;
 
 : start-node ( port -- )

diff --git a/extra/http/server/server.factor b/extra/http/server/server.factor
index a2f5c3474b91437b3dc18207d35972115164ae6a..bd0abc4f9bd75ce8f8385680ad3031d16c91092a 100755 (executable)
--- a/extra/http/server/server.factor
+++ b/extra/http/server/server.factor
@@ -2,7 +2,7 @@
 ! See http://factorcode.org/license.txt for BSD license.
 USING: assocs kernel namespaces io io.timeouts strings splitting
 threads http http.server.responders sequences prettyprint
-io.server logging calendar ;
+io.server logging calendar io.encodings.latin1 ;
 
 IN: http.server
 
@@ -49,7 +49,7 @@ IN: http.server
 \ parse-request NOTICE add-input-logging
 
 : httpd ( port -- )
-    internet-server "http.server" [
+    internet-server "http.server" latin1 [
         1 minutes stdio get set-timeout
         readln [ parse-request ] when*
     ] with-server ;

diff --git a/extra/io/server/server.factor b/extra/io/server/server.factor
index 2c1cac14678cd5fbef9a7a690d49654d86cf372d..c2fa9bafaec1950a22c23c77adb9a5f41f90e71c 100755 (executable)
--- a/extra/io/server/server.factor
+++ b/extra/io/server/server.factor
@@ -44,12 +44,12 @@ PRIVATE>
 : internet-server ( port -- seq )
     f swap t resolve-host ;
 
-: with-server ( seq service quot -- )
+: with-server ( seq service encoding quot -- )
     V{ } clone [
-        servers [
-            [ server-loop ] curry with-logging
+        swap servers [
+            [ server-loop ] 2curry with-logging
         ] with-variable
-    ] 3curry parallel-each ; inline
+    ] 3curry curry parallel-each ; inline
 
 : stop-server ( -- )
     servers get [ dispose ] each ;

diff --git a/extra/tty-server/tty-server.factor b/extra/tty-server/tty-server.factor
index f71265e6f09092767535850af45914a2d3d7adaf..2936c390701bbd39cc458554f09801521cf539ab 100644 (file)
--- a/extra/tty-server/tty-server.factor
+++ b/extra/tty-server/tty-server.factor
@@ -1,11 +1,11 @@
-USING: listener io.server ;
+USING: listener io.server io.encodings.utf8 ;
 IN: tty-server
 
 : tty-server ( port -- )
     local-server
     "tty-server"
-    [ listener ] with-server ;
+    utf8 [ listener ] with-server ;
 
 : default-tty-server 9999 tty-server ;
 
-MAIN: default-tty-server
\ No newline at end of file
+MAIN: default-tty-server