X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fuhttpd.git;a=blobdiff_plain;f=client.c;h=79201022a56fce1ce2ea7fc846b206d3d7bafc72;hp=28c8f760be9a14a0d9ee5572796a32b769f8862d;hb=5ee20abc0dea6e4187e212b1d8e9484f5e79f538;hpb=92f4e1306dd060106a3f5c5f61303d9613f93888

diff --git a/client.c b/client.c
index 28c8f76..7920102 100644
--- 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,29 +249,38 @@ 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) {
-		int offset = 0;
+	while (1) {
 		char *sep;
+		int offset = 0;
+		int 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) {
-			r->content_length -= 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;
 		}
 
@@ -287,35 +295,38 @@ static bool client_data_cb(struct client *cl, char *buf, int len)
 			break;
 
 		*sep = 0;
-		cur_len = sep + 2 - buf;
 
 		r->content_length = strtoul(buf + offset, &sep, 16);
 		r->transfer_chunked++;
+		ustream_consume(cl->us, sep + 2 - buf);
 
 		/* invalid chunk length */
-		if (sep && *sep)
-			goto abort;
+		if (sep && *sep) {
+			r->content_length = 0;
+			r->transfer_chunked = 0;
+			break;
+		}
 
 		/* empty chunk == eof */
-		if (!r->content_length)
+		if (!r->content_length) {
 			r->transfer_chunked = false;
-
-		continue;
-
-abort:
-		consumed = len;
-		r->content_length = 0;
-		r->transfer_chunked = 0;
-		break;
+			break;
+		}
 	}
 
-	ustream_consume(cl->us, consumed);
-	if (!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;
 }