From 278509336d39dd9e2d0e73df70fa15b4e36b1e8a Mon Sep 17 00:00:00 2001
From: Daniel Ehrenberg <ehrenbed@carleton.edu>
Date: Mon, 25 Feb 2008 15:10:14 -0600
Subject: [PATCH] Making with-server take encodings properly

---
 extra/benchmark/sockets/sockets.factor           | 4 ++--
 extra/concurrency/distributed/distributed.factor | 4 ++--
 extra/http/server/server.factor                  | 4 ++--
 extra/io/server/server.factor                    | 8 ++++----
 extra/tty-server/tty-server.factor               | 6 +++---
 5 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/extra/benchmark/sockets/sockets.factor b/extra/benchmark/sockets/sockets.factor
index 6b1908afb1..b6b20630a1 100755
--- 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
+USING: io.sockets io.server io kernel math threads io.encodings.ascii
 debugger tools.time prettyprint concurrency.combinators ;
 IN: benchmark.sockets
 
 : simple-server ( -- )
-    7777 local-server "benchmark.sockets" [
+    7777 local-server "benchmark.sockets" ascii [
         read1 CHAR: x = [
             stop-server
         ] [
diff --git a/extra/concurrency/distributed/distributed.factor b/extra/concurrency/distributed/distributed.factor
index 2c54a872f7..029be9772c 100755
--- 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 a2f5c3474b..bd0abc4f9b 100755
--- 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 2c1cac1467..c2fa9bafae 100755
--- 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 f71265e6f0..2936c39070 100644
--- 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