X-Git-Url: http://www.dolda2000.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=lib%2Freq.c;h=da8e3f0d8ffb463082a314762f4e1635bc2bc809;hb=90b0ba0f9d93e454cc08a566b718abdcbfd0d9f6;hp=4cde483783871a2d1e0a785274fd203e62411375;hpb=1604c0967129b4b348f3c6150f5a2c87f780e404;p=ashd.git

diff --git a/lib/req.c b/lib/req.c
index 4cde483..da8e3f0 100644
--- a/lib/req.c
+++ b/lib/req.c
@@ -23,6 +23,7 @@
 #include <errno.h>
 #include <ctype.h>
 #include <stdio.h>
+#include <fcntl.h>
 
 #ifdef HAVE_CONFIG_H
 #include <config.h>
@@ -97,19 +98,24 @@ static void trim(struct charbuf *buf)
     
     for(p = buf->b; (p - buf->b < buf->d) && isspace(*p); p++);
     memmove(buf->b, p, buf->d -= (p - buf->b));
-    for(p = buf->b + buf->d - 1; (p > buf->b) && isspace(*p); p--, buf->d--);
+    if(buf->d > 0)
+	for(p = buf->b + buf->d - 1; (p > buf->b) && isspace(*p); p--, buf->d--);
 }
 
 int parseheaders(struct hthead *head, FILE *in)
 {
     int c, state;
     struct charbuf name, val;
+    size_t tsz;
     
     bufinit(name);
     bufinit(val);
     state = 0;
+    tsz = 0;
     while(1) {
 	c = fgetc(in);
+	if(++tsz >= 65536)
+	    goto fail;
     again:
 	if(state == 0) {
 	    if(c == '\r') {
@@ -190,6 +196,21 @@ void headappheader(struct hthead *head, const char *name, const char *val)
     head->headers[i][1] = sstrdup(val);
 }
 
+void headrmheader(struct hthead *head, const char *name)
+{
+    int i;
+    
+    for(i = 0; i < head->noheaders; i++) {
+	if(!strcasecmp(head->headers[i][0], name)) {
+	    free(head->headers[i][0]);
+	    free(head->headers[i][1]);
+	    free(head->headers[i]);
+	    memmove(head->headers + i, head->headers + i + 1, sizeof(head->headers) * (--head->noheaders - i));
+	    return;
+	}
+    }
+}
+
 int writeresp(FILE *out, struct hthead *resp)
 {
     int i;
@@ -238,6 +259,7 @@ int recvreq(int sock, struct hthead **reqp)
     if((fd = recvfd(sock, &buf.b, &buf.d)) < 0) {
 	return(-1);
     }
+    fcntl(fd, F_SETFD, FD_CLOEXEC);
     buf.s = buf.d;
     p = buf.b;
     l = buf.d;