X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=uclient-http.c;h=4633956e63519e637749e9a82efb195f34eb6a4d;hb=80e135d9726eb897cd7d9e45a17bbd59e3a8b236;hp=16ffe9660cd55a0cd50af94565e0aa5dd55aa92b;hpb=29c798a52907b7ee28c8e001c99ceed65ebe5d39;p=project%2Fuclient.git

diff --git a/uclient-http.c b/uclient-http.c
index 16ffe96..4633956 100644
--- a/uclient-http.c
+++ b/uclient-http.c
@@ -40,6 +40,7 @@ enum request_type {
 	REQ_GET,
 	REQ_HEAD,
 	REQ_POST,
+	REQ_PUT,
 	__REQ_MAX
 };
 
@@ -56,6 +57,7 @@ static const char * const request_types[__REQ_MAX] = {
 	[REQ_GET] = "GET",
 	[REQ_HEAD] = "HEAD",
 	[REQ_POST] = "POST",
+	[REQ_PUT] = "PUT",
 };
 
 struct uclient_http {
@@ -495,9 +497,6 @@ uclient_http_send_headers(struct uclient_http *uh)
 	if (uh->state >= HTTP_STATE_HEADERS_SENT)
 		return;
 
-	if (uh->auth_type == AUTH_TYPE_UNKNOWN)
-		req_type = REQ_HEAD;
-
 	ustream_printf(uh->us,
 		"%s %s HTTP/1.1\r\n"
 		"Host: %s\r\n",
@@ -507,7 +506,7 @@ uclient_http_send_headers(struct uclient_http *uh)
 	blobmsg_for_each_attr(cur, uh->headers.head, rem)
 		ustream_printf(uh->us, "%s: %s\n", blobmsg_name(cur), (char *) blobmsg_data(cur));
 
-	if (uh->req_type == REQ_POST)
+	if (uh->req_type == REQ_POST || uh->req_type == REQ_PUT)
 		ustream_printf(uh->us, "Transfer-Encoding: chunked\r\n");
 
 	uclient_http_add_auth_header(uh);
@@ -525,7 +524,8 @@ static void uclient_http_headers_complete(struct uclient_http *uh)
 	uh->uc.meta = uh->meta.head;
 	uclient_http_process_headers(uh);
 
-	if (auth_type == AUTH_TYPE_UNKNOWN) {
+	if (auth_type == AUTH_TYPE_UNKNOWN && uh->uc.status_code == 401 &&
+	    (uh->req_type == REQ_HEAD || uh->req_type == REQ_GET)) {
 		uclient_http_init_request(uh);
 		uclient_http_send_headers(uh);
 		uh->state = HTTP_STATE_REQUEST_DONE;
@@ -552,6 +552,9 @@ static void uclient_parse_http_line(struct uclient_http *uh, char *data)
 	if (uh->state == HTTP_STATE_REQUEST_DONE) {
 		char *code;
 
+		if (!strlen(data))
+			return;
+
 		/* HTTP/1.1 */
 		strsep(&data, " ");
 
@@ -651,6 +654,12 @@ static void __uclient_notify_read(struct uclient_http *uh)
 		uc->cb->data_read(uc);
 }
 
+static void __uclient_notify_write(struct uclient_http *uh)
+{
+	struct uclient *uc = &uh->uc;
+	uc->cb->data_sent(uc);
+}
+
 static void uclient_notify_read(struct ustream *us, int bytes)
 {
 	struct uclient_http *uh = container_of(us, struct uclient_http, ufd.stream);
@@ -658,6 +667,13 @@ static void uclient_notify_read(struct ustream *us, int bytes)
 	__uclient_notify_read(uh);
 }
 
+static void uclient_notify_write(struct ustream *us, int bytes)
+{
+	struct uclient_http *uh = container_of(us, struct uclient_http, ufd.stream);
+
+	__uclient_notify_write(uh);
+}
+
 static void uclient_notify_state(struct ustream *us)
 {
 	struct uclient_http *uh = container_of(us, struct uclient_http, ufd.stream);
@@ -676,6 +692,7 @@ static int uclient_setup_http(struct uclient_http *uh)
 	us->string_data = true;
 	us->notify_state = uclient_notify_state;
 	us->notify_read = uclient_notify_read;
+	us->notify_write = uclient_notify_write;
 
 	ret = uclient_do_connect(uh, "80");
 	if (ret)
@@ -691,6 +708,13 @@ static void uclient_ssl_notify_read(struct ustream *us, int bytes)
 	__uclient_notify_read(uh);
 }
 
+static void uclient_ssl_notify_write(struct ustream *us, int bytes)
+{
+	struct uclient_http *uh = container_of(us, struct uclient_http, ussl.stream);
+
+	__uclient_notify_write(uh);
+}
+
 static void uclient_ssl_notify_state(struct ustream *us)
 {
 	struct uclient_http *uh = container_of(us, struct uclient_http, ussl.stream);
@@ -744,6 +768,7 @@ static int uclient_setup_https(struct uclient_http *uh)
 	us->string_data = true;
 	us->notify_state = uclient_ssl_notify_state;
 	us->notify_read = uclient_ssl_notify_read;
+	us->notify_write = uclient_ssl_notify_write;
 	uh->ussl.notify_error = uclient_ssl_notify_error;
 	uh->ussl.notify_verify_error = uclient_ssl_notify_verify_error;
 	uh->ussl.notify_connected = uclient_ssl_notify_connected;
@@ -884,7 +909,7 @@ uclient_http_request_done(struct uclient *cl)
 		return -1;
 
 	uclient_http_send_headers(uh);
-	if (uh->req_type == REQ_POST)
+	if (uh->req_type == REQ_POST || uh->req_type == REQ_PUT)
 		ustream_printf(uh->us, "0\r\n\r\n");
 	uh->state = HTTP_STATE_REQUEST_DONE;
 
@@ -926,8 +951,10 @@ uclient_http_read(struct uclient *cl, char *buf, unsigned int len)
 		read_len += sep + 2 - data;
 		data = sep + 2;
 
-		if (!uh->read_chunked)
+		if (!uh->read_chunked) {
 			uh->eof = true;
+			uh->uc.data_eof = true;
+		}
 	}
 
 	if (len > data_end - data)
@@ -943,8 +970,10 @@ uclient_http_read(struct uclient *cl, char *buf, unsigned int len)
 			len = uh->content_length;
 
 		uh->content_length -= len;
-		if (!uh->content_length)
+		if (!uh->content_length) {
 			uh->eof = true;
+			uh->uc.data_eof = true;
+		}
 	}
 
 	if (len > 0) {