Diff for /gforth/httpd.fs between versions 1.12 and 1.20

version 1.12, 2002/09/14 08:20:19 version 1.20, 2006/10/07 17:06:15
Line 1 Line 1
 #! /usr/local/bin/gforth  #! /usr/local/bin/gforth
   
 \ Copyright (C) 2000 Free Software Foundation, Inc.  \ Copyright (C) 2000,2002,2003,2004 Free Software Foundation, Inc.
   
 \ This file is part of Gforth.  \ This file is part of Gforth.
   
Line 23  warnings off Line 23  warnings off
 require string.fs  require string.fs
   
 Variable DocumentRoot  s" /usr/local/httpd/htdocs/" DocumentRoot $!  Variable DocumentRoot  s" /usr/local/httpd/htdocs/" DocumentRoot $!
 Variable UserDir       s" .html-data/"              UserDir      $!  Variable UserDir       s" public_html/"              UserDir      $!
   
 Variable url  Variable url
 Variable posted  Variable posted
Line 94  Variable maxnum Line 94  Variable maxnum
   
 : ?cr ( -- )  : ?cr ( -- )
   #tib @ 1 >= IF  source 1- + c@ #cr = #tib +!  THEN ;    #tib @ 1 >= IF  source 1- + c@ #cr = #tib +!  THEN ;
 : refill-loop ( -- flag )  : refill-loop ( -- flag ) base @ >r base off
   BEGIN  refill ?cr  WHILE  ['] interpret catch drop  >in @ 0=  UNTIL    BEGIN  refill ?cr  WHILE  ['] interpret catch drop  >in @ 0=  UNTIL
   true  ELSE  maxnum off false  THEN ;    true  ELSE  maxnum off false  THEN  r> base ! ;
 : get-input ( -- flag ior )  : get-input ( -- flag ior )
   s" /nosuchfile" url $!  s" HTTP/1.0" protocol $!    s" /nosuchfile" url $!  s" HTTP/1.0" protocol $!
   s" close" connection $!    s" close" connection $!
Line 112  Variable maxnum Line 112  Variable maxnum
 Variable htmldir  Variable htmldir
   
 : rework-htmldir ( addr u -- addr' u' / ior )  : rework-htmldir ( addr u -- addr' u' / ior )
   htmldir $! htmldir $@ compact.. htmldir $!len drop    htmldir $! htmldir $@ compact-filename htmldir $!len drop
   htmldir $@ s" ../" string-prefix?    htmldir $@ s" ../" string-prefix?
   IF    -1 EXIT  THEN  \ can't access below current directory    IF    -1 EXIT  THEN  \ can't access below current directory
   htmldir $@ s" ~" string-prefix?    htmldir $@ s" ~" string-prefix?
Line 181  mime set-current Line 181  mime set-current
 s" application/pgp-signature" transparent: sig  s" application/pgp-signature" transparent: sig
 s" application/x-bzip2" transparent: bz2  s" application/x-bzip2" transparent: bz2
 s" application/x-gzip" transparent: gz  s" application/x-gzip" transparent: gz
 s" /etc/mime.types" mime-read  s" /etc/mime.types" ['] mime-read catch [IF]  2drop  [THEN]
   
 definitions  definitions
   
Line 228  Defer redirect ( addr u -- ) Line 228  Defer redirect ( addr u -- )
         THEN  THEN  THEN  THEN  outfile-id flush-file throw ;          THEN  THEN  THEN  THEN  outfile-id flush-file throw ;
   
 : httpd  ( n -- )  dup maxnum ! 0 <# #S #> Keep-Alive $!  : 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]  script? [IF]  :noname &100 httpd bye ; is bootmessage  [THEN]
   

Removed from v.1.12  
changed lines
  Added in v.1.20


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>