Merge branch 'master' of git://factorcode.org/git/factor into unicode

Conflicts:

	extra/webapps/file/file.factor
	extra/webapps/source/source.factor

diff --cc core/parser/parser.factor
Simple merge

diff --cc extra/io/server/server.factor
index c2fa9bafaec1950a22c23c77adb9a5f41f90e71c,a76ebcc450fd19d9a4cc801767c27237459beba3..4267f7d1e8ae788c6875c84c948c39c26c500ca7
--- 1/extra/io/server/server.factor
--- 2/extra/io/server/server.factor
+++ b/extra/io/server/server.factor
@@@ -26,11 -22,10 +22,10 @@@ LOG: accepted-connection NOTIC
  
  : accept-loop ( server quot -- )
      [
-         >r accept r> [ with-client ] 2curry
-         { log-service servers } "Client" spawn-vars
+         >r accept r> [ with-client ] 2curry "Client" spawn drop
      ] 2keep accept-loop ; inline
  
 -: server-loop ( addrspec quot -- )
 +: server-loop ( addrspec encoding quot -- )
      >r <server> dup servers get push r>
      [ accept-loop ] curry with-disposal ; inline
  

diff --cc extra/webapps/cgi/cgi.factor
index 255aee0fbdf16c1b567a52321ceed3e7c6337315,6be99088d00e0edbd7ce56361562ba0c35e6955e..2bad0c871d5cfe2e24c4f260acc7d8816b376c24
mode 100644,100755..100755
--- 1/extra/webapps/cgi/cgi.factor
--- 2/extra/webapps/cgi/cgi.factor
+++ b/extra/webapps/cgi/cgi.factor

diff --cc extra/webapps/file/file.factor
index 12627b985f97616ea0b7efc91a6a500f005723d7,c324561279e90550d851eeba3853a1e89ec1e1fc..80677e41735d3bdadc37b4f41ae761ed2e47b94b
--- 1/extra/webapps/file/file.factor
--- 2/extra/webapps/file/file.factor
+++ b/extra/webapps/file/file.factor
@@@ -3,12 -3,13 +3,13 @@@
  USING: calendar html io io.files kernel math math.parser
  http.server.responders http.server.templating namespaces parser
  sequences strings assocs hashtables debugger http.mime sorting
 -html.elements logging ;
 +html.elements logging io.encodings.binary ;
- 
  IN: webapps.file
  
+ SYMBOL: doc-root
+ 
  : serving-path ( filename -- filename )
-     "" or "doc-root" get swap path+ ;
+     "" or doc-root get swap path+ ;
  
  : file-http-date ( filename -- string )
      file-modified unix-time>timestamp timestamp>http-string ;
@@@ -129,4 -130,4 +130,4 @@@ global 
      
      ! The root directory is served by...
      "file" set-default-responder
--] bind
++] bind

diff --cc extra/webapps/source/source.factor
index dc97805b78e8fdb90513d03ffc9058d937609da8,98fb5b8873dee9dc40e5b6e651a37d1fa510094b..7cc213f3dde8e9c6f2819b34bc8e59397d770970
--- 1/extra/webapps/source/source.factor
--- 2/extra/webapps/source/source.factor
+++ b/extra/webapps/source/source.factor
@@@ -15,7 -15,9 +15,9 @@@ IN: webapps.sourc
  : source-responder ( path mime-type -- )
      drop
      serving-html
-     [ dup utf8 <file-reader> htmlize-stream ] with-html-stream ;
+     [
 -        dup file-name swap <file-reader> htmlize-stream
++        dup file-name swap utf8 <file-reader> htmlize-stream
+     ] with-html-stream ;
  
  global [
      ! Serve up our own source code