X-Git-Url: http://www.dolda2000.com/gitweb/?a=blobdiff_plain;f=src%2Fhtparser.c;h=4086f7926eacc01fc17c15c5d4c3cf757ef751f0;hb=9e70ef793ddcf51edc0f6489eb6f70762380afc0;hp=1ed91754f78f36d62c6de672fb7c1a06a9a3fff8;hpb=90b0ba0f9d93e454cc08a566b718abdcbfd0d9f6;p=ashd.git

diff --git a/src/htparser.c b/src/htparser.c
index 1ed9175..4086f79 100644
--- a/src/htparser.c
+++ b/src/htparser.c
@@ -127,66 +127,6 @@ out:
     return(req);
 }
 
-static struct hthead *parseresp(FILE *in)
-{
-    struct hthead *req;
-    int code;
-    struct charbuf ver, msg;
-    int c;
-    
-    req = NULL;
-    bufinit(ver);
-    bufinit(msg);
-    code = 0;
-    while(1) {
-	c = getc(in);
-	if(c == ' ') {
-	    break;
-	} else if((c == EOF) || (c < 32) || (c >= 128)) {
-	    goto fail;
-	} else {
-	    bufadd(ver, c);
-	}
-    }
-    while(1) {
-	c = getc(in);
-	if(c == ' ') {
-	    break;
-	} else if((c == EOF) || (c < '0') || (c > '9')) {
-	    goto fail;
-	} else {
-	    code = (code * 10) + (c - '0');
-	}
-    }
-    while(1) {
-	c = getc(in);
-	if(c == 10) {
-	    break;
-	} else if(c == 13) {
-	} else if((c == EOF) || (c < 32)) {
-	    goto fail;
-	} else {
-	    bufadd(msg, c);
-	}
-    }
-    bufadd(msg, 0);
-    bufadd(ver, 0);
-    req = mkresp(code, msg.b, ver.b);
-    if(parseheaders(req, in))
-	goto fail;
-    goto out;
-    
-fail:
-    if(req != NULL) {
-	freehthead(req);
-	req = NULL;
-    }
-out:
-    buffree(msg);
-    buffree(ver);
-    return(req);
-}
-
 static off_t passdata(FILE *in, FILE *out, off_t max)
 {
     size_t read;
@@ -234,24 +174,74 @@ static int hasheader(struct hthead *head, char *name, char *val)
     return(!strcasecmp(hd, val));
 }
 
+static int canonreq(struct hthead *req)
+{
+    char *p, *p2, *r;
+    int n;
+
+    if(req->url[0] == '/') {
+	replrest(req, req->url + 1);
+	if((p = strchr(req->rest, '?')) != NULL)
+	    *p = 0;
+	return(1);
+    }
+    if((p = strstr(req->url, "://")) != NULL) {
+	n = p - req->url;
+	if(((n == 4) && !strncasecmp(req->url, "http", 4)) ||
+	   ((n == 5) && !strncasecmp(req->url, "https", 5))) {
+	    if(getheader(req, "host"))
+		return(0);
+	    p += 3;
+	    if((p2 = strchr(p, '/')) == NULL) {
+		headappheader(req, "Host", p);
+		free(req->url);
+		req->url = sstrdup("/");
+	    } else {
+		r = sstrdup(p2);
+		*(p2++) = 0;
+		headappheader(req, "Host", p);
+		free(req->url);
+		req->url = r;
+	    }
+	    replrest(req, req->url + 1);
+	    if((p = strchr(req->rest, '?')) != NULL)
+		*p = 0;
+	    return(1);
+	}
+    }
+    return(0);
+}
+
+static int http10keep(struct hthead *req, struct hthead *resp)
+{
+    int fc;
+    
+    fc = hasheader(resp, "connection", "close");
+    headrmheader(resp, "connection");
+    if(!fc && hasheader(req, "connection", "keep-alive")) {
+	headappheader(resp, "Connection", "Keep-Alive");
+	return(1);
+    } else {
+	return(0);
+    }
+}
+
 void serve(FILE *in, struct conn *conn)
 {
     int pfds[2];
     FILE *out;
     struct hthead *req, *resp;
-    char *hd, *p;
+    char *hd;
     off_t dlen;
+    int keep;
     
     out = NULL;
     req = resp = NULL;
     while(1) {
 	if((req = parsereq(in)) == NULL)
 	    break;
-	replrest(req, req->url);
-	if(req->rest[0] == '/')
-	    replrest(req, req->rest + 1);
-	if((p = strchr(req->rest, '?')) != NULL)
-	    *p = 0;
+	if(!canonreq(req))
+	    break;
 	
 	if((conn->initreq != NULL) && conn->initreq(conn, req))
 	    break;
@@ -277,7 +267,7 @@ void serve(FILE *in, struct conn *conn)
 	/* Make sure to send EOF */
 	shutdown(pfds[1], SHUT_WR);
 	
-	if((resp = parseresp(out)) == NULL)
+	if((resp = parseresponse(out)) == NULL)
 	    break;
 	replstr(&resp->ver, req->ver);
 	
@@ -285,22 +275,25 @@ void serve(FILE *in, struct conn *conn)
 	    headappheader(resp, "Server", sprintf3("ashd/%s", VERSION));
 
 	if(!strcmp(req->ver, "HTTP/1.0")) {
-	    writeresp(in, resp);
-	    fprintf(in, "\r\n");
 	    if(!strcasecmp(req->method, "head")) {
-		if(!hasheader(req, "connection", "keep-alive"))
-		    break;
+		keep = http10keep(req, resp);
+		writeresp(in, resp);
+		fprintf(in, "\r\n");
 	    } else if((hd = getheader(resp, "content-length")) != NULL) {
+		keep = http10keep(req, resp);
 		dlen = atoo(hd);
+		writeresp(in, resp);
+		fprintf(in, "\r\n");
 		if(passdata(out, in, dlen) != dlen)
 		    break;
-		if(!hasheader(req, "connection", "keep-alive"))
-		    break;
 	    } else {
+		headrmheader(resp, "connection");
+		writeresp(in, resp);
+		fprintf(in, "\r\n");
 		passdata(out, in, -1);
 		break;
 	    }
-	    if(hasheader(req, "connection", "close") || hasheader(resp, "connection", "close"))
+	    if(!keep)
 		break;
 	} else if(!strcmp(req->ver, "HTTP/1.1")) {
 	    if(!strcasecmp(req->method, "head")) {