===================================================================
RCS file: /home/cvs/OpenXM/src/kan96xx/Doc/httpd-sm1.sm1,v
retrieving revision 1.8
retrieving revision 1.16
diff -u -p -r1.8 -r1.16
--- OpenXM/src/kan96xx/Doc/httpd-sm1.sm1	2001/08/23 00:16:55	1.8
+++ OpenXM/src/kan96xx/Doc/httpd-sm1.sm1	2002/10/24 02:30:16	1.16
@@ -1,4 +1,4 @@
-%% $OpenXM: OpenXM/src/kan96xx/Doc/httpd-sm1.sm1,v 1.7 2001/08/21 14:21:29 takayama Exp $
+%% $OpenXM: OpenXM/src/kan96xx/Doc/httpd-sm1.sm1,v 1.15 2002/10/24 02:12:34 takayama Exp $
 %% http server by sm1
 %% Note to run on the Windows (TM).
 %% (A) You need to set IE (internet explorer) as follows:
@@ -36,16 +36,7 @@ def
 } {
   %% Initialize ox_sm1
   [(ostype)] extension 0 get
-  (windows) eq {
-    [(getenv) (OSTYPE)] extension
-    (cygwin) eq {
-      sm1connectr      %% Cygwin
-    }{
-      sm1connectr_win  %% Native Windows.
-    } ifelse
-  }{
-     sm1connectr      %% Unix
-  } ifelse
+  sm1connectr
   ox.ccc oxmathcap
   ox.ccc oxsetmathcap
 } ifelse
@@ -67,7 +58,8 @@ def
      %% On windows.
       [(forkExec)
        [
-         (c:/windows/command/start)
+         %%(c:/windows/command/start)
+         ox.win.start.0 aload pop
          (iexplore)   %% Starting internet explorer (TM).
          [(http://localhost:) httpd.port toString] cat
        ]
@@ -87,14 +79,15 @@ def
 /httpd_action {
   [/in-httpd /ff /httpd.com /httpd.result /sss
    /sss.engine /sss.web /err /httpd.sendFile
+   /oxserver.vname
   ] pushVariables
   [
   {
        [(sm1.socket) (select) [httpd.server.fd 0 get -1]] extension 
        %%     wait for ever
-        [(sm1.socket) (read) [httpd.server.fd 0 get ]] extension /ff set
-        ff length 0 eq {
-           (connection is closed.) message
+        [(sm1.socket) (readHTTP) [httpd.server.fd 0 get ]] extension /ff set
+        ff tag 0 eq {
+           (connection is closed.) message exit
         }
         {
           (------------  start ----------------------) message
@@ -112,6 +105,7 @@ def
           (   ) message
           httpd.serial 0 eq {
             /httpd.com  httpd.initialization def 
+            /httpd.textarea.valid 1 def
           } { } ifelse
           httpd.sendFile tag 0 eq { }
           {
@@ -120,8 +114,15 @@ def
           } ifelse
           httpd.com metaCommand {
             httpd.textarea.valid {
+              /oxserver.vname
+                [Oxserver_history_variable httpd.serial toString] cat
+              def
               ox.ccc 
-               [ httpd.com  ] cat
+               [ 
+                 httpd.com  
+                 (  /) oxserver.vname (  set )
+                 oxserver.vname ( )
+               ] cat
               oxexecutestring ;
             }{
               send-page-warning  exit