* USE OR PERFORMANCE OF THIS SOFTWARE.
*
* $Log: wcgi.c,v $
- * Revision 1.8 1995/11/08 16:14:35 adam
+ * Revision 1.14 1996/01/12 13:08:06 adam
+ * CGI script passes name of lock file to the shell. The server will not close
+ * the response FIFO until this file becomes unlocked. This method handles
+ * cancel operations much better.
+ *
+ * Revision 1.13 1996/01/12 10:05:17 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.12 1996/01/09 10:46:49 adam
+ * New defines: LOGDIR/EGWDIR/CGIDIR set in Makefile.
+ *
+ * Revision 1.11 1996/01/08 08:42:19 adam
+ * Handles method GET.
+ *
+ * Revision 1.10 1996/01/05 16:21:20 adam
+ * Bug fix: shell (wproto) sometimes closed server FIFO before cgi
+ * program opened it - solution: cgi sends OK when response has been read.
+ *
+ * Revision 1.9 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.
+ *
+ * Revision 1.8 1995/11/08 16:14:35 adam
* Many improvements and bug fixes.
* First version that ran on dtbsun.
*
#include <gw-db.h>
#include "wproto.h"
-#define CGIDIR "/usr/local/etc/httpd/cgi-bin"
-
static char *prog = "cgi";
static char serverp[256] = {'\0'};
+static char serverf[256] = {'\0'};
static GW_DB gw_db = NULL;
static void fatal(char *p)
if (gw_db)
gw_db_close (gw_db);
if (*serverp)
- unlink(serverp);
+ unlink (serverp);
+ if (*serverf)
+ unlink (serverf);
exit(0);
}
}
}
+#if 0
+static void print_environ (void)
+{
+ extern char **environ;
+ int i;
+
+ for (i = 0; environ[i]; i++)
+ gw_log (GW_LOG_DEBUG, prog, "e: %s", environ[i]);
+}
+#endif
+
/*
* NOTE: In the (perhaps odd) terminology used within this software,
* the 'server' is the present program, which is executed by the httpd
{
char clientp[256], tmp[256], *path_info, *p, *operation, *t;
char combuf[COMBUF];
+ int serverf_fd = -1;
int linein = -1, lineout, data, gw_id;
chdir ("/usr/local/etc/httpd/cgi-bin");
gw_log_init ("egw");
- gw_log_file (GW_LOG_ALL, "/usr/local/etc/httpd/logs/egwcgi_log");
+ gw_log_file (GW_LOG_ALL, LOGDIR "/egwcgi_log");
gw_log_level (GW_LOG_ALL);
+ gw_log_session (getpid());
gw_log (GW_LOG_STAT, prog, "Europagate www cgi server");
sprintf(tmp, "%s/%s", FIFOROOT, FIFODIR);
gw_log (GW_LOG_FATAL, prog, "Must set PATH_INFO.");
fatal("Internal error in server.");
}
+ sprintf (serverf, "%s/srf%d", tmp, getpid ());
+ gw_log (GW_LOG_DEBUG, prog, "open w %s", serverf);
+ serverf_fd = open (serverf, O_WRONLY|O_CREAT|O_TRUNC, 0666);
+ if (serverf_fd == -1)
+ {
+ gw_log (GW_LOG_FATAL|GW_LOG_ERRNO, prog, "open (%s)", serverf);
+ fatal("Internal error in server.");
+ }
+ else
+ {
+ struct flock area;
+ area.l_type = F_WRLCK;
+ area.l_whence = SEEK_SET;
+ area.l_start = 0L;
+ area.l_len = 0L;
+ fcntl (serverf_fd, F_SETLK, &area);
+ }
operation = ++path_info;
while (*path_info && *path_info != '/')
path_info++;
if (*path_info)
*(path_info++) = '\0';
- if (!(gw_db = gw_db_open ("user.db", 1)))
+ gw_log (GW_LOG_DEBUG, prog, "www.db open");
+ if (!(gw_db = gw_db_open (EGWDIR "/www.db", 1, 1)))
{
gw_log (GW_LOG_FATAL, prog, "gw_db_open");
exit (1);
}
+ gw_log (GW_LOG_DEBUG, prog, "www.db ok");
if ((gw_id = atoi(operation)) <= 0)
{
int r;
gw_log (GW_LOG_DEBUG, prog, "Synchronizing with client");
if ((linein = open(serverp, O_RDONLY)) < 0)
{
- gw_log (GW_LOG_FATAL|GW_LOG_ERRNO, prog, "open %s", serverp);
+ gw_log (GW_LOG_FATAL|GW_LOG_ERRNO, prog, "open r %s", serverp);
fatal("Internal error in server.");
}
if (read(linein, combuf, 2) < 2 || strcmp(combuf, "OK"))
gw_log (GW_LOG_DEBUG, prog, "Synchronized");
}
sprintf(clientp, "%s/clt%d", tmp, gw_id);
- gw_log (GW_LOG_DEBUG, prog, "Opening %s", clientp);
+ gw_log (GW_LOG_DEBUG, prog, "open w %s", clientp);
if ((lineout = open(clientp, O_WRONLY)) < 0)
{
char gw_id_str[16];
gw_log (GW_LOG_FATAL, prog, "gw_db_lookup %s", gw_id_str);
fatal("Internal error in server");
}
- gw_log (GW_LOG_DEBUG|GW_LOG_ERRNO, prog, "open %s restart", clientp);
+ gw_log (GW_LOG_DEBUG|GW_LOG_ERRNO, prog, "open r %s restart", clientp);
spawn (sprog, gw_id);
gw_log (GW_LOG_DEBUG, prog, "Synchronizing with client");
if ((linein = open(serverp, O_RDONLY)) < 0)
gw_db_close (gw_db);
gw_log (GW_LOG_DEBUG, prog, "Decoding user data");
p = combuf + sizeof(data);
- strcpy(p, serverp);
- p += strlen(p) + 1;
- strcpy(p, path_info);
+ strcpy (p, serverp);
+ p += strlen (p) + 1;
+ strcpy (p, serverf);
+ p += strlen (p) + 1;
+ strcpy (p, path_info);
+ gw_log (GW_LOG_DEBUG, prog, "P:%s", p);
p += strlen(p) + 1;
*(p++) = '\0'; /* no envvars tranferred at present */
if ((t = getenv("CONTENT_LENGTH")) && (data = atoi(t)) > 0)
i += j;
}
}
- p += data;
- *(p++) = '\0';
+ else if ((t = getenv("QUERY_STRING")))
+ {
+ strcpy (p, t);
+ data = strlen(p);
+ }
+ p[data] = '\0';
+ gw_log (GW_LOG_DEBUG, prog, "C:%s", p);
+ p += data+1;
data = (p - combuf);
memcpy(combuf, &data, sizeof(data));
gw_log (GW_LOG_DEBUG, prog, "Writing data");
gw_log (GW_LOG_FATAL|GW_LOG_ERRNO, prog, "write");
fatal("Internal server error");
}
- if (linein < 0 && (linein = open(serverp, O_RDONLY)) < 0)
+ if (linein < 0)
{
- gw_log (GW_LOG_FATAL|GW_LOG_ERRNO, prog, "open %s", serverp);
- fatal("Internal error in server");
+ gw_log (GW_LOG_DEBUG, prog, "open r %s", serverp);
+ if ((linein = open(serverp, O_RDONLY)) < 0)
+ {
+ gw_log (GW_LOG_FATAL|GW_LOG_ERRNO, prog, "open %s", serverp);
+ fatal("Internal error in server");
+ }
}
gw_log (GW_LOG_DEBUG, prog, "Reading response");
-#if 1
while ((data = read(linein, combuf, COMBUF)) > 0)
{
gw_log (GW_LOG_DEBUG, prog, "Got %d bytes", data);
+ if (combuf[data-1] == '\0')
+ break;
if (write(1, combuf, data) < data)
{
gw_log (GW_LOG_FATAL|GW_LOG_ERRNO, prog, "write");
gw_log (GW_LOG_FATAL|GW_LOG_ERRNO, prog, "read");
exit (1);
}
-#else
-# if 1
- fcntl (linein, F_SETFL, O_NONBLOCK);
-# endif
- while (1)
+ if (data > 0)
{
- fd_set s_input;
- struct timeval t;
- int r, eof_flag = 0;
-
- t.tv_sec = 10;
- t.tv_usec = 0;
- FD_ZERO(&s_input);
- FD_SET(linein, &s_input);
-# if 0
- FD_SET(1, &s_input);
-# endif
- gw_log (GW_LOG_DEBUG, prog, "select");
- r = select (linein + 1, &s_input, NULL, NULL, &t);
- if (r < 0)
+ if (close (serverf_fd))
{
- gw_log (GW_LOG_ERRNO|GW_LOG_FATAL, prog, "select");
- exit(1);
+ gw_log (GW_LOG_FATAL|GW_LOG_ERRNO, prog, "close %s", serverf);
}
- if (r == 0 || FD_ISSET (linein, &s_input))
+ if (--data > 0)
{
- if (r == 0)
- gw_log (GW_LOG_DEBUG, prog, "poll");
- if ((data = read (linein, combuf, COMBUF)) > 0)
- {
- if (combuf[data-1] == '\0')
- {
- --data;
- eof_flag = 1;
- }
- gw_log (GW_LOG_DEBUG, prog, "Got %d bytes", data);
- if (data > 0 && write(1, combuf, data) < data)
- {
- gw_log (GW_LOG_FATAL|GW_LOG_ERRNO, prog, "write");
- exit (1);
- }
- }
- else if (data == -1)
+ if (write(1, combuf, data) < data)
{
- if (r > 0)
- {
- gw_log (GW_LOG_FATAL|GW_LOG_ERRNO, prog, "read");
- exit (1);
- }
- gw_log (GW_LOG_DEBUG, prog, "poll read");
+ gw_log (GW_LOG_FATAL|GW_LOG_ERRNO, prog, "write");
+ exit (1);
}
- else
- break;
- }
- if (eof_flag)
- break;
- if (r > 0 && FD_ISSET (1, &s_input))
- {
- data = read (1, combuf, COMBUF);
- if (data == -1)
- {
- gw_log (GW_LOG_DEBUG|GW_LOG_ERRNO, prog, "stdout closed");
- break;
- }
- if (data == 0)
- {
- gw_log (GW_LOG_DEBUG, prog, "stdout closed");
- break;
- }
- gw_log (GW_LOG_DEBUG, prog, "stdout got %d bytes", data);
}
}
-#endif
gw_log (GW_LOG_DEBUG, prog, "Cleaning up.");
+ unlink (serverf);
close(linein);
unlink(serverp);
close(lineout);
projects / egate.git / blobdiff