Add Connection and Content-length headers to raw HTTP responses

2 files changed, 12 insertions, 1 deletions

diff --git a/src/c/http.c b/src/c/http.c
index 48a042dc..ba9214c5 100644
--- a/src/c/http.c
+++ b/src/c/http.c
@@ -204,7 +204,14 @@ static void *worker(void *data) {
                         on_success, on_failure,
                         NULL, log_error, log_debug,
                         sock, uw_really_send, close);
-        if (rr != KEEP_OPEN) uw_send(ctx, sock);
+        if (rr != KEEP_OPEN) {
+          char clen[100];
+
+          uw_write_header(ctx, "Connection: close\r\n");
+          sprintf(clen, "Content-length: %d\r\n", uw_pagelen(ctx));
+          uw_write_header(ctx, clen);
+          uw_send(ctx, sock);
+        }
 
         if (rr == SERVED || rr == FAILED)
           close(sock);
diff --git a/src/c/urweb.c b/src/c/urweb.c
index 447733be..82bbf39f 100644
--- a/src/c/urweb.c
+++ b/src/c/urweb.c
@@ -1282,6 +1282,10 @@ void uw_memstats(uw_context ctx) {
   printf("Heap: %lu/%lu\n", (unsigned long)uw_buffer_used(&ctx->heap), (unsigned long)uw_buffer_avail(&ctx->heap));
 }
 
+int uw_pagelen(uw_context ctx) {
+  return ctx->page.front - ctx->page.start;
+}
+
 int uw_send(uw_context ctx, int sock) {
   int n = uw_really_send(sock, ctx->outHeaders.start, ctx->outHeaders.front - ctx->outHeaders.start);