if (uh->eof || seq != uh->uc.seq)
return;
- if (uh->req_type == REQ_HEAD || uh->uc.status_code == 204) {
+ if (uh->req_type == REQ_HEAD || uh->uc.status_code == 204 ||
+ uh->content_length == 0) {
uh->eof = true;
uclient_notify_eof(uh);
}
if (uh->state == HTTP_STATE_RECV_DATA) {
/* Now it's uclient user turn to read some data */
uloop_timeout_cancel(&uc->connection_timeout);
-
- if (uc->cb->data_read)
- uc->cb->data_read(uc);
+ uclient_backend_read_notify(uc);
}
}
return 0;
data = ustream_get_read_buf(uh->us, &read_len);
- if (!data || !read_len)
- return 0;
+ if (!data || !read_len) {
+ ustream_poll(uh->us);
+ data = ustream_get_read_buf(uh->us, &read_len);
+ if (!data || !read_len)
+ return 0;
+ }
data_end = data + read_len;
read_len = 0;
}
}
- if (len > data_end - data)
- len = data_end - data;
+ unsigned int diff = data_end - data;
+ if (len > diff)
+ len = diff;
if (uh->read_chunked >= 0) {
- if (len > uh->read_chunked)
+ if (len > (unsigned long) uh->read_chunked)
len = uh->read_chunked;
uh->read_chunked -= len;
} else if (uh->content_length >= 0) {
- if (len > uh->content_length)
+ if (len > (unsigned long) uh->content_length)
len = uh->content_length;
uh->content_length -= len;
if (cl->backend != &uclient_backend_http)
return false;
- switch (cl->status_code) {
- case 301:
- case 302:
- case 307:
- break;
- default:
+ if (!uclient_http_status_redirect(cl))
return false;
- }
blobmsg_parse(&location, 1, &tb, blob_data(uh->meta.head), blob_len(uh->meta.head));
if (!tb)
return 0;
}
+static int
+uclient_http_pending_bytes(struct uclient *cl, bool write)
+{
+ struct uclient_http *uh = container_of(cl, struct uclient_http, uc);
+
+ return ustream_pending_data(uh->us, write);
+}
+
const struct uclient_backend uclient_backend_http = {
.prefix = uclient_http_prefix,
.read = uclient_http_read,
.write = uclient_http_send_data,
.request = uclient_http_request_done,
+ .pending_bytes = uclient_http_pending_bytes,
};