utils: do not emit eof chunk for 204/304 responses

[project/uhttpd.git] / client.c

diff --git a/client.c b/client.c
index 3185b8f..0d7029b 100644 (file)
--- a/client.c
+++ b/client.c
@@ -39,6 +39,7 @@ const char * const http_methods[] = {
        [UH_HTTP_MSG_GET] = "GET",
        [UH_HTTP_MSG_POST] = "POST",
        [UH_HTTP_MSG_HEAD] = "HEAD",
+       [UH_HTTP_MSG_OPTIONS] = "OPTIONS",
 };
 
 void uh_http_header(struct client *cl, int code, const char *summary)
@@ -47,6 +48,8 @@ void uh_http_header(struct client *cl, int code, const char *summary)
        const char *enc = "Transfer-Encoding: chunked\r\n";
        const char *conn;
 
+       cl->http_code = code;
+
        if (!uh_use_chunked(cl))
                enc = "";
 
@@ -463,6 +466,11 @@ void uh_client_read_cb(struct client *cl)
 
 static void client_close(struct client *cl)
 {
+       if (cl->refcount) {
+               cl->state = CLIENT_STATE_CLEANUP;
+               return;
+       }
+
        client_done = true;
        n_clients--;
        uh_dispatch_done(cl);
@@ -482,7 +490,7 @@ void uh_client_notify_state(struct client *cl)
 {
        struct ustream *s = cl->us;
 
-       if (!s->write_error) {
+       if (!s->write_error && cl->state != CLIENT_STATE_CLEANUP) {
                if (cl->state == CLIENT_STATE_DATA)
                        return;