--- gforth/httpd.fs	2003/08/25 14:17:45	1.14
+++ gforth/httpd.fs	2004/05/16 21:16:36	1.16
@@ -112,7 +112,7 @@ Variable maxnum
 Variable htmldir
 
 : rework-htmldir ( addr u -- addr' u' / ior )
-  htmldir $! htmldir $@ compact.. htmldir $!len drop
+  htmldir $! htmldir $@ compact-filename htmldir $!len drop
   htmldir $@ s" ../" string-prefix?
   IF    -1 EXIT  THEN  \ can't access below current directory
   htmldir $@ s" ~" string-prefix?
@@ -228,7 +228,7 @@ Defer redirect ( addr u -- )
 	THEN  THEN  THEN  THEN  outfile-id flush-file throw ;
 
 : httpd  ( n -- )  dup maxnum ! 0 <# #S #> Keep-Alive $!
-  BEGIN  ['] http catch  maxnum @ 0= or  UNTIL ;
+  maxnum @ 0 DO  ['] http catch  maxnum @ 0= or  ?LEAVE  LOOP ;
 
 script? [IF]  :noname &100 httpd bye ; is bootmessage  [THEN]