set the docroot to the current working directory if none is specified, fixes random...

[project/uhttpd.git] / client.c

diff --git a/client.c b/client.c
index b493e7f..3163afc 100644 (file)
--- a/client.c
+++ b/client.c
@@ -73,20 +73,51 @@ 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)
+{
+       struct client *cl = container_of(timeout, struct client, timeout);
+
+       cl->state = CLIENT_STATE_CLOSE;
+       uh_connection_close(cl);
+}
+
+static void uh_set_client_timeout(struct client *cl, int timeout)
+{
+       cl->timeout.cb = client_timeout;
+       uloop_timeout_set(&cl->timeout, timeout * 1000);
+}
+
+static void uh_keepalive_poll_cb(struct uloop_timeout *timeout)
+{
+       struct client *cl = container_of(timeout, struct client, timeout);
+       int sec = cl->requests > 0 ? conf.http_keepalive : conf.network_timeout;
+
+       uh_set_client_timeout(cl, sec);
+       cl->us->notify_read(cl->us, 0);
+}
+
+static void uh_poll_connection(struct client *cl)
+{
+       cl->timeout.cb = uh_keepalive_poll_cb;
+       uloop_timeout_set(&cl->timeout, 1);
 }
 
 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)
                return uh_connection_close(cl);
 
        cl->state = CLIENT_STATE_INIT;
-       uloop_timeout_set(&cl->timeout, conf.http_keepalive * 1000);
+       cl->requests++;
+       uh_poll_connection(cl);
 }
 
 void __printf(4, 5)
@@ -114,14 +145,6 @@ static void uh_header_error(struct client *cl, int code, const char *summary)
        uh_connection_close(cl);
 }
 
-static void client_timeout(struct uloop_timeout *timeout)
-{
-       struct client *cl = container_of(timeout, struct client, timeout);
-
-       cl->state = CLIENT_STATE_CLOSE;
-       uh_connection_close(cl);
-}
-
 static int find_idx(const char * const *list, int max, const char *str)
 {
        int i;
@@ -171,6 +194,9 @@ static bool client_init_cb(struct client *cl, char *buf, int len)
        if (!newline)
                return false;
 
+       if (newline == buf)
+               return true;
+
        *newline = 0;
        blob_buf_init(&cl->hdr, 0);
        cl->state = client_parse_request(cl, buf);
@@ -464,14 +490,14 @@ void uh_client_notify_state(struct client *cl)
 
 static void client_ustream_read_cb(struct ustream *s, int bytes)
 {
-       struct client *cl = container_of(s, struct client, sfd);
+       struct client *cl = container_of(s, struct client, sfd.stream);
 
        uh_client_read_cb(cl);
 }
 
 static void client_ustream_write_cb(struct ustream *s, int bytes)
 {
-       struct client *cl = container_of(s, struct client, sfd);
+       struct client *cl = container_of(s, struct client, sfd.stream);
 
        if (cl->dispatch.write_cb)
                cl->dispatch.write_cb(cl);
@@ -479,7 +505,7 @@ static void client_ustream_write_cb(struct ustream *s, int bytes)
 
 static void client_notify_state(struct ustream *s)
 {
-       struct client *cl = container_of(s, struct client, sfd);
+       struct client *cl = container_of(s, struct client, sfd.stream);
 
        uh_client_notify_state(cl);
 }
@@ -535,9 +561,7 @@ bool uh_accept_client(int fd, bool tls)
        cl->us->string_data = true;
        ustream_fd_init(&cl->sfd, sfd);
 
-       cl->timeout.cb = client_timeout;
-       uloop_timeout_set(&cl->timeout, conf.network_timeout * 1000);
-
+       uh_poll_connection(cl);
        list_add_tail(&cl->list, &clients);
 
        next_client = NULL;