fix resuming accept() calls after exceeding client limit

[project/uhttpd.git] / client.c

diff --git a/client.c b/client.c
index b673153..dd3f912 100644 (file)
--- a/client.c
+++ b/client.c
@@ -142,9 +142,9 @@ static int client_parse_request(struct client *cl, char *data)
        if (!type || !path || !version)
                return CLIENT_STATE_DONE;
 
-       memset(&cl->request, 0, sizeof(cl->request));
-       req->url = path;
+       blobmsg_add_string(&cl->hdr, "URL", path);
 
+       memset(&cl->request, 0, sizeof(cl->request));
        h_method = find_idx(http_methods, ARRAY_SIZE(http_methods), type);
        h_version = find_idx(http_versions, ARRAY_SIZE(http_versions), version);
        if (h_method < 0 || h_version < 0) {
@@ -168,9 +168,8 @@ static bool client_init_cb(struct client *cl, char *buf, int len)
 
        *newline = 0;
        blob_buf_init(&cl->hdr, 0);
-       blobmsg_add_string(&cl->hdr, "REQUEST", buf);
+       cl->state = client_parse_request(cl, buf);
        ustream_consume(cl->us, newline + 2 - buf);
-       cl->state = client_parse_request(cl, (char *) blobmsg_data(blob_data(cl->hdr.head)));
        if (cl->state == CLIENT_STATE_DONE)
                uh_header_error(cl, 400, "Bad Request");
 
@@ -250,56 +249,85 @@ static void client_parse_header(struct client *cl, char *data)
        cl->state = CLIENT_STATE_HEADER;
 }
 
-static bool client_data_cb(struct client *cl, char *buf, int len)
+void client_poll_post_data(struct client *cl)
 {
        struct dispatch *d = &cl->dispatch;
        struct http_request *r = &cl->request;
-       int consumed = 0;
-       int cur_len = 0;
+       char *buf;
+       int len;
 
-       if (!d->data_send)
-               return false;
+       if (cl->state == CLIENT_STATE_DONE)
+               return;
 
-       while (len) {
+       while (1) {
                char *sep;
+               int offset = 0;
+               int cur_len;
 
-               r->content_length -= cur_len;
-               consumed += cur_len;
-               buf += cur_len;
-               len -= cur_len;
-               cur_len = min(r->content_length, len);
+               buf = ustream_get_read_buf(cl->us, &len);
+               if (!buf || !len)
+                       break;
+
+               if (!d->data_send)
+                       return;
 
+               cur_len = min(r->content_length, len);
                if (cur_len) {
+                       if (d->data_blocked)
+                               break;
+
                        if (d->data_send)
-                               d->data_send(cl, buf, cur_len);
+                               cur_len = d->data_send(cl, buf, cur_len);
+
+                       r->content_length -= cur_len;
+                       ustream_consume(cl->us, cur_len);
                        continue;
                }
 
                if (!r->transfer_chunked)
                        break;
 
-               sep = strstr(buf, "\r\n");
+               if (r->transfer_chunked > 1)
+                       offset = 2;
+
+               sep = strstr(buf + offset, "\r\n");
                if (!sep)
                        break;
 
                *sep = 0;
-               cur_len = sep + 2 - buf;
 
-               r->content_length = strtoul(buf, &sep, 16);
+               r->content_length = strtoul(buf + offset, &sep, 16);
+               r->transfer_chunked++;
+               ustream_consume(cl->us, sep + 2 - buf);
 
                /* invalid chunk length */
-               if (sep && *sep)
-                       return false;
+               if (sep && *sep) {
+                       r->content_length = 0;
+                       r->transfer_chunked = 0;
+                       break;
+               }
 
                /* empty chunk == eof */
                if (!r->content_length) {
                        r->transfer_chunked = false;
-                       continue;
+                       break;
                }
        }
 
-       ustream_consume(cl->us, consumed);
-       return r->content_length || r->transfer_chunked;
+       buf = ustream_get_read_buf(cl->us, &len);
+       if (!r->content_length && !r->transfer_chunked &&
+               cl->state != CLIENT_STATE_DONE) {
+               if (cl->dispatch.data_done)
+                       cl->dispatch.data_done(cl);
+
+               cl->state = CLIENT_STATE_DONE;
+       }
+}
+
+static bool client_data_cb(struct client *cl, char *buf, int len)
+{
+       client_poll_post_data(cl);
+       return false;
 }
 
 static bool client_header_cb(struct client *cl, char *buf, int len)
@@ -343,10 +371,9 @@ static void client_read_cb(struct client *cl)
                        break;
 
                if (!read_cbs[cl->state](cl, str, len)) {
-                       if (len == us->r.buffer_len)
+                       if (len == us->r.buffer_len &&
+                           cl->state != CLIENT_STATE_DATA)
                                uh_header_error(cl, 413, "Request Entity Too Large");
-                       if (cl->dispatch.data_done)
-                               cl->dispatch.data_done(cl);
                        break;
                }
        } while(1);
@@ -354,6 +381,7 @@ static void client_read_cb(struct client *cl)
 
 static void client_close(struct client *cl)
 {
+       n_clients--;
        uh_dispatch_done(cl);
        uloop_timeout_cancel(&cl->timeout);
        ustream_free(&cl->sfd.stream);
@@ -410,7 +438,7 @@ static void set_addr(struct uh_addr *addr, void *src)
        }
 }
 
-void uh_accept_client(int fd)
+bool uh_accept_client(int fd)
 {
        static struct client *next_client;
        struct client *cl;
@@ -427,7 +455,7 @@ void uh_accept_client(int fd)
        sl = sizeof(addr);
        sfd = accept(fd, (struct sockaddr *) &addr, &sl);
        if (sfd < 0)
-               return;
+               return false;
 
        set_addr(&cl->peer_addr, &addr);
        sl = sizeof(addr);
@@ -448,6 +476,7 @@ void uh_accept_client(int fd)
        next_client = NULL;
        n_clients++;
        cl->id = client_id++;
+       return true;
 }
 
 void uh_close_fds(void)