Merge git://factorcode.org/git/factor

extra/furnace/furnace.factor

@@ -204,4 +204,3 @@ SYMBOL: model
     ] [
         drop
     ] if ;
-

extra/furnace/sessions/sessions.factor

@@ -1,5 +1,5 @@
 USING: assocs calendar init kernel math.parser
-namespaces random boxes alarms ;
+namespaces random boxes alarms combinators.lib ;
 IN: furnace.sessions
 
 SYMBOL: sessions
@@ -11,9 +11,8 @@ SYMBOL: sessions
 ] "furnace.sessions" add-init-hook
 
 : new-session-id ( -- str )
-    4 big-random >hex
-    dup sessions get-global key?
-    [ drop new-session-id ] when ;
+    [ 4 big-random >hex ]
+    [ sessions get-global key? not ] generate ;
 
 TUPLE: session id namespace alarm user-agent ;
 

extra/http/server/responders/responders.factor

@@ -77,7 +77,7 @@ SYMBOL: max-post-request
 1024 256 * max-post-request set-global
 
 : content-length ( header -- n )
-    "content-length" peek-at string>number dup [
+    "content-length" swap peek-at string>number dup [
         dup max-post-request get > [
             "Content-Length > max-post-request" throw
         ] when