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

diff --git a/client.c b/client.c
index b493e7f..3185b8f 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 = {};
@@ -73,20 +74,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 +146,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;
@@ -157,7 +181,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;
@@ -171,6 +196,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);
@@ -264,8 +294,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;
 
@@ -285,10 +313,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"))
@@ -414,6 +443,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)
@@ -428,11 +458,12 @@ 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)
 {
+	client_done = true;
 	n_clients--;
 	uh_dispatch_done(cl);
 	uloop_timeout_cancel(&cl->timeout);
@@ -464,14 +495,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 +510,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,14 +566,13 @@ 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;
 	n_clients++;
 	cl->id = client_id++;
+	cl->tls = tls;
 
 	return true;
 }