X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;ds=sidebyside;f=www%2Fwproto.c;h=03b04d53c4057dfdd084c116b6bd6c2e38493ad9;hb=da4f027b1e7c0bf90efe6782a326448af164cd37;hp=4cba04c1038405a320a11e68894e6e5cd4e87f76;hpb=c47bf7a41dceb3ed05572f8d6a2b2370bf20e93b;p=egate.git

diff --git a/www/wproto.c b/www/wproto.c
index 4cba04c..03b04d5 100644
--- a/www/wproto.c
+++ b/www/wproto.c
@@ -41,7 +41,29 @@
  * USE OR PERFORMANCE OF THIS SOFTWARE.
  *
  * $Log: wproto.c,v $
- * Revision 1.12  1996/01/05 16:35:02  adam
+ * Revision 1.17  1996/01/26 09:02:22  adam
+ * Open of client FIFO called with O_NDELAY when reconnecting to shell
+ * in order to prevent serious lock if previous shell died without
+ * unlinking client FIFO.
+ *
+ * Revision 1.16  1996/01/24  10:13:56  adam
+ * Bug fix: in function wo_write realloc is used only when memory is already
+ * allocated with malloc.
+ *
+ * Revision 1.15  1996/01/24  08:25:32  adam
+ * Buf fix: Uninitialized outbuffer_offset member.
+ *
+ * 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].
+ *
+ * Revision 1.12  1996/01/05  16:35:02  adam
  * Minor changes.
  *
  * Revision 1.11  1996/01/05  16:21:21  adam
@@ -113,8 +135,14 @@ static char *mod = "wproto";
 void wo_write (WCLIENT wc, const char *s, size_t len)
 {
     if (wc->outbuffer_offset + len >= wc->outbuffer_size)
-    	wc->outbuffer = realloc(wc->outbuffer, wc->outbuffer_size +=
-	OUTBUFFER_CHUNK);
+    {
+	if (!wc->outbuffer)
+	    wc->outbuffer = malloc (wc->outbuffer_size += 
+	       ((len >= OUTBUFFER_CHUNK) ? len*2 : OUTBUFFER_CHUNK));
+	else
+    	    wc->outbuffer = realloc(wc->outbuffer, wc->outbuffer_size +=
+	       ((len >= OUTBUFFER_CHUNK) ? len*2 : OUTBUFFER_CHUNK));
+    }
     memcpy(wc->outbuffer + wc->outbuffer_offset, s, len);
     wc->outbuffer_offset += len;
 }
@@ -135,16 +163,11 @@ void wo_printf (WCLIENT wc, const char *fmt, ...)
     va_end(ap);
 }
 
-void wo_clear (WCLIENT wc, char *type)
+void wo_clear (WCLIENT wc, const char *type)
 {
-    if (!wc->outbuffer)
-    	wc->outbuffer = malloc(wc->outbuffer_size = OUTBUFFER_CHUNK);
     wc->outbuffer_offset = 0;
-#if 0
-    wo_printf(wc, "Expires: 0\nContent-type: %s\n\n", type);
-#else
-    wo_printf(wc, "Content-type: %s\n\n", type);
-#endif
+    if (type)
+        wo_printf(wc, "Content-type: %s\n\n", type);
 }
 
 int wo_puthtml (WCLIENT wc, char *name)
@@ -217,19 +240,24 @@ int wo_overflow(WCLIENT wc, char ch)
 
 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)
@@ -340,7 +368,6 @@ int wproto_process(WCLIENT wc, int timeout)
             unlink (wc->wf_serverp);
 	    return 0;
 	}
-        /* determine handle (fifo or user) */
 	if (read(wc->linein, &toread, sizeof(toread)) < sizeof(toread))
 	{
 	    gw_log (GW_LOG_FATAL|GW_LOG_ERRNO, mod, "wp_proc:len read failed");
@@ -355,6 +382,8 @@ int wproto_process(WCLIENT wc, int timeout)
 	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 */
@@ -433,6 +462,8 @@ WCLIENT wproto_init(void)
     	exit(1);
     }
     new->outbuffer = 0;
+    new->outbuffer_size = 0;
+    new->outbuffer_offset = 0;
     new->cache_level = -1;
     new->cache_fd = -1;
     return new;