mimetypes: add json and jsonp (distinct from js)

[project/uhttpd.git] / client.c

diff --git a/client.c b/client.c
index 384f8d4..0d7029b 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 = {};
@@ -38,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)
@@ -46,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 = "";
 
@@ -73,6 +77,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)
@@ -92,24 +98,30 @@ static void uh_set_client_timeout(struct client *cl, int timeout)
 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, conf.http_keepalive);
+       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;
-       cl->timeout.cb = uh_keepalive_poll_cb;
-       uloop_timeout_set(&cl->timeout, 1);
+       cl->requests++;
+       uh_poll_connection(cl);
 }
 
 void __printf(4, 5)
@@ -172,7 +184,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;
@@ -186,6 +199,11 @@ static bool client_init_cb(struct client *cl, char *buf, int len)
        if (!newline)
                return false;
 
+       if (newline == buf) {
+               ustream_consume(cl->us, 2);
+               return true;
+       }
+
        *newline = 0;
        blob_buf_init(&cl->hdr, 0);
        cl->state = client_parse_request(cl, buf);
@@ -279,8 +297,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;
 
@@ -300,10 +316,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"))
@@ -429,6 +446,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)
@@ -443,11 +461,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);
@@ -466,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;
 
@@ -479,14 +503,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);
@@ -494,7 +518,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);
 }
@@ -550,12 +574,13 @@ bool uh_accept_client(int fd, bool tls)
        cl->us->string_data = true;
        ustream_fd_init(&cl->sfd, sfd);
 
-       uh_set_client_timeout(cl, conf.network_timeout);
+       uh_poll_connection(cl);
        list_add_tail(&cl->list, &clients);
 
        next_client = NULL;
        n_clients++;
        cl->id = client_id++;
+       cl->tls = tls;
 
        return true;
 }