--- gforth/httpd.fs	2000/04/12 20:53:46	1.5
+++ gforth/httpd.fs	2002/06/02 21:19:09	1.11
@@ -1,8 +1,29 @@
 #! /usr/local/bin/gforth
 
+\ Copyright (C) 2000 Free Software Foundation, Inc.
+
+\ This file is part of Gforth.
+
+\ Gforth is free software; you can redistribute it and/or
+\ modify it under the terms of the GNU General Public License
+\ as published by the Free Software Foundation; either version 2
+\ of the License, or (at your option) any later version.
+
+\ This program is distributed in the hope that it will be useful,
+\ but WITHOUT ANY WARRANTY; without even the implied warranty of
+\ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+\ GNU General Public License for more details.
+
+\ You should have received a copy of the GNU General Public License
+\ along with this program; if not, write to the Free Software
+\ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA.
+
 warnings off
 
-include string.fs
+require string.fs
+
+Variable DocumentRoot  s" /usr/local/httpd/htdocs/" DocumentRoot $!
+Variable UserDir       s" .html-data/"              UserDir      $!
 
 Variable url
 Variable posted
@@ -65,6 +86,7 @@ value: Connection:
 value: Referer:
 value: Content-Type:
 value: Content-Length:
+value: Keep-Alive:
 
 definitions
 
@@ -73,13 +95,14 @@ Variable maxnum
 : ?cr ( -- )
   #tib @ 1 >= IF  source 1- + c@ #cr = #tib +!  THEN ;
 : refill-loop ( -- flag )
-  BEGIN  refill ?cr  WHILE  interpret  >in @ 0=  UNTIL
+  BEGIN  refill ?cr  WHILE  ['] interpret catch drop  >in @ 0=  UNTIL
   true  ELSE  maxnum off false  THEN ;
 : get-input ( -- flag ior )
   s" /nosuchfile" url $!  s" HTTP/1.0" protocol $!
   s" close" connection $!
   infile-id push-file loadfile !  loadline off  blk off
   commands 1 set-order  command? on  ['] refill-loop catch
+  Keep-Alive $@ snumber? dup 0> IF  nip  THEN  IF  maxnum !  THEN
   active @ IF  s" " posted $! Content-Length $@ snumber? drop
       posted $!len  posted $@ infile-id read-file throw drop
   THEN  only forth also  pop-file ;
@@ -89,11 +112,13 @@ Variable maxnum
 Variable htmldir
 
 : rework-htmldir ( addr u -- addr' u' / ior )
-  htmldir $!
+  htmldir $! htmldir $@ compact.. htmldir $!len drop
+  htmldir $@ 3 min s" ../" compare 0=
+  IF    -1 EXIT  THEN  \ can't access below current directory
   htmldir $@ 1 min s" ~" compare 0=
-  IF    s" /.html-data" htmldir dup $@ 2dup '/ scan
+  IF    UserDir $@ htmldir dup $@ 2dup '/ scan '/ skip
         nip - nip $ins
-  ELSE  s" /usr/local/httpd/htdocs/" htmldir 0 $ins  THEN
+  ELSE  DocumentRoot $@ htmldir 0 $ins  THEN
   htmldir $@ 1- 0 max + c@ '/ = htmldir $@len 0= or
   IF  s" index.html" htmldir dup $@len $ins  THEN
   htmldir $@ file-status nip ?dup ?EXIT
@@ -134,10 +159,13 @@ Variable htmldir
 
 : mime-read ( addr u -- )  r/o open-file throw
     push-file loadfile !  0 loadline ! blk off
-    BEGIN  refill  WHILE  name
-	BEGIN  >in @ >r name nip  WHILE
-	    r> >in ! 2dup transparent:  REPEAT
-	2drop rdrop
+    BEGIN  refill  WHILE
+	char '# <> >in off name nip 0<> and  IF
+	    >in off name
+	    BEGIN  >in @ >r name nip  WHILE
+		r> >in ! 2dup transparent:  REPEAT
+	    2drop rdrop
+	THEN
     REPEAT  loadfile @ close-file pop-file throw ;
 
 : lastrequest
@@ -187,14 +215,19 @@ s" text/plain" transparent: txt
 
 \ http server                                          26mar00py
 
+Defer redirect?  ( addr u -- addr' u' t / f )
+Defer redirect ( addr u -- )
+:noname 2drop false ; IS redirect?
+
 : http ( -- )  get-input  IF  .nok  ELSE
-    IF  url $@ 1 /string rework-htmldir
+    IF  url $@ 1 /string 2dup redirect? IF  redirect 2drop  ELSE
+	rework-htmldir
 	dup 0< IF  drop .nofile
 	ELSE  .ok  2dup >mime mime search-wordlist
 	    0= IF  ['] txt  THEN  catch IF  maxnum off THEN
-	THEN  THEN  THEN  outfile-id flush-file throw ;
+	THEN  THEN  THEN  THEN  outfile-id flush-file throw ;
 
-: httpd  ( n -- )  maxnum !
+: httpd  ( n -- )  dup maxnum ! 0 <# #S #> Keep-Alive $!
   BEGIN  ['] http catch  maxnum @ 0= or  UNTIL ;
 
 script? [IF]  :noname &100 httpd bye ; is bootmessage  [THEN]
@@ -206,3 +239,7 @@ script? [IF]  :noname &100 httpd bye ; i
         type cr refill  0= UNTIL  EXIT  THEN
     nip source >in @ /string rot - dup 2 + >in +! type ;
 : <HTML> ( -- )  ." <HTML>" $> ;
+
+\ provide transparent proxying
+
+include ./proxy.fs