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

diff --git a/client.c b/client.c
index 3185b8f..9b8fb07 100644
--- a/client.c
+++ b/client.c
@@ -39,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)
@@ -463,6 +464,11 @@ void uh_client_read_cb(struct client *cl)
 
 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);
@@ -482,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;