X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=uclient-http.c;h=c2bba6b5b8f2093e3b408d6d35a312673f821583;hb=refs%2Fheads%2Fmaster;hp=9652fb8f7cd9a9d5457a44522fddb5b919e16ba9;hpb=9ceca0a12166cefdf07aedc3c187fdd2f72fdec8;p=project%2Fuclient.git

diff --git a/uclient-http.c b/uclient-http.c
index 9652fb8..deeb456 100644
--- a/uclient-http.c
+++ b/uclient-http.c
@@ -15,10 +15,13 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
+#include <sys/socket.h>
 #include <stdio.h>
 #include <ctype.h>
 #include <unistd.h>
 #include <stdint.h>
+#include <string.h>
+#include <fcntl.h>
 
 #include <libubox/ustream.h>
 #include <libubox/ustream-ssl.h>
@@ -41,6 +44,7 @@ enum request_type {
 	REQ_HEAD,
 	REQ_POST,
 	REQ_PUT,
+	REQ_DELETE,
 	__REQ_MAX
 };
 
@@ -58,6 +62,7 @@ static const char * const request_types[__REQ_MAX] = {
 	[REQ_HEAD] = "HEAD",
 	[REQ_POST] = "POST",
 	[REQ_PUT] = "PUT",
+	[REQ_DELETE] = "DELETE",
 };
 
 struct uclient_http {
@@ -67,10 +72,14 @@ struct uclient_http {
 	struct ustream_ssl_ctx *ssl_ctx;
 	struct ustream *us;
 
-	struct ustream_fd ufd;
-	struct ustream_ssl ussl;
+	union {
+		struct ustream_fd ufd;
+		struct ustream_ssl ussl;
+	};
 
 	struct uloop_timeout disconnect_t;
+	unsigned int seq;
+	int fd;
 
 	bool ssl_require_validation;
 	bool ssl;
@@ -86,6 +95,8 @@ struct uclient_http {
 	long read_chunked;
 	long content_length;
 
+	int usock_flags;
+
 	uint32_t nc;
 
 	struct blob_buf headers;
@@ -104,6 +115,8 @@ static const char * const uclient_http_prefix[] = {
 	[__PREFIX_MAX] = NULL
 };
 
+static int uclient_http_connect(struct uclient *cl);
+
 static int uclient_do_connect(struct uclient_http *uh, const char *port)
 {
 	socklen_t sl;
@@ -112,18 +125,20 @@ static int uclient_do_connect(struct uclient_http *uh, const char *port)
 	if (uh->uc.url->port)
 		port = uh->uc.url->port;
 
-	fd = usock(USOCK_TCP | USOCK_NONBLOCK, uh->uc.url->host, port);
+	memset(&uh->uc.remote_addr, 0, sizeof(uh->uc.remote_addr));
+
+	fd = usock_inet_timeout(USOCK_TCP | USOCK_NONBLOCK | uh->usock_flags,
+				uh->uc.url->host, port, &uh->uc.remote_addr,
+				uh->uc.timeout_msecs);
 	if (fd < 0)
 		return -1;
 
-	ustream_fd_init(&uh->ufd, fd);
-
-	memset(&uh->uc.local_addr, 0, sizeof(uh->uc.local_addr));
-	memset(&uh->uc.remote_addr, 0, sizeof(uh->uc.remote_addr));
+	fcntl(fd, F_SETFL, fcntl(fd, F_GETFL) | O_NONBLOCK);
+	uh->fd = fd;
 
 	sl = sizeof(uh->uc.local_addr);
+	memset(&uh->uc.local_addr, 0, sl);
 	getsockname(fd, &uh->uc.local_addr.sa, &sl);
-	getpeername(fd, &uh->uc.remote_addr.sa, &sl);
 
 	return 0;
 }
@@ -136,8 +151,10 @@ static void uclient_http_disconnect(struct uclient_http *uh)
 
 	if (uh->ssl)
 		ustream_free(&uh->ussl.stream);
-	ustream_free(&uh->ufd.stream);
-	close(uh->ufd.fd.fd);
+	else
+		ustream_free(&uh->ufd.stream);
+	if(uh->fd >= 0)
+		close(uh->fd >= 0);
 	uh->us = NULL;
 }
 
@@ -159,6 +176,18 @@ static void uclient_http_error(struct uclient_http *uh, int code)
 	uclient_backend_set_error(&uh->uc, code);
 }
 
+static void uclient_http_request_disconnect(struct uclient *cl)
+{
+	struct uclient_http *uh = container_of(cl, struct uclient_http, uc);
+
+	if (!uh->us)
+		return;
+
+	uh->eof = true;
+	uh->disconnect = true;
+	uloop_timeout_set(&uh->disconnect_t, 1);
+}
+
 static void uclient_notify_eof(struct uclient_http *uh)
 {
 	struct ustream *us = uh->us;
@@ -174,14 +203,19 @@ static void uclient_notify_eof(struct uclient_http *uh)
 			return;
 	}
 
+	if ((uh->content_length < 0 && uh->read_chunked >= 0) ||
+			uh->content_length == 0)
+		uh->uc.data_eof = true;
+
 	uclient_backend_set_eof(&uh->uc);
 
 	if (uh->connection_close)
-		uclient_http_disconnect(uh);
+		uclient_http_request_disconnect(&uh->uc);
 }
 
 static void uclient_http_reset_state(struct uclient_http *uh)
 {
+	uh->seq++;
 	uclient_backend_reset_state(&uh->uc);
 	uh->read_chunked = -1;
 	uh->content_length = -1;
@@ -196,6 +230,7 @@ static void uclient_http_reset_state(struct uclient_http *uh)
 
 static void uclient_http_init_request(struct uclient_http *uh)
 {
+	uh->seq++;
 	uclient_http_reset_state(uh);
 	blob_buf_init(&uh->meta, 0);
 }
@@ -258,7 +293,19 @@ static void uclient_http_process_headers(struct uclient_http *uh)
 	uh->auth_type = uclient_http_update_auth_type(uh);
 }
 
-static void
+static bool uclient_request_supports_body(enum request_type req_type)
+{
+	switch (req_type) {
+	case REQ_POST:
+	case REQ_PUT:
+	case REQ_DELETE:
+		return true;
+	default:
+		return false;
+	}
+}
+
+static int
 uclient_http_add_auth_basic(struct uclient_http *uh)
 {
 	struct uclient_url *url = uh->uc.url;
@@ -266,11 +313,16 @@ uclient_http_add_auth_basic(struct uclient_http *uh)
 	char *auth_buf;
 
 	if (auth_len > 512)
-		return;
+		return -EINVAL;
 
 	auth_buf = alloca(base64_len(auth_len) + 1);
+	if (!auth_buf)
+		return -ENOMEM;
+
 	base64_encode(url->auth, auth_len, auth_buf);
 	ustream_printf(uh->us, "Authorization: Basic %s\r\n", auth_buf);
+
+	return 0;
 }
 
 static char *digest_unquote_sep(char **str)
@@ -307,6 +359,22 @@ static char *digest_unquote_sep(char **str)
 	return start;
 }
 
+static char *digest_sep(char **str)
+{
+	char *cur, *next;
+
+	cur = *str;
+	next = strchr(*str, ',');
+	if (next) {
+	    *str = next + 1;
+	    *next = 0;
+	} else {
+	    *str += strlen(*str);
+	}
+
+	return cur;
+}
+
 static bool strmatch(char **str, const char *prefix)
 {
 	int len = strlen(prefix);
@@ -323,11 +391,14 @@ get_cnonce(char *dest)
 {
 	uint32_t val = 0;
 	FILE *f;
+	size_t n;
 
 	f = fopen("/dev/urandom", "r");
 	if (f) {
-		fread(&val, sizeof(val), 1, f);
+		n = fread(&val, sizeof(val), 1, f);
 		fclose(f);
+		if (n != 1)
+			return;
 	}
 
 	bin_to_hex(dest, &val, sizeof(val));
@@ -368,7 +439,7 @@ static void add_field(char **buf, int *ofs, int *len, const char *name, const ch
 	*ofs = cur - *buf;
 }
 
-static void
+static int
 uclient_http_add_auth_digest(struct uclient_http *uh)
 {
 	struct uclient_url *url = uh->uc.url;
@@ -376,6 +447,7 @@ uclient_http_add_auth_digest(struct uclient_http *uh)
 	const char *user, *password;
 	char *buf, *next;
 	int len, ofs;
+	int err = 0;
 
 	char cnonce_str[9];
 	char nc_str[9];
@@ -389,10 +461,17 @@ uclient_http_add_auth_digest(struct uclient_http *uh)
 	};
 
 	len = strlen(uh->auth_str) + 1;
-	if (len > 512)
-		return;
+	if (len > 512) {
+		err = -EINVAL;
+		goto fail;
+	}
 
 	buf = alloca(len);
+	if (!buf) {
+		err = -ENOMEM;
+		goto fail;
+	}
+
 	strcpy(buf, uh->auth_str);
 
 	/* skip auth type */
@@ -401,8 +480,9 @@ uclient_http_add_auth_digest(struct uclient_http *uh)
 	next = buf;
 	while (*next) {
 		const char **dest = NULL;
+		const char *tmp;
 
-		while (isspace(*next))
+		while (*next && isspace(*next))
 			next++;
 
 		if (strmatch(&next, "realm"))
@@ -413,14 +493,26 @@ uclient_http_add_auth_digest(struct uclient_http *uh)
 			dest = &data.nonce;
 		else if (strmatch(&next, "opaque"))
 			dest = &opaque;
-		else
-			return;
+		else if (strmatch(&next, "stale") ||
+			 strmatch(&next, "algorithm") ||
+			 strmatch(&next, "auth-param")) {
+			digest_sep(&next);
+			continue;
+		} else if (strmatch(&next, "domain") ||
+			 strmatch(&next, "qop-options"))
+			dest = &tmp;
+		else {
+			digest_sep(&next);
+			continue;
+		}
 
 		*dest = digest_unquote_sep(&next);
 	}
 
-	if (!realm || !data.qop || !data.nonce)
-		return;
+	if (!realm || !data.qop || !data.nonce) {
+		err = -EINVAL;
+		goto fail;
+	}
 
 	sprintf(nc_str, "%08x", uh->nc++);
 	get_cnonce(cnonce_str);
@@ -434,10 +526,17 @@ uclient_http_add_auth_digest(struct uclient_http *uh)
 		char *user_buf;
 
 		len = password - url->auth;
-		if (len > 256)
-			return;
+		if (len > 256) {
+			err = -EINVAL;
+			goto fail;
+		}
 
 		user_buf = alloca(len + 1);
+		if (!user_buf) {
+			err = -ENOMEM;
+			goto fail;
+		}
+
 		strncpy(user_buf, url->auth, len);
 		user_buf[len] = 0;
 		user = user_buf;
@@ -464,71 +563,91 @@ uclient_http_add_auth_digest(struct uclient_http *uh)
 		add_field(&buf, &ofs, &len, "opaque", opaque);
 
 	ustream_printf(uh->us, "Authorization: Digest nc=%s, qop=%s%s\r\n", data.nc, data.qop, buf);
+
 	free(buf);
+
+	return 0;
+
+fail:
+	return err;
 }
 
-static void
+static int
 uclient_http_add_auth_header(struct uclient_http *uh)
 {
 	if (!uh->uc.url->auth)
-		return;
+		return 0;
 
 	switch (uh->auth_type) {
 	case AUTH_TYPE_UNKNOWN:
 	case AUTH_TYPE_NONE:
 		break;
 	case AUTH_TYPE_BASIC:
-		uclient_http_add_auth_basic(uh);
-		break;
+		return uclient_http_add_auth_basic(uh);
 	case AUTH_TYPE_DIGEST:
-		uclient_http_add_auth_digest(uh);
-		break;
+		return uclient_http_add_auth_digest(uh);
 	}
+
+	return 0;
 }
 
-static void
+static int
 uclient_http_send_headers(struct uclient_http *uh)
 {
 	struct uclient_url *url = uh->uc.url;
 	struct blob_attr *cur;
 	enum request_type req_type = uh->req_type;
-	int rem;
+	bool literal_ipv6;
+	int err;
+	size_t rem;
 
 	if (uh->state >= HTTP_STATE_HEADERS_SENT)
-		return;
+		return 0;
 
-	if (uh->auth_type == AUTH_TYPE_UNKNOWN)
-		req_type = REQ_HEAD;
+	if (uh->uc.proxy_url)
+		url = uh->uc.proxy_url;
+
+	literal_ipv6 = strchr(url->host, ':');
 
 	ustream_printf(uh->us,
 		"%s %s HTTP/1.1\r\n"
-		"Host: %s\r\n",
-		request_types[req_type],
-		url->location, url->host);
+		"Host: %s%s%s%s%s\r\n",
+		request_types[req_type], url->location,
+		literal_ipv6 ? "[" : "",
+		url->host,
+		literal_ipv6 ? "]" : "",
+		url->port ? ":" : "",
+		url->port ? url->port : "");
 
 	blobmsg_for_each_attr(cur, uh->headers.head, rem)
-		ustream_printf(uh->us, "%s: %s\n", blobmsg_name(cur), (char *) blobmsg_data(cur));
+		ustream_printf(uh->us, "%s: %s\r\n", blobmsg_name(cur), (char *) blobmsg_data(cur));
 
-	if (uh->req_type == REQ_POST || uh->req_type == REQ_PUT)
+	if (uclient_request_supports_body(uh->req_type))
 		ustream_printf(uh->us, "Transfer-Encoding: chunked\r\n");
 
-	uclient_http_add_auth_header(uh);
+	err = uclient_http_add_auth_header(uh);
+	if (err)
+		return err;
 
 	ustream_printf(uh->us, "\r\n");
 
 	uh->state = HTTP_STATE_HEADERS_SENT;
+
+	return 0;
 }
 
 static void uclient_http_headers_complete(struct uclient_http *uh)
 {
 	enum auth_type auth_type = uh->auth_type;
+	int seq = uh->uc.seq;
 
 	uh->state = HTTP_STATE_RECV_DATA;
 	uh->uc.meta = uh->meta.head;
 	uclient_http_process_headers(uh);
 
-	if (auth_type == AUTH_TYPE_UNKNOWN) {
-		uclient_http_init_request(uh);
+	if (auth_type == AUTH_TYPE_UNKNOWN && uh->uc.status_code == 401 &&
+	    (uh->req_type == REQ_HEAD || uh->req_type == REQ_GET)) {
+		uclient_http_connect(&uh->uc);
 		uclient_http_send_headers(uh);
 		uh->state = HTTP_STATE_REQUEST_DONE;
 		return;
@@ -537,10 +656,11 @@ static void uclient_http_headers_complete(struct uclient_http *uh)
 	if (uh->uc.cb->header_done)
 		uh->uc.cb->header_done(&uh->uc);
 
-	if (uh->eof)
+	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);
 	}
@@ -554,6 +674,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, " ");
 
@@ -599,6 +722,7 @@ error:
 static void __uclient_notify_read(struct uclient_http *uh)
 {
 	struct uclient *uc = &uh->uc;
+	unsigned int seq = uh->seq;
 	char *data;
 	int len;
 
@@ -610,29 +734,37 @@ static void __uclient_notify_read(struct uclient_http *uh)
 		return;
 
 	if (uh->state < HTTP_STATE_RECV_DATA) {
-		char *sep;
+		char *sep, *next;
 		int cur_len;
 
 		do {
-			sep = strstr(data, "\r\n");
+			sep = strchr(data, '\n');
 			if (!sep)
 				break;
 
+			next = sep + 1;
+			if (sep > data && sep[-1] == '\r')
+				sep--;
+
 			/* Check for multi-line HTTP headers */
 			if (sep > data) {
-				if (!sep[2])
+				if (!*next)
 					return;
 
-				if (isspace(sep[2]) && sep[2] != '\r') {
+				if (isspace(*next) && *next != '\r' && *next != '\n') {
 					sep[0] = ' ';
-					sep[1] = ' ';
+					if (sep + 1 < next)
+						sep[1] = ' ';
 					continue;
 				}
 			}
 
 			*sep = 0;
-			cur_len = sep + 2 - data;
+			cur_len = next - data;
 			uclient_parse_http_line(uh, data);
+			if (seq != uh->seq)
+				return;
+
 			ustream_consume(uh->us, cur_len);
 			len -= cur_len;
 
@@ -649,8 +781,19 @@ static void __uclient_notify_read(struct uclient_http *uh)
 	if (uh->eof)
 		return;
 
-	if (uh->state == HTTP_STATE_RECV_DATA && uc->cb->data_read)
-		uc->cb->data_read(uc);
+	if (uh->state == HTTP_STATE_RECV_DATA) {
+		/* Now it's uclient user turn to read some data */
+		uloop_timeout_cancel(&uc->connection_timeout);
+		uclient_backend_read_notify(uc);
+	}
+}
+
+static void __uclient_notify_write(struct uclient_http *uh)
+{
+	struct uclient *uc = &uh->uc;
+
+	if (uc->cb->data_sent)
+		uc->cb->data_sent(uc);
 }
 
 static void uclient_notify_read(struct ustream *us, int bytes)
@@ -660,10 +803,21 @@ 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);
 
+	if (uh->ufd.stream.write_error) {
+		uclient_http_error(uh, UCLIENT_ERROR_CONNECT);
+		return;
+	}
 	uclient_notify_eof(uh);
 }
 
@@ -672,17 +826,21 @@ static int uclient_setup_http(struct uclient_http *uh)
 	struct ustream *us = &uh->ufd.stream;
 	int ret;
 
+	memset(&uh->ufd, 0, sizeof(uh->ufd));
 	uh->us = us;
 	uh->ssl = false;
 
 	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)
 		return UCLIENT_ERROR_CONNECT;
 
+	ustream_fd_init(&uh->ufd, uh->fd);
+
 	return 0;
 }
 
@@ -693,6 +851,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);
@@ -703,17 +868,23 @@ static void uclient_ssl_notify_state(struct ustream *us)
 static void uclient_ssl_notify_error(struct ustream_ssl *ssl, int error, const char *str)
 {
 	struct uclient_http *uh = container_of(ssl, struct uclient_http, ussl);
+	struct uclient *uc = &uh->uc;
 
+	if (uc->cb->log_msg)
+		uc->cb->log_msg(uc, UCLIENT_LOG_SSL_ERROR, str);
 	uclient_http_error(uh, UCLIENT_ERROR_CONNECT);
 }
 
 static void uclient_ssl_notify_verify_error(struct ustream_ssl *ssl, int error, const char *str)
 {
 	struct uclient_http *uh = container_of(ssl, struct uclient_http, ussl);
+	struct uclient *uc = &uh->uc;
 
 	if (!uh->ssl_require_validation)
 		return;
 
+	if (uc->cb->log_msg)
+		uc->cb->log_msg(uc, UCLIENT_LOG_SSL_VERIFY_ERROR, str);
 	uclient_http_error(uh, UCLIENT_ERROR_SSL_INVALID_CERT);
 }
 
@@ -733,6 +904,7 @@ static int uclient_setup_https(struct uclient_http *uh)
 	struct ustream *us = &uh->ussl.stream;
 	int ret;
 
+	memset(&uh->ussl, 0, sizeof(uh->ussl));
 	uh->ssl = true;
 	uh->us = us;
 
@@ -746,10 +918,12 @@ 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;
-	uh->ssl_ops->init(&uh->ussl, &uh->ufd.stream, uh->ssl_ctx, false);
+	uh->ussl.server_name = uh->uc.url->host;
+	uh->ssl_ops->init_fd(&uh->ussl, uh->fd, uh->ssl_ctx, false);
 	uh->ssl_ops->set_peer_cn(&uh->ussl, uh->uc.url->host);
 
 	return 0;
@@ -760,6 +934,9 @@ static int uclient_http_connect(struct uclient *cl)
 	struct uclient_http *uh = container_of(cl, struct uclient_http, uc);
 	int ret;
 
+	if (!cl->eof || uh->disconnect || uh->connection_close)
+		uclient_http_disconnect(uh);
+
 	uclient_http_init_request(uh);
 
 	if (uh->us)
@@ -787,6 +964,9 @@ static struct uclient *uclient_http_alloc(void)
 	struct uclient_http *uh;
 
 	uh = calloc_a(sizeof(*uh));
+	if (!uh)
+		return NULL;
+
 	uh->disconnect_t.cb = uclient_http_disconnect_cb;
 	blob_buf_init(&uh->headers, 0);
 
@@ -814,7 +994,7 @@ int
 uclient_http_set_request_type(struct uclient *cl, const char *type)
 {
 	struct uclient_http *uh = container_of(cl, struct uclient_http, uc);
-	int i;
+	unsigned int i;
 
 	if (cl->backend != &uclient_backend_http)
 		return -1;
@@ -859,14 +1039,17 @@ uclient_http_set_header(struct uclient *cl, const char *name, const char *value)
 }
 
 static int
-uclient_http_send_data(struct uclient *cl, char *buf, unsigned int len)
+uclient_http_send_data(struct uclient *cl, const char *buf, unsigned int len)
 {
 	struct uclient_http *uh = container_of(cl, struct uclient_http, uc);
+	int err;
 
 	if (uh->state >= HTTP_STATE_REQUEST_DONE)
 		return -1;
 
-	uclient_http_send_headers(uh);
+	err = uclient_http_send_headers(uh);
+	if (err)
+		return err;
 
 	if (len > 0) {
 		ustream_printf(uh->us, "%X\r\n", len);
@@ -881,12 +1064,16 @@ static int
 uclient_http_request_done(struct uclient *cl)
 {
 	struct uclient_http *uh = container_of(cl, struct uclient_http, uc);
+	int err;
 
 	if (uh->state >= HTTP_STATE_REQUEST_DONE)
 		return -1;
 
-	uclient_http_send_headers(uh);
-	if (uh->req_type == REQ_POST || uh->req_type == REQ_PUT)
+	err = uclient_http_send_headers(uh);
+	if (err)
+		return err;
+
+	if (uclient_request_supports_body(uh->req_type))
 		ustream_printf(uh->us, "0\r\n\r\n");
 	uh->state = HTTP_STATE_REQUEST_DONE;
 
@@ -904,8 +1091,12 @@ uclient_http_read(struct uclient *cl, char *buf, unsigned int len)
 		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;
@@ -934,16 +1125,17 @@ uclient_http_read(struct uclient *cl, char *buf, unsigned int len)
 		}
 	}
 
-	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;
@@ -963,10 +1155,14 @@ uclient_http_read(struct uclient *cl, char *buf, unsigned int len)
 
 	uclient_notify_eof(uh);
 
+	/* Now that we consumed something and if this isn't EOF, start timer again */
+	if (!uh->uc.eof && !cl->connection_timeout.pending)
+		uloop_timeout_set(&cl->connection_timeout, cl->timeout_msecs);
+
 	return len;
 }
 
-bool uclient_http_redirect(struct uclient *cl)
+int uclient_http_redirect(struct uclient *cl)
 {
 	struct uclient_http *uh = container_of(cl, struct uclient_http, uc);
 	struct blobmsg_policy location = {
@@ -979,26 +1175,29 @@ bool uclient_http_redirect(struct uclient *cl)
 	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 false;
 
-	url = uclient_get_url(blobmsg_data(tb), url->auth);
+	url = uclient_get_url_location(url, blobmsg_data(tb));
 	if (!url)
 		return false;
 
-	free(cl->url);
-	cl->url = url;
-	uclient_http_connect(cl);
+	if (cl->proxy_url) {
+		free(cl->proxy_url);
+		cl->proxy_url = url;
+	}
+	else {
+		free(cl->url);
+		cl->url = url;
+	}
+
+	if (uclient_http_connect(cl))
+		return -1;
+
 	uclient_http_request_done(cl);
 
 	return true;
@@ -1022,16 +1221,34 @@ int uclient_http_set_ssl_ctx(struct uclient *cl, const struct ustream_ssl_ops *o
 	return 0;
 }
 
-static void uclient_http_request_disconnect(struct uclient *cl)
+int uclient_http_set_address_family(struct uclient *cl, int af)
 {
 	struct uclient_http *uh = container_of(cl, struct uclient_http, uc);
 
-	if (!uh->us)
-		return;
+	if (cl->backend != &uclient_backend_http)
+		return -1;
 
-	uh->eof = true;
-	uh->disconnect = true;
-	uloop_timeout_set(&uh->disconnect_t, 1);
+	switch (af) {
+	case AF_INET:
+		uh->usock_flags = USOCK_IPV4ONLY;
+		break;
+	case AF_INET6:
+		uh->usock_flags = USOCK_IPV6ONLY;
+		break;
+	default:
+		uh->usock_flags = 0;
+		break;
+	}
+
+	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 = {
@@ -1042,8 +1259,10 @@ const struct uclient_backend uclient_backend_http = {
 	.connect = uclient_http_connect,
 	.disconnect = uclient_http_request_disconnect,
 	.update_url = uclient_http_free_url_state,
+	.update_proxy_url = uclient_http_free_url_state,
 
 	.read = uclient_http_read,
 	.write = uclient_http_send_data,
 	.request = uclient_http_request_done,
+	.pending_bytes = uclient_http_pending_bytes,
 };