relay: do forward data if the http request type was HEAD

[project/uhttpd.git] / client.c

diff --git a/client.c b/client.c
index e1fdca4..3a6b09e 100644 (file)
--- a/client.c
+++ b/client.c
@@ -24,6 +24,7 @@
 #include "tls.h"
 
 static LIST_HEAD(clients);
+static bool client_done = false;
 
 int n_clients = 0;
 struct config conf = {};
@@ -73,6 +74,8 @@ static void uh_dispatch_done(struct client *cl)
 {
        if (cl->dispatch.free)
                cl->dispatch.free(cl);
+       if (cl->dispatch.req_free)
+               cl->dispatch.req_free(cl);
 }
 
 static void client_timeout(struct uloop_timeout *timeout)
@@ -108,7 +111,6 @@ void uh_request_done(struct client *cl)
 {
        uh_chunk_eof(cl);
        uh_dispatch_done(cl);
-       cl->us->notify_write = NULL;
        memset(&cl->dispatch, 0, sizeof(cl->dispatch));
 
        if (!conf.http_keepalive || cl->request.connection_close)
@@ -179,7 +181,8 @@ static int client_parse_request(struct client *cl, char *data)
 
        req->method = h_method;
        req->version = h_version;
-       if (req->version < UH_HTTP_VER_1_1 || !conf.http_keepalive)
+       if (req->version < UH_HTTP_VER_1_1 || req->method == UH_HTTP_MSG_POST ||
+           !conf.http_keepalive)
                req->connection_close = true;
 
        return CLIENT_STATE_HEADER;
@@ -193,8 +196,10 @@ static bool client_init_cb(struct client *cl, char *buf, int len)
        if (!newline)
                return false;
 
-       if (newline == buf)
+       if (newline == buf) {
+               ustream_consume(cl->us, 2);
                return true;
+       }
 
        *newline = 0;
        blob_buf_init(&cl->hdr, 0);
@@ -289,8 +294,6 @@ static void client_parse_header(struct client *cl, char *data)
        } else if (!strcmp(data, "connection")) {
                if (!strcasecmp(val, "close"))
                        r->connection_close = true;
-               else if (!strcasecmp(val, "keep-alive"))
-                       r->connection_close = false;
        } else if (!strcmp(data, "user-agent")) {
                char *str;
 
@@ -310,10 +313,11 @@ static void client_parse_header(struct client *cl, char *data)
                                        break;
                                }
                        }
-               } else if (strstr(val, "Safari/") && strstr(val, "Mac OS X"))
-                       r->ua = UH_UA_SAFARI;
+               }
                else if (strstr(val, "Chrome/"))
                        r->ua = UH_UA_CHROME;
+               else if (strstr(val, "Safari/") && strstr(val, "Mac OS X"))
+                       r->ua = UH_UA_SAFARI;
                else if (strstr(val, "Gecko/"))
                        r->ua = UH_UA_GECKO;
                else if (strstr(val, "Konqueror"))
@@ -439,6 +443,7 @@ void uh_client_read_cb(struct client *cl)
        char *str;
        int len;
 
+       client_done = false;
        do {
                str = ustream_get_read_buf(us, &len);
                if (!str || !len)
@@ -453,11 +458,17 @@ void uh_client_read_cb(struct client *cl)
                                uh_header_error(cl, 413, "Request Entity Too Large");
                        break;
                }
-       } while(1);
+       } while (!client_done);
 }
 
 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);
        uloop_timeout_cancel(&cl->timeout);
@@ -476,7 +487,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;
 
@@ -566,6 +577,7 @@ bool uh_accept_client(int fd, bool tls)
        next_client = NULL;
        n_clients++;
        cl->id = client_id++;
+       cl->tls = tls;
 
        return true;
 }