summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEdward Thomson <ethomson@edwardthomson.com>2022-11-23 13:00:23 +0000
committerGitHub <noreply@github.com>2022-11-23 13:00:23 +0000
commit8c7345e85a192cda29b6050004c7a2b363d4ee25 (patch)
tree13d177d47ec61f0bf855084e21a5a85aadf43b09
parenta7d841a8b1c5c7a492b18c32471dcda2cd479c85 (diff)
parentf8683b7a93c54db3df510fbb8593082c2667bfcd (diff)
downloadlibgit2-8c7345e85a192cda29b6050004c7a2b363d4ee25.tar.gz
Merge pull request #6416 from slackner/httpclient_update_options
http: Update httpclient options when reusing an existing connection.
-rw-r--r--src/libgit2/transports/http.c15
-rw-r--r--src/libgit2/transports/httpclient.c9
-rw-r--r--src/libgit2/transports/httpclient.h10
3 files changed, 27 insertions, 7 deletions
diff --git a/src/libgit2/transports/http.c b/src/libgit2/transports/http.c
index 7db5582ca..cda76ae61 100644
--- a/src/libgit2/transports/http.c
+++ b/src/libgit2/transports/http.c
@@ -655,6 +655,7 @@ static int http_action(
{
http_subtransport *transport = GIT_CONTAINER_OF(t, http_subtransport, parent);
git_remote_connect_options *connect_opts = &transport->owner->connect_opts;
+ git_http_client_options opts = {0};
http_stream *stream;
const http_service *service;
int error;
@@ -683,14 +684,14 @@ static int http_action(
stream = git__calloc(sizeof(http_stream), 1);
GIT_ERROR_CHECK_ALLOC(stream);
- if (!transport->http_client) {
- git_http_client_options opts = {0};
-
- opts.server_certificate_check_cb = connect_opts->callbacks.certificate_check;
- opts.server_certificate_check_payload = connect_opts->callbacks.payload;
- opts.proxy_certificate_check_cb = connect_opts->proxy_opts.certificate_check;
- opts.proxy_certificate_check_payload = connect_opts->proxy_opts.payload;
+ opts.server_certificate_check_cb = connect_opts->callbacks.certificate_check;
+ opts.server_certificate_check_payload = connect_opts->callbacks.payload;
+ opts.proxy_certificate_check_cb = connect_opts->proxy_opts.certificate_check;
+ opts.proxy_certificate_check_payload = connect_opts->proxy_opts.payload;
+ if (transport->http_client) {
+ git_http_client_set_options(transport->http_client, &opts);
+ } else {
if (git_http_client_new(&transport->http_client, &opts) < 0)
return -1;
}
diff --git a/src/libgit2/transports/httpclient.c b/src/libgit2/transports/httpclient.c
index f07923ef2..0ad6cd4dc 100644
--- a/src/libgit2/transports/httpclient.c
+++ b/src/libgit2/transports/httpclient.c
@@ -1541,6 +1541,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) {
diff --git a/src/libgit2/transports/httpclient.h b/src/libgit2/transports/httpclient.h
index 6d0ef9edb..22c4dd093 100644
--- a/src/libgit2/transports/httpclient.h
+++ b/src/libgit2/transports/httpclient.h
@@ -88,6 +88,16 @@ extern int git_http_client_new(
git_http_client **out,
git_http_client_options *opts);
+/**
+ * Update the options of an existing httpclient instance.
+ *
+ * @param client the httpclient instance to modify
+ * @param opts new options or NULL to keep existing options
+ */
+extern void git_http_client_set_options(
+ git_http_client *client,
+ git_http_client_options *opts);
+
/*
* Sends a request to the host specified by the request URL. If the
* method is POST, either the content_length or the chunked flag must