From 2d381ed84e2845a1174480bcc79eb54ebf02a3d6 Mon Sep 17 00:00:00 2001
From: Slava Pestov <slava@oberon.local>
Date: Fri, 1 Feb 2008 22:47:01 -0600
Subject: [PATCH] Fix http server

---
 extra/http/server/templating/templating.factor | 2 +-
 extra/io/server/server.factor                  | 6 +++---
 extra/webapps/cgi/cgi.factor                   | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/extra/http/server/templating/templating.factor b/extra/http/server/templating/templating.factor
index 69f8b4e7fd..f5de4664a1 100755
--- a/extra/http/server/templating/templating.factor
+++ b/extra/http/server/templating/templating.factor
@@ -25,7 +25,7 @@ M: template-lexer skip-word
         {
             { [ 2dup nth CHAR: " = ] [ drop 1+ ] }
             { [ 2dup swap tail-slice "%>" head? ] [ drop 2 + ] }
-            { [ t ] [ [ blank? ] skip ] }
+            { [ t ] [ f skip ] }
         } cond
     ] change-column ;
 
diff --git a/extra/io/server/server.factor b/extra/io/server/server.factor
index 6e7cd5a940..408fd29714 100755
--- a/extra/io/server/server.factor
+++ b/extra/io/server/server.factor
@@ -29,7 +29,7 @@ SYMBOL: log-stream
 
 : with-log-file ( file quot -- )
     >r <file-appender> r>
-    [ with-log-stream ] with-disposal ; inline
+    [ with-log-stream ] curry with-disposal ; inline
 
 : with-log-stdio ( quot -- )
     stdio get swap with-log-stream ;
@@ -47,11 +47,11 @@ SYMBOL: log-stream
     dup log-client
     [ swap with-stream ] 2curry concurrency:spawn drop ; inline
 
-: accept-loop ( server quot -- server quot )
+: accept-loop ( server quot -- )
     [ swap accept with-client ] 2keep accept-loop ; inline
 
 : server-loop ( server quot -- )
-    [ accept-loop ] compose with-disposal ; inline
+    [ accept-loop ] curry with-disposal ; inline
 
 : spawn-server ( addrspec quot -- )
     "Waiting for connections on " pick unparse append
diff --git a/extra/webapps/cgi/cgi.factor b/extra/webapps/cgi/cgi.factor
index 9dd9dca39c..967036a797 100644
--- a/extra/webapps/cgi/cgi.factor
+++ b/extra/webapps/cgi/cgi.factor
@@ -1,8 +1,8 @@
-! Copyright (C) 2007 Slava Pestov.
+! Copyright (C) 2007, 2008 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: namespaces kernel assocs io.files combinators
 arrays io.launcher io http.server.responders webapps.file
-sequences strings math.parser ;
+sequences strings math.parser unicode.case ;
 IN: webapps.cgi
 
 SYMBOL: cgi-root
@@ -31,7 +31,7 @@ SYMBOL: cgi-root
 
         "method" get >upper "REQUEST_METHOD" set
         "raw-query" get "QUERY_STRING" set
-	"Cookie" header-param "HTTP_COOKIE" set 
+        "Cookie" header-param "HTTP_COOKIE" set 
 
         "User-Agent" header-param "HTTP_USER_AGENT" set
         "Accept" header-param "HTTP_ACCEPT" set