Bug fix: missing argument to gw_log-call.

[egate.git] / www / wsh.c

diff --git a/www/wsh.c b/www/wsh.c
index f15ae87..b08bb69 100644 (file)
--- a/www/wsh.c
+++ b/www/wsh.c
@@ -41,7 +41,15 @@
  * USE OR PERFORMANCE OF THIS SOFTWARE.
  *
  * $Log: wsh.c,v $
- * Revision 1.8  1995/12/20 16:31:33  adam
+ * Revision 1.10  1996/01/12 10:05:22  adam
+ * If script name ends with ';' HTTP/GET/Expires will be defined.
+ * The cgi interface only reads final handshake if response from
+ * server (shell) was zero-terminated [If it isn't it probably died].
+ *
+ * Revision 1.9  1996/01/09  10:46:51  adam
+ * New defines: LOGDIR/EGWDIR/CGIDIR set in Makefile.
+ *
+ * Revision 1.8  1995/12/20  16:31:33  adam
  * Bug fix: shell might terminate even though new request was initiated
  * by the cgi interface program.
  * Work on more simple user interface and Europagate buttons.
@@ -97,9 +105,9 @@ int main (int argc, char **argv)
     W_Interp w_interp;
     GW_DB gw_db;
 
-    chdir("/usr/local/etc/httpd/cgi-bin");
+    chdir (EGWDIR);
     gw_log_init (*argv);
-    gw_log_file (GW_LOG_ALL, "/usr/local/etc/httpd/logs/egwsh_log");
+    gw_log_file (GW_LOG_ALL, LOGDIR "/egwsh_log");
     gw_log_level (GW_LOG_ALL);
     gw_log (GW_LOG_STAT, mod, "Europagate www shell: %s", *argv);
     
@@ -139,7 +147,7 @@ int main (int argc, char **argv)
             continue;
         }
         timeout = TIMEOUT;
-       wo_clear (wcl, "text/html");
+       wo_clear (wcl, NULL);
        strcpy (parms_buf, wcl->wf_parms);
        script = parms = parms_buf;
        while (*parms && *parms != '/')
@@ -148,8 +156,8 @@ int main (int argc, char **argv)
            *parms++ = '\0';
         if (*script)
         {
-            p = script + strlen(script) - 1;
-            while (*p && p != script)
+            p = script + strlen(script);
+            while (*--p && p != script)
                 switch (*p)
                 {
                 case '+':
@@ -168,10 +176,14 @@ int main (int argc, char **argv)
                         wproto_cache (wcl, atoi(p+1));
                     *p = '\0';
                     break;
-                default:
-                    --p;
+               case ';':
+                    wo_printf (wcl, "Expires: %s\n", p[1] ? p+1 : "0");
+                   gw_log (GW_LOG_DEBUG, mod, "Expires: %s", p[1] ?p+1:"0");
+                   *p = '\0';
+                    break;
                 }
         }
+        wo_printf (wcl, "Content-type: text/html\n\n");
         for (p = parms; *p; p++)
             if (*p == '+')
                 *p = ' ';