diff -r adb0bda54e6b -r a2c8fc23c90e src/server/daemon/protocol.c
--- a/src/server/daemon/protocol.c	Thu Feb 16 15:08:38 2012 +0100
+++ b/src/server/daemon/protocol.c	Wed Feb 22 23:20:39 2012 +0100
@@ -234,6 +234,9 @@
     sbuf_write(out, status_code_str, sc_len);
     
     char *scmsg = pblock_findkeyval(pb_key_status, rq->srvhdrs);
+    if(scmsg == NULL) {
+        scmsg = "OK";
+    }
     sbuf_write(out, scmsg, strlen(scmsg));
 
     sbuf_write(out, "\r\n", 2);
@@ -276,6 +279,10 @@
 int http_start_response(Session *sn, Request *rq) {
     int fd = ((SystemIOStream*)sn->csd)->fd;
 
+    if(rq->status_num == -1) {
+        protocol_status(sn, rq, 200, "OK");
+    }
+
     /* set socket blocking */
     int flags;
     flags = fcntl(fd, F_GETFL, 0);