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 173285a..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 = {};
@@ -442,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)
@@ -456,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);
@@ -479,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;