rugged 1.3.1 → 1.9.0

data/vendor/libgit2/src/{transports → libgit2/transports}/httpclient.c

@@ -7,7 +7,7 @@
 
 #include "common.h"
 #include "git2.h"
-#include "http_parser.h"
+
 #include "vector.h"
 #include "trace.h"
 #include "httpclient.h"
@@ -21,6 +21,7 @@
 #include "streams/socket.h"
 #include "streams/tls.h"
 #include "auth.h"
+#include "httpparser.h"
 
 static git_http_auth_scheme auth_schemes[] = {
 	{ GIT_HTTP_AUTH_NEGOTIATE, "Negotiate", GIT_CREDENTIAL_DEFAULT, git_http_auth_negotiate },
@@ -84,8 +85,8 @@ typedef struct {
 	git_http_response *response;
 
 	/* Temporary buffers to avoid extra mallocs */
-	git_buf parse_header_name;
-	git_buf parse_header_value;
+	git_str parse_header_name;
+	git_str parse_header_value;
 
 	/* Parser state */
 	int error;
@@ -108,7 +109,7 @@ struct git_http_client {
 	git_http_server_t current_server;
 	http_client_state state;
 
-	http_parser parser;
+	git_http_parser parser;
 
 	git_http_server server;
 	git_http_server proxy;
@@ -120,8 +121,8 @@ struct git_http_client {
 	         request_chunked : 1;
 
 	/* Temporary buffers to avoid extra mallocs */
-	git_buf request_msg;
-	git_buf read_buf;
+	git_str request_msg;
+	git_str read_buf;
 
 	/* A subset of information from the request */
 	size_t request_body_len,
@@ -154,14 +155,14 @@ void git_http_response_dispose(git_http_response *response)
 	memset(response, 0, sizeof(git_http_response));
 }
 
-static int on_header_complete(http_parser *parser)
+static int on_header_complete(git_http_parser *parser)
 {
 	http_parser_context *ctx = (http_parser_context *) parser->data;
 	git_http_client *client = ctx->client;
 	git_http_response *response = ctx->response;
 
-	git_buf *name = &ctx->parse_header_name;
-	git_buf *value = &ctx->parse_header_value;
+	git_str *name = &ctx->parse_header_name;
+	git_str *value = &ctx->parse_header_value;
 
 	if (!strcasecmp("Content-Type", name->ptr)) {
 		if (response->content_type) {
@@ -193,7 +194,7 @@ static int on_header_complete(http_parser *parser)
 	} else if (!strcasecmp("Transfer-Encoding", name->ptr) &&
 	           !strcasecmp("chunked", value->ptr)) {
 			ctx->response->chunked = 1;
-	} else if (!strcasecmp("Proxy-Authenticate", git_buf_cstr(name))) {
+	} else if (!strcasecmp("Proxy-Authenticate", git_str_cstr(name))) {
 		char *dup = git__strndup(value->ptr, value->size);
 		GIT_ERROR_CHECK_ALLOC(dup);
 
@@ -219,7 +220,7 @@ static int on_header_complete(http_parser *parser)
 	return 0;
 }
 
-static int on_header_field(http_parser *parser, const char *str, size_t len)
+static int on_header_field(git_http_parser *parser, const char *str, size_t len)
 {
 	http_parser_context *ctx = (http_parser_context *) parser->data;
 
@@ -232,15 +233,15 @@ static int on_header_field(http_parser *parser, const char *str, size_t len)
 		if (on_header_complete(parser) < 0)
 			return ctx->parse_status = PARSE_STATUS_ERROR;
 
-		git_buf_clear(&ctx->parse_header_name);
-		git_buf_clear(&ctx->parse_header_value);
+		git_str_clear(&ctx->parse_header_name);
+		git_str_clear(&ctx->parse_header_value);
 		/* Fall through */
 
 	case PARSE_HEADER_NONE:
 	case PARSE_HEADER_NAME:
 		ctx->parse_header_state = PARSE_HEADER_NAME;
 
-		if (git_buf_put(&ctx->parse_header_name, str, len) < 0)
+		if (git_str_put(&ctx->parse_header_name, str, len) < 0)
 			return ctx->parse_status = PARSE_STATUS_ERROR;
 
 		break;
@@ -254,7 +255,7 @@ static int on_header_field(http_parser *parser, const char *str, size_t len)
 	return 0;
 }
 
-static int on_header_value(http_parser *parser, const char *str, size_t len)
+static int on_header_value(git_http_parser *parser, const char *str, size_t len)
 {
 	http_parser_context *ctx = (http_parser_context *) parser->data;
 
@@ -263,7 +264,7 @@ static int on_header_value(http_parser *parser, const char *str, size_t len)
 	case PARSE_HEADER_VALUE:
 		ctx->parse_header_state = PARSE_HEADER_VALUE;
 
-		if (git_buf_put(&ctx->parse_header_value, str, len) < 0)
+		if (git_str_put(&ctx->parse_header_value, str, len) < 0)
 			return ctx->parse_status = PARSE_STATUS_ERROR;
 
 		break;
@@ -342,7 +343,7 @@ static int resend_needed(git_http_client *client, git_http_response *response)
 	return 0;
 }
 
-static int on_headers_complete(http_parser *parser)
+static int on_headers_complete(git_http_parser *parser)
 {
 	http_parser_context *ctx = (http_parser_context *) parser->data;
 
@@ -364,8 +365,8 @@ static int on_headers_complete(http_parser *parser)
 		return ctx->parse_status = PARSE_STATUS_ERROR;
 	}
 
-	ctx->response->status = parser->status_code;
-	ctx->client->keepalive = http_should_keep_alive(parser);
+	ctx->response->status = git_http_parser_status_code(parser);
+	ctx->client->keepalive = git_http_parser_keep_alive(parser);
 
 	/* Prepare for authentication */
 	collect_authinfo(&ctx->response->server_auth_schemetypes,
@@ -378,24 +379,21 @@ static int on_headers_complete(http_parser *parser)
 	ctx->response->resend_credentials = resend_needed(ctx->client,
 	                                                  ctx->response);
 
-	/* Stop parsing. */
-	http_parser_pause(parser, 1);
-
 	if (ctx->response->content_type || ctx->response->chunked)
 		ctx->client->state = READING_BODY;
 	else
 		ctx->client->state = DONE;
 
-	return 0;
+	return git_http_parser_pause(parser);
 }
 
-static int on_body(http_parser *parser, const char *buf, size_t len)
+static int on_body(git_http_parser *parser, const char *buf, size_t len)
 {
 	http_parser_context *ctx = (http_parser_context *) parser->data;
 	size_t max_len;
 
 	/* Saw data when we expected not to (eg, in consume_response_body) */
-	if (ctx->output_buf == NULL && ctx->output_size == 0) {
+	if (ctx->output_buf == NULL || ctx->output_size == 0) {
 		ctx->parse_status = PARSE_STATUS_NO_OUTPUT;
 		return 0;
 	}
@@ -411,7 +409,7 @@ static int on_body(http_parser *parser, const char *buf, size_t len)
 	return 0;
 }
 
-static int on_message_complete(http_parser *parser)
+static int on_message_complete(git_http_parser *parser)
 {
 	http_parser_context *ctx = (http_parser_context *) parser->data;
 
@@ -548,7 +546,7 @@ static void free_auth_context(git_http_server *server)
 }
 
 static int apply_credentials(
-	git_buf *buf,
+	git_str *buf,
 	git_http_server *server,
 	const char *header_name,
 	git_credential *credentials)
@@ -556,7 +554,7 @@ static int apply_credentials(
 	git_http_auth_context *auth = server->auth_context;
 	git_vector *challenges = &server->auth_challenges;
 	const char *challenge;
-	git_buf token = GIT_BUF_INIT;
+	git_str token = GIT_STR_INIT;
 	int error = 0;
 
 	/* We've started a new request without creds; free the context. */
@@ -602,15 +600,15 @@ static int apply_credentials(
 	}
 
 	if (token.size > 0)
-		error = git_buf_printf(buf, "%s: %s\r\n", header_name, token.ptr);
+		error = git_str_printf(buf, "%s: %s\r\n", header_name, token.ptr);
 
 done:
-	git_buf_dispose(&token);
+	git_str_dispose(&token);
 	return error;
 }
 
 GIT_INLINE(int) apply_server_credentials(
-	git_buf *buf,
+	git_str *buf,
 	git_http_client *client,
 	git_http_request *request)
 {
@@ -621,7 +619,7 @@ GIT_INLINE(int) apply_server_credentials(
 }
 
 GIT_INLINE(int) apply_proxy_credentials(
-	git_buf *buf,
+	git_str *buf,
 	git_http_client *client,
 	git_http_request *request)
 {
@@ -631,54 +629,76 @@ GIT_INLINE(int) apply_proxy_credentials(
 	                         request->proxy_credentials);
 }
 
-static int puts_host_and_port(git_buf *buf, git_net_url *url, bool force_port)
+static int puts_host_and_port(git_str *buf, git_net_url *url, bool force_port)
 {
 	bool ipv6 = git_net_url_is_ipv6(url);
 
 	if (ipv6)
-		git_buf_putc(buf, '[');
+		git_str_putc(buf, '[');
 
-	git_buf_puts(buf, url->host);
+	git_str_puts(buf, url->host);
 
 	if (ipv6)
-		git_buf_putc(buf, ']');
+		git_str_putc(buf, ']');
 
 	if (force_port || !git_net_url_is_default_port(url)) {
-		git_buf_putc(buf, ':');
-		git_buf_puts(buf, url->port);
+		git_str_putc(buf, ':');
+		git_str_puts(buf, url->port);
+	}
+
+	return git_str_oom(buf) ? -1 : 0;
+}
+
+static int append_user_agent(git_str *buf)
+{
+	const char *product = git_settings__user_agent_product();
+	const char *comment = git_settings__user_agent();
+
+	GIT_ASSERT(product && comment);
+
+	if (!*product)
+		return 0;
+
+	git_str_puts(buf, "User-Agent: ");
+	git_str_puts(buf, product);
+
+	if (*comment) {
+		git_str_puts(buf, " (");
+		git_str_puts(buf, comment);
+		git_str_puts(buf, ")");
 	}
 
-	return git_buf_oom(buf) ? -1 : 0;
+	git_str_puts(buf, "\r\n");
+
+	return git_str_oom(buf) ? -1 : 0;
 }
 
 static int generate_connect_request(
 	git_http_client *client,
 	git_http_request *request)
 {
-	git_buf *buf;
+	git_str *buf;
 	int error;
 
-	git_buf_clear(&client->request_msg);
+	git_str_clear(&client->request_msg);
 	buf = &client->request_msg;
 
-	git_buf_puts(buf, "CONNECT ");
+	git_str_puts(buf, "CONNECT ");
 	puts_host_and_port(buf, &client->server.url, true);
-	git_buf_puts(buf, " HTTP/1.1\r\n");
+	git_str_puts(buf, " HTTP/1.1\r\n");
 
-	git_buf_puts(buf, "User-Agent: ");
-	git_http__user_agent(buf);
-	git_buf_puts(buf, "\r\n");
+	append_user_agent(buf);
 
-	git_buf_puts(buf, "Host: ");
+	git_str_puts(buf, "Host: ");
 	puts_host_and_port(buf, &client->server.url, true);
-	git_buf_puts(buf, "\r\n");
+	git_str_puts(buf, "\r\n");
 
 	if ((error = apply_proxy_credentials(buf, client, request) < 0))
 		return -1;
 
-	git_buf_puts(buf, "\r\n");
+	git_str_puts(buf, "\r\n");
 
-	return git_buf_oom(buf) ? -1 : 0;
+	return git_str_oom(buf) ? -1 : 0;
 }
 
 static bool use_connect_proxy(git_http_client *client)
@@ -690,53 +710,51 @@ static int generate_request(
 	git_http_client *client,
 	git_http_request *request)
 {
-	git_buf *buf;
+	git_str *buf;
 	size_t i;
 	int error;
 
 	GIT_ASSERT_ARG(client);
 	GIT_ASSERT_ARG(request);
 
-	git_buf_clear(&client->request_msg);
+	git_str_clear(&client->request_msg);
 	buf = &client->request_msg;
 
 	/* GET|POST path HTTP/1.1 */
-	git_buf_puts(buf, name_for_method(request->method));
-	git_buf_putc(buf, ' ');
+	git_str_puts(buf, name_for_method(request->method));
+	git_str_putc(buf, ' ');
 
 	if (request->proxy && strcmp(request->url->scheme, "https"))
 		git_net_url_fmt(buf, request->url);
 	else
 		git_net_url_fmt_path(buf, request->url);
 
-	git_buf_puts(buf, " HTTP/1.1\r\n");
+	git_str_puts(buf, " HTTP/1.1\r\n");
 
-	git_buf_puts(buf, "User-Agent: ");
-	git_http__user_agent(buf);
-	git_buf_puts(buf, "\r\n");
+	append_user_agent(buf);
 
-	git_buf_puts(buf, "Host: ");
+	git_str_puts(buf, "Host: ");
 	puts_host_and_port(buf, request->url, false);
-	git_buf_puts(buf, "\r\n");
+	git_str_puts(buf, "\r\n");
 
 	if (request->accept)
-		git_buf_printf(buf, "Accept: %s\r\n", request->accept);
+		git_str_printf(buf, "Accept: %s\r\n", request->accept);
 	else
-		git_buf_puts(buf, "Accept: */*\r\n");
+		git_str_puts(buf, "Accept: */*\r\n");
 
 	if (request->content_type)
-		git_buf_printf(buf, "Content-Type: %s\r\n",
+		git_str_printf(buf, "Content-Type: %s\r\n",
 			request->content_type);
 
 	if (request->chunked)
-		git_buf_puts(buf, "Transfer-Encoding: chunked\r\n");
+		git_str_puts(buf, "Transfer-Encoding: chunked\r\n");
 
 	if (request->content_length > 0)
-		git_buf_printf(buf, "Content-Length: %"PRIuZ "\r\n",
+		git_str_printf(buf, "Content-Length: %"PRIuZ "\r\n",
 			request->content_length);
 
 	if (request->expect_continue)
-		git_buf_printf(buf, "Expect: 100-continue\r\n");
+		git_str_printf(buf, "Expect: 100-continue\r\n");
 
 	if ((error = apply_server_credentials(buf, client, request)) < 0 ||
 	    (!use_connect_proxy(client) &&
@@ -748,13 +766,13 @@ static int generate_request(
 			const char *hdr = request->custom_headers->strings[i];
 
 			if (hdr)
-				git_buf_printf(buf, "%s\r\n", hdr);
+				git_str_printf(buf, "%s\r\n", hdr);
 		}
 	}
 
-	git_buf_puts(buf, "\r\n");
+	git_str_puts(buf, "\r\n");
 
-	if (git_buf_oom(buf))
+	if (git_str_oom(buf))
 		return -1;
 
 	return 0;
@@ -768,25 +786,37 @@ static int check_certificate(
 	void *cert_cb_payload)
 {
 	git_cert *cert;
-	git_error_state last_error = {0};
+	git_error *last_error;
 	int error;
 
 	if ((error = git_stream_certificate(&cert, stream)) < 0)
 		return error;
 
-	git_error_state_capture(&last_error, GIT_ECERTIFICATE);
+	/*
+	 * Allow callers to set an error - but save ours and clear
+	 * it, so that we can detect if they set one and restore it
+	 * if we need to.
+	 */
+	git_error_save(&last_error);
+	git_error_clear();
 
 	error = cert_cb(cert, is_valid, url->host, cert_cb_payload);
 
-	if (error == GIT_PASSTHROUGH && !is_valid)
-		return git_error_state_restore(&last_error);
-	else if (error == GIT_PASSTHROUGH)
-		error = 0;
-	else if (error && !git_error_last())
-		git_error_set(GIT_ERROR_HTTP,
-		              "user rejected certificate for %s", url->host);
+	if (error == GIT_PASSTHROUGH) {
+		error = is_valid ? 0 : -1;
+
+		if (error) {
+			git_error_restore(last_error);
+			last_error = NULL;
+		}
+	} else if (error) {
+		if (!git_error_exists())
+			git_error_set(GIT_ERROR_HTTP,
+		              "user rejected certificate for %s",
+			      url->host);
+	}
 
-	git_error_state_free(&last_error);
+	git_error_free(last_error);
 	return error;
 }
 
@@ -837,6 +867,11 @@ GIT_INLINE(int) server_setup_from_url(
 	git_http_server *server,
 	git_net_url *url)
 {
+	GIT_ASSERT_ARG(url);
+	GIT_ASSERT_ARG(url->scheme);
+	GIT_ASSERT_ARG(url->host);
+	GIT_ASSERT_ARG(url->port);
+
 	if (!server->url.scheme || strcmp(server->url.scheme, url->scheme) ||
 	    !server->url.host || strcmp(server->url.host, url->host) ||
 	    !server->url.port || strcmp(server->url.port, url->port)) {
@@ -859,9 +894,29 @@ GIT_INLINE(int) server_setup_from_url(
 	return 0;
 }
 
+static bool parser_settings_initialized;
+static git_http_parser_settings parser_settings;
+
+GIT_INLINE(git_http_parser_settings *) http_client_parser_settings(void)
+{
+	if (!parser_settings_initialized) {
+		parser_settings.on_header_field = on_header_field;
+		parser_settings.on_header_value = on_header_value;
+		parser_settings.on_headers_complete = on_headers_complete;
+		parser_settings.on_body = on_body;
+		parser_settings.on_message_complete = on_message_complete;
+
+		parser_settings_initialized = true;
+	}
+
+	return &parser_settings;
+}
+
 static void reset_parser(git_http_client *client)
 {
-	http_parser_init(&client->parser, HTTP_RESPONSE);
+	git_http_parser_init(&client->parser,
+	                     GIT_HTTP_PARSER_RESPONSE,
+	                     http_client_parser_settings());
 }
 
 static int setup_hosts(
@@ -1077,7 +1132,7 @@ GIT_INLINE(int) client_read(git_http_client *client)
 		client->proxy.stream : client->server.stream;
 
 	/*
-	 * We use a git_buf for convenience, but statically allocate it and
+	 * We use a git_str for convenience, but statically allocate it and
 	 * don't resize.  Limit our consumption to INT_MAX since calling
 	 * functions use an int return type to return number of bytes read.
 	 */
@@ -1104,27 +1159,9 @@ GIT_INLINE(int) client_read(git_http_client *client)
 	return (int)read_len;
 }
 
-static bool parser_settings_initialized;
-static http_parser_settings parser_settings;
-
-GIT_INLINE(http_parser_settings *) http_client_parser_settings(void)
-{
-	if (!parser_settings_initialized) {
-		parser_settings.on_header_field = on_header_field;
-		parser_settings.on_header_value = on_header_value;
-		parser_settings.on_headers_complete = on_headers_complete;
-		parser_settings.on_body = on_body;
-		parser_settings.on_message_complete = on_message_complete;
-
-		parser_settings_initialized = true;
-	}
-
-	return &parser_settings;
-}
-
 GIT_INLINE(int) client_read_and_parse(git_http_client *client)
 {
-	http_parser *parser = &client->parser;
+	git_http_parser *parser = &client->parser;
 	http_parser_context *ctx = (http_parser_context *) parser->data;
 	unsigned char http_errno;
 	int read_len;
@@ -1138,11 +1175,10 @@ GIT_INLINE(int) client_read_and_parse(git_http_client *client)
 	if (!client->read_buf.size && (read_len = client_read(client)) < 0)
 		return read_len;
 
-	parsed_len = http_parser_execute(parser,
-		http_client_parser_settings(),
+	parsed_len = git_http_parser_execute(parser,
 		client->read_buf.ptr,
 		client->read_buf.size);
-	http_errno = client->parser.http_errno;
+	http_errno = git_http_parser_errno(parser);
 
 	if (parsed_len > INT_MAX) {
 		git_error_set(GIT_ERROR_HTTP, "unexpectedly large parse");
@@ -1161,26 +1197,29 @@ GIT_INLINE(int) client_read_and_parse(git_http_client *client)
 	 * (This can happen in response to an expect/continue request,
 	 * where the server gives you a 100 and 200 simultaneously.)
 	 */
-	if (http_errno == HPE_PAUSED) {
+	if (http_errno == GIT_HTTP_PARSER_PAUSED) {
+		size_t additional_size;
+
+		git_http_parser_resume(parser);
+
 		/*
-		 * http-parser has a "feature" where it will not deliver the
-		 * final byte when paused in a callback.  Consume that byte.
-		 * https://github.com/nodejs/http-parser/issues/97
+		 * http-parser has a "feature" where it will not deliver
+		 * the final byte when paused in a callback.  Consume
+		 * that byte.
 		 */
-		GIT_ASSERT(client->read_buf.size > parsed_len);
-
-		http_parser_pause(parser, 0);
+		if ((additional_size = git_http_parser_remain_after_pause(parser)) > 0) {
+			GIT_ASSERT((client->read_buf.size - parsed_len) >= additional_size);
 
-		parsed_len += http_parser_execute(parser,
-			http_client_parser_settings(),
-			client->read_buf.ptr + parsed_len,
-			1);
+			parsed_len += git_http_parser_execute(parser,
+				client->read_buf.ptr + parsed_len,
+				additional_size);
+		}
 	}
 
 	/* Most failures will be reported in http_errno */
-	else if (parser->http_errno != HPE_OK) {
+	else if (git_http_parser_errno(parser) != GIT_HTTP_PARSER_OK) {
 		git_error_set(GIT_ERROR_HTTP, "http parser error: %s",
-		              http_errno_description(http_errno));
+		              git_http_parser_errmsg(parser, http_errno));
 		return -1;
 	}
 
@@ -1188,7 +1227,7 @@ GIT_INLINE(int) client_read_and_parse(git_http_client *client)
 	else if (parsed_len != client->read_buf.size) {
 		git_error_set(GIT_ERROR_HTTP,
 		              "http parser did not consume entire buffer: %s",
-			      http_errno_description(http_errno));
+		              git_http_parser_errmsg(parser, http_errno));
 		return -1;
 	}
 
@@ -1198,7 +1237,7 @@ GIT_INLINE(int) client_read_and_parse(git_http_client *client)
 		return -1;
 	}
 
-	git_buf_consume_bytes(&client->read_buf, parsed_len);
+	git_str_consume_bytes(&client->read_buf, parsed_len);
 
 	return (int)parsed_len;
 }
@@ -1227,7 +1266,7 @@ static void complete_response_body(git_http_client *client)
 
 	/* If there was an error, just close the connection. */
 	if (client_read_and_parse(client) < 0 ||
-	    parser_context.error != HPE_OK ||
+	    parser_context.error != GIT_HTTP_PARSER_OK ||
 	    (parser_context.parse_status != PARSE_STATUS_OK &&
 	     parser_context.parse_status != PARSE_STATUS_NO_OUTPUT)) {
 		git_error_clear();
@@ -1235,7 +1274,8 @@ static void complete_response_body(git_http_client *client)
 	}
 
 done:
-	git_buf_clear(&client->read_buf);
+	client->parser.data = NULL;
+	git_str_clear(&client->read_buf);
 }
 
 int git_http_client_send_request(
@@ -1257,12 +1297,12 @@ int git_http_client_send_request(
 		return 0;
 
 	if (git_trace_level() >= GIT_TRACE_DEBUG) {
-		git_buf url = GIT_BUF_INIT;
+		git_str url = GIT_STR_INIT;
 		git_net_url_fmt(&url, request->url);
 		git_trace(GIT_TRACE_DEBUG, "Sending %s request to %s",
 		          name_for_method(request->method),
 		          url.ptr ? url.ptr : "<invalid>");
-		git_buf_dispose(&url);
+		git_str_dispose(&url);
 	}
 
 	if ((error = http_client_connect(client, request)) < 0 ||
@@ -1314,7 +1354,7 @@ int git_http_client_send_body(
 	size_t buffer_len)
 {
 	git_http_server *server;
-	git_buf hdr = GIT_BUF_INIT;
+	git_str hdr = GIT_STR_INIT;
 	int error;
 
 	GIT_ASSERT_ARG(client);
@@ -1341,7 +1381,7 @@ int git_http_client_send_body(
 
 		client->request_body_remain -= buffer_len;
 	} else {
-		if ((error = git_buf_printf(&hdr, "%" PRIxZ "\r\n", buffer_len)) < 0 ||
+		if ((error = git_str_printf(&hdr, "%" PRIxZ "\r\n", buffer_len)) < 0 ||
 		    (error = stream_write(server, hdr.ptr, hdr.size)) < 0 ||
 		    (error = stream_write(server, buffer, buffer_len)) < 0 ||
 		    (error = stream_write(server, "\r\n", 2)) < 0)
@@ -1349,7 +1389,7 @@ int git_http_client_send_body(
 	}
 
 done:
-	git_buf_dispose(&hdr);
+	git_str_dispose(&hdr);
 	return error;
 }
 
@@ -1402,9 +1442,9 @@ int git_http_client_read_response(
 	git_http_response_dispose(response);
 
 	if (client->current_server == PROXY) {
-		git_vector_free_deep(&client->proxy.auth_challenges);
+		git_vector_dispose_deep(&client->proxy.auth_challenges);
 	} else if(client->current_server == SERVER) {
-		git_vector_free_deep(&client->server.auth_challenges);
+		git_vector_dispose_deep(&client->server.auth_challenges);
 	}
 
 	client->state = READING_RESPONSE;
@@ -1422,8 +1462,9 @@ int git_http_client_read_response(
 	GIT_ASSERT(client->state == READING_BODY || client->state == DONE);
 
 done:
-	git_buf_dispose(&parser_context.parse_header_name);
-	git_buf_dispose(&parser_context.parse_header_value);
+	git_str_dispose(&parser_context.parse_header_name);
+	git_str_dispose(&parser_context.parse_header_value);
+	client->parser.data = NULL;
 
 	return error;
 }
@@ -1479,6 +1520,8 @@ done:
 	if (error < 0)
 		client->connected = 0;
 
+	client->parser.data = NULL;
+
 	return error;
 }
 
@@ -1501,7 +1544,7 @@ int git_http_client_skip_body(git_http_client *client)
 	do {
 		error = client_read_and_parse(client);
 
-		if (parser_context.error != HPE_OK ||
+		if (parser_context.error != GIT_HTTP_PARSER_OK ||
 		    (parser_context.parse_status != PARSE_STATUS_OK &&
 		     parser_context.parse_status != PARSE_STATUS_NO_OUTPUT)) {
 			git_error_set(GIT_ERROR_HTTP,
@@ -1513,6 +1556,8 @@ int git_http_client_skip_body(git_http_client *client)
 	if (error < 0)
 		client->connected = 0;
 
+	client->parser.data = NULL;
+
 	return error;
 }
 
@@ -1531,7 +1576,7 @@ int git_http_client_new(
 	client = git__calloc(1, sizeof(git_http_client));
 	GIT_ERROR_CHECK_ALLOC(client);
 
-	git_buf_init(&client->read_buf, GIT_READ_BUFFER_SIZE);
+	git_str_init(&client->read_buf, GIT_READ_BUFFER_SIZE);
 	GIT_ERROR_CHECK_ALLOC(client->read_buf.ptr);
 
 	if (opts)
@@ -1541,6 +1586,15 @@ int git_http_client_new(
 	return 0;
 }
 
+/* Update the options of an existing httpclient instance. */
+void git_http_client_set_options(
+	git_http_client *client,
+	git_http_client_options *opts)
+{
+	if (opts)
+		memcpy(&client->opts, opts, sizeof(git_http_client_options));
+}
+
 GIT_INLINE(void) http_server_close(git_http_server *server)
 {
 	if (server->stream) {
@@ -1551,7 +1605,7 @@ GIT_INLINE(void) http_server_close(git_http_server *server)
 
 	git_net_url_dispose(&server->url);
 
-	git_vector_free_deep(&server->auth_challenges);
+	git_vector_dispose_deep(&server->auth_challenges);
 	free_auth_context(server);
 }
 
@@ -1560,7 +1614,7 @@ static void http_client_close(git_http_client *client)
 	http_server_close(&client->server);
 	http_server_close(&client->proxy);
 
-	git_buf_dispose(&client->request_msg);
+	git_str_dispose(&client->request_msg);
 
 	client->state = 0;
 	client->request_count = 0;
@@ -1574,6 +1628,6 @@ void git_http_client_free(git_http_client *client)
 		return;
 
 	http_client_close(client);
-	git_buf_dispose(&client->read_buf);
+	git_str_dispose(&client->read_buf);
 	git__free(client);
 }