--- gforth/httpd.fs 2000/04/09 20:57:25 1.4
+++ gforth/httpd.fs 2006/10/07 21:51:28 1.21
@@ -1,8 +1,51 @@
#! /usr/local/bin/gforth
+\ Copyright (C) 2000,2002,2003,2004 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.
+
+\ This relies on inetd or xinetd:
+
+\ To run the server on port 4444, do the following:
+
+\ Add the following line to /etc/services:
+\ gforth 4444/tcp
+
+\ If you use inetd, add the following line to /etc/inetd.conf:
+\ gforth stream tcp nowait.10000 wwwrun /usr/users/bernd/bin/httpd
+
+\ If you use xinetd, create the folliwing service in /etc/xinetd.d:
+\ service gforth
+\ {
+\ socket_type = stream
+\ protocol = tcp
+\ wait = no
+\ user = wwwrun
+\ server = /home/bernd/bin/httpd
+\ }
+
+\ If you want port 80, replace the service "gforth" with "http"
+
warnings off
-include string.fs
+require string.fs
+
+Variable DocumentRoot s" /srv/www/htdocs/" DocumentRoot $!
+Variable UserDir s" public_html/" UserDir $!
Variable url
Variable posted
@@ -35,10 +78,10 @@ wordlist constant commands
r> 1+ +LOOP url $!len
r> base ! ;
-: rework-? ( addr -- ) { url }
- url $@ tuck '? scan tuck dup 0<> - url-args $! - url $!len ;
+: rework-? ( addr -- )
+ dup >r $@ '? $split url-args $! nip r> $!len ;
-: get-url url get protocol get-rest
+: get-url ( -- ) url get protocol get-rest
url rework-? url rework-% >values ;
commands set-current
@@ -65,6 +108,7 @@ value: Connection:
value: Referer:
value: Content-Type:
value: Content-Length:
+value: Keep-Alive:
definitions
@@ -72,45 +116,31 @@ Variable maxnum
: ?cr ( -- )
#tib @ 1 >= IF source 1- + c@ #cr = #tib +! THEN ;
-: refill-loop ( -- flag )
- BEGIN refill ?cr WHILE interpret >in @ 0= UNTIL
- true ELSE maxnum off false THEN ;
+: refill-loop ( -- flag ) base @ >r base off
+ BEGIN refill ?cr WHILE ['] interpret catch drop >in @ 0= UNTIL
+ true ELSE maxnum off false THEN r> base ! ;
: 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 ;
-\ Keep-Alive handling 26mar00py
-
-: .connection ( -- )
- ." Connection: "
- connection $@ s" Keep-Alive" compare 0= maxnum @ 0> and
- IF connection $@ type cr
- ." Keep-Alive: timeout=15, max=" maxnum @ 0 .r cr
- -1 maxnum +! ELSE ." close" cr maxnum off THEN ;
-
-\ Use Forth as server-side script language 26mar00py
-
-: $> ( -- )
- BEGIN source >in @ /string s" <$" search 0= WHILE
- type cr refill 0= UNTIL EXIT THEN
- nip source >in @ /string rot - dup 2 + >in +! type ;
-: ( -- ) ." " $> ;
-
\ Rework HTML directory 26mar00py
Variable htmldir
: rework-htmldir ( addr u -- addr' u' / ior )
- htmldir $!
- htmldir $@ 1 min s" ~" compare 0=
- IF s" /.html-data" htmldir dup $@ 2dup '/ scan
+ 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?
+ 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
@@ -132,6 +162,15 @@ Variable htmldir
$4000 - $4000 +LOOP drop
free fd close-file throw throw ;
+\ Keep-Alive handling 26mar00py
+
+: .connection ( -- )
+ ." Connection: "
+ connection $@ s" Keep-Alive" str= maxnum @ 0> and
+ IF connection $@ type cr
+ ." Keep-Alive: timeout=15, max=" maxnum @ 0 .r cr
+ -1 maxnum +! ELSE ." close" cr maxnum off THEN ;
+
: transparent: ( addr u -- ) Create here over 1+ allot place
DOES> >r >file
.connection
@@ -142,10 +181,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
@@ -161,7 +203,14 @@ mime set-current
s" application/pgp-signature" transparent: sig
s" application/x-bzip2" transparent: bz2
s" application/x-gzip" transparent: gz
-s" /etc/mime.types" mime-read
+s" /etc/mime.types" ' mime-read catch [IF] 2drop
+ \ no /etc/mime.types found on this machine,
+ \ generating the most important types:
+ s" text/html" transparent: html
+ s" image/gif" transparent: gif
+ s" image/png" transparent: png
+ s" image/jpg" transparent: jpg
+[THEN]
definitions
@@ -169,36 +218,57 @@ s" text/plain" transparent: txt
\ http errors 26mar00py
-: .server ." Server: Gforth httpd/0.1 ("
+: .server ( -- ) ." Server: Gforth httpd/1.0 ("
s" os-class" environment? IF type THEN ." )" cr ;
-: .ok ." HTTP/1.1 200 OK" cr .server ;
+: .ok ( -- ) ." HTTP/1.1 200 OK" cr .server ;
: html-error ( n addr u -- )
." HTTP/1.1 " 2 pick . 2dup type cr .server
- 2 pick &405 = IF ." Allow: GET, HEAD, POST" cr THEN lastrequest
- ." " 2 pick . 2dup type ." " cr
+ 2 pick &405 = IF ." Allow: GET, HEAD, POST" cr THEN
+ lastrequest
+ ." " 2 pick . 2dup type
+ ." " cr
." " type drop ."
" cr ;
: .trailer ( -- )
- ."
Gforth httpd 0.1" cr
+ ."
Gforth httpd 1.0" cr
." " cr ;
-: .nok command? @ IF &405 s" Method Not Allowed"
+: .nok ( -- ) command? @ IF &405 s" Method Not Allowed"
ELSE &400 s" Bad Request" THEN html-error
- ." Your browser sent a request that this server could not understand.
" cr
- ." Invalid request in: " error-stack cell+ 2@ swap type
+ ." Your browser sent a request that this server "
+ ." could not understand.
" cr
+ ." Invalid request in: "
+ error-stack cell+ 2@ swap type
."
" cr .trailer ;
-: .nofile &404 s" Not Found" html-error
+: .nofile ( -- ) &404 s" Not Found" html-error
." The requested URL " url $@ type
." was not found on this server
" cr .trailer ;
\ http server 26mar00py
-: http get-input IF .nok ELSE
- IF url $@ 1 /string rework-htmldir
+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 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 !
- BEGIN ['] http catch maxnum @ 0= or UNTIL ;
+: httpd ( n -- ) dup maxnum ! 0 <# #S #> Keep-Alive $!
+ maxnum @ 0 DO ['] http catch maxnum @ 0= or ?LEAVE LOOP ;
script? [IF] :noname &100 httpd bye ; is bootmessage [THEN]
+
+\ Use Forth as server-side script language 26mar00py
+
+: $> ( -- )
+ BEGIN source >in @ /string s" <$" search 0= WHILE
+ type cr refill 0= UNTIL EXIT THEN
+ nip source >in @ /string rot - dup 2 + >in +! type ;
+: ( -- ) ." " $> ;
+
+\ provide transparent proxying
+
+include ./proxy.fs