From: Fredrik Tolf <fredrik@dolda2000.com>
Date: Thu, 27 Dec 2012 07:15:26 +0000 (+0100)
Subject: Merge branch 'master' of git.dolda2000.com:/srv/git/r/ashd
X-Git-Tag: 0.12~22
X-Git-Url: http://www.dolda2000.com/gitweb/?p=ashd.git;a=commitdiff_plain;h=4e8fb5cddb8dc1620ac9d1b46cce54ad6f717716;hp=-c

Merge branch 'master' of git.dolda2000.com:/srv/git/r/ashd
---

4e8fb5cddb8dc1620ac9d1b46cce54ad6f717716
diff --combined src/htparser.c
index 766d2f5,5dfed8b..e6f545a
--- a/src/htparser.c
+++ b/src/htparser.c
@@@ -319,7 -319,8 +319,8 @@@ void serve(FILE *in, struct conn *conn
  		if(recvchunks(in, out))
  		    break;
  	    } else {
- 		break;
+ 		/* Ignore rather than abort, to be kinder to broken clients. */
+ 		headrmheader(req, "content-type");
  	    }
  	}
  	if(fflush(out))
@@@ -425,8 -426,8 +426,8 @@@ static void initroot(void *uu
  {
      int fd;
      
 +    setsid();
      if(daemonize) {
 -	setsid();
  	chdir("/");
  	if((fd = open("/dev/null", O_RDWR)) >= 0) {
  	    dup2(fd, 0);