X-Git-Url: http://www.dolda2000.com/gitweb/?a=blobdiff_plain;f=src%2Fhtparser.c;h=d1b0a1ce78f2445847e234bfe2b66eaec9572aab;hb=5226f7c50ec6ef6a2da9ca8e04d1afca2725e259;hp=483554924a63a8ccdf2453bf9987a4f6a301a0e6;hpb=6ca53b2e5e3b76345fd709a3e9d32aee69889054;p=ashd.git

diff --git a/src/htparser.c b/src/htparser.c
index 4835549..d1b0a1c 100644
--- a/src/htparser.c
+++ b/src/htparser.c
@@ -22,6 +22,7 @@
 #include <string.h>
 #include <sys/socket.h>
 #include <pwd.h>
+#include <sys/signal.h>
 #include <errno.h>
 
 #ifdef HAVE_CONFIG_H
@@ -37,6 +38,7 @@
 #include "htparser.h"
 
 static int plex;
+static char *pidfile = NULL;
 
 static void trimx(struct hthead *req)
 {
@@ -270,13 +272,19 @@ void serve(FILE *in, struct conn *conn)
 	if((resp = parseresp(out)) == NULL)
 	    break;
 	replstr(&resp->ver, req->ver);
+	
+	if(!getheader(resp, "server"))
+	    headappheader(resp, "Server", sprintf3("ashd/%s", VERSION));
 
 	if(!strcmp(req->ver, "HTTP/1.0")) {
 	    writeresp(in, resp);
 	    fprintf(in, "\r\n");
-	    if((hd = getheader(resp, "content-length")) != NULL) {
-		dlen = passdata(out, in, -1);
-		if(dlen != atoo(hd))
+	    if(!strcasecmp(req->method, "head")) {
+		if(!hasheader(req, "connection", "keep-alive"))
+		    break;
+	    } else if((hd = getheader(resp, "content-length")) != NULL) {
+		dlen = atoo(hd);
+		if(passdata(out, in, dlen) != dlen)
 		    break;
 		if(!hasheader(req, "connection", "keep-alive"))
 		    break;
@@ -287,11 +295,14 @@ void serve(FILE *in, struct conn *conn)
 	    if(hasheader(req, "connection", "close") || hasheader(resp, "connection", "close"))
 		break;
 	} else if(!strcmp(req->ver, "HTTP/1.1")) {
-	    if((hd = getheader(resp, "content-length")) != NULL) {
+	    if(!strcasecmp(req->method, "head")) {
+		writeresp(in, resp);
+		fprintf(in, "\r\n");
+	    } else if((hd = getheader(resp, "content-length")) != NULL) {
 		writeresp(in, resp);
 		fprintf(in, "\r\n");
-		dlen = passdata(out, in, -1);
-		if(dlen != atoo(hd))
+		dlen = atoo(hd);
+		if(passdata(out, in, dlen) != dlen)
 		    break;
 	    } else if(!getheader(resp, "transfer-encoding")) {
 		headappheader(resp, "Transfer-Encoding", "chunked");
@@ -351,7 +362,7 @@ static void plexwatch(struct muth *muth, va_list args)
 
 static void usage(FILE *out)
 {
-    fprintf(out, "usage: htparser [-hSf] [-u USER] [-r ROOT] PORTSPEC... -- ROOT [ARGS...]\n");
+    fprintf(out, "usage: htparser [-hSf] [-u USER] [-r ROOT] [-p PIDFILE] PORTSPEC... -- ROOT [ARGS...]\n");
     fprintf(out, "\twhere PORTSPEC is HANDLER[:PAR[=VAL][(,PAR[=VAL])...]] (try HANDLER:help)\n");
     fprintf(out, "\tavailable handlers are `plain' and `ssl'.\n");
 }
@@ -407,12 +418,13 @@ int main(int argc, char **argv)
     int i, s1;
     int daemonize, logsys;
     char *root;
+    FILE *pidout;
     struct passwd *pwent;
     
     daemonize = logsys = 0;
     root = NULL;
     pwent = NULL;
-    while((c = getopt(argc, argv, "+hSfu:r:")) >= 0) {
+    while((c = getopt(argc, argv, "+hSfu:r:p:")) >= 0) {
 	switch(c) {
 	case 'h':
 	    usage(stdout);
@@ -432,6 +444,9 @@ int main(int argc, char **argv)
 	case 'r':
 	    root = optarg;
 	    break;
+	case 'p':
+	    pidfile = optarg;
+	    break;
 	default:
 	    usage(stderr);
 	    exit(1);
@@ -448,11 +463,18 @@ int main(int argc, char **argv)
 	usage(stderr);
 	exit(1);
     }
-    if((plex = stdmkchild(argv + ++i)) < 0) {
+    if((plex = stdmkchild(argv + ++i, NULL, NULL)) < 0) {
 	flog(LOG_ERR, "could not spawn root multiplexer: %s", strerror(errno));
 	return(1);
     }
     mustart(plexwatch, plex);
+    pidout = NULL;
+    if(pidfile != NULL) {
+	if((pidout = fopen(pidfile, "w")) == NULL) {
+	    flog(LOG_ERR, "could not open %s for writing: %s", pidfile, strerror(errno));
+	    return(1);
+	}
+    }
     if(logsys)
 	opensyslog();
     if(root) {
@@ -471,9 +493,14 @@ int main(int argc, char **argv)
 	    exit(1);
 	}
     }
+    signal(SIGPIPE, SIG_IGN);
     if(daemonize) {
 	daemon(0, 0);
     }
+    if(pidout != NULL) {
+	fprintf(pidout, "%i\n", getpid());
+	fclose(pidout);
+    }
     ioloop();
     return(0);
 }