X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fuhttpd.git;a=blobdiff_plain;f=client.c;h=9b8fb07025037a30c52548f1e006bb4042a01c81;hp=173285a7bd7a9fa94e2018bc7f30edb32d1c9ffa;hb=b965b8cc10f094ec0408d57b1bc9aeee0bca501c;hpb=37ea780f269d189e98dbafe7654f83bf35c8a940

diff --git a/client.c b/client.c
index 173285a..9b8fb07 100644
--- 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)
@@ -442,6 +444,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 +459,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 +488,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;