=================================================================== RCS file: /home/cvs/OpenXM/src/kan96xx/Doc/httpd.sm1,v retrieving revision 1.17 retrieving revision 1.21 diff -u -p -r1.17 -r1.21 --- OpenXM/src/kan96xx/Doc/httpd.sm1 2005/11/17 08:15:51 1.17 +++ OpenXM/src/kan96xx/Doc/httpd.sm1 2012/12/23 01:27:54 1.21 @@ -1,10 +1,19 @@ -%% $OpenXM: OpenXM/src/kan96xx/Doc/httpd.sm1,v 1.16 2005/02/27 05:28:05 takayama Exp $ +%% $OpenXM: OpenXM/src/kan96xx/Doc/httpd.sm1,v 1.20 2010/02/08 01:08:39 takayama Exp $ %% common modules for httpd on sm1. +% [(Strict) 1] system_variable % for debugging. /Oxserver_history_variable (Oxserver_history_variable_) def /httpd.image.type [(getenv) (OpenXM_PSTOIMG_TYPE)] extension def +/httpd_sm1.cookie + [(oxGenPass)] extension +def +/httpd.set-cookie { + [(Set-Cookie: httpd_sm1=) httpd_sm1.cookie] cat +} def + + [(getenv) (OXWEB_DEBUG)] extension tag 0 eq { /httpd.debug 0 def } { @@ -134,6 +143,7 @@ def (HTTP/0.9 200 OK) sendln (Connection: close) sendln (Content-Type: text/html) sendln + httpd.set-cookie sendln 0 sendln %% (
) sendln result sendln @@ -742,18 +752,9 @@ def [/in-httpd_type /fname /ftype /i /ans] pushVariables [ /fname arg1 def - fname (array) dc /fname set - fname reverse /fname set - [ - 0 1 fname length 1 sub { - /i set - fname i get 46 eq { % '.' - exit - } { fname i get } ifelse - } for - ] /ftype set - ftype reverse {(string) dc} map cat /ftype set - /ans (text/plain) def + fname getFileType /ftype set + + /ans (text/plain) def % .txt, .jar, ftype (gif) eq { /ans (image/gif) def }{ } ifelse @@ -769,9 +770,12 @@ def ftype (html) eq ftype (htm) eq or { /ans (text/html) def } { } ifelse - ftype (txt) eq { - /ans (text/html) def - } { } ifelse + ftype (wav) eq { + /ans (audio/x-wav) def + } { } ifelse + ftype (class) eq { + /ans (application/octet-stream) def + } { } ifelse /arg1 ans def ] pop popVariables @@ -815,8 +819,13 @@ def [(getenv) (OX_BROWSER)] extension /browser set { browser tag 0 eq { - [(sleep 3 ; netscape http://localhost:) portnum ( & ) ] cat - /cmd set cmd message + [(ostype)] extension 1 get (mac) eq { + [(sleep 3 ; open http://localhost:) portnum ( & ) ] cat + /cmd set cmd message + }{ + [(sleep 3 ; firefox http://localhost:) portnum ( & ) ] cat + /cmd set cmd message + }ifelse cmd system exit }{ } ifelse