* USE OR PERFORMANCE OF THIS SOFTWARE.
*
* $Log: wproto.c,v $
- * Revision 1.13 1996/01/12 10:05:20 adam
+ * Revision 1.14 1996/01/12 13:08:07 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:20 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].
int wo_finish(WCLIENT wc)
{
- char buf[4];
+ int fd;
gw_log (GW_LOG_DEBUG, mod, "wo_finish");
wo_putc (wc, 0);
if (wo_flush(wc) < 0)
return -1;
-#if 1
- gw_log (GW_LOG_DEBUG, mod, "reading ack");
- if (read(wc->linein, buf, 2) != 2)
+
+ fd = open (wc->wf_serverf, O_RDONLY);
+ if (fd != -1)
{
- gw_log (GW_LOG_DEBUG, mod, "read ack");
+ struct flock area;
+ area.l_type = F_RDLCK;
+ area.l_whence = SEEK_SET;
+ area.l_start = 0L;
+ area.l_len = 0L;
+ fcntl (fd, F_SETLKW, &area);
+ close (fd);
}
-#endif
close(wc->lineout);
wc->lineout = -1;
if (wc->cache_fd >= 0)
p = combuf;
for (t = wc->wf_serverp; (*t = *p); t++, p++);
p++;
+ for (t = wc->wf_serverf; (*t = *p); t++, p++);
+ p++;
for (t = wc->wf_parms; (*t = *p); t++, p++);
p++;
p++; /* we don't deal with envvars yet */