[PATCH] Allow the CURL user agent to be specified either by config option http.useragent or by the environment variable GIT_USER_AGENT.
From: Spencer E. Olson <hidden>
Date: 2016-06-15 22:49:09
Subsystem:
the rest · Maintainer:
Linus Torvalds
Necessary to get through some firewalls that do not allow but the most common User-Agent strings. --- http.c | 10 +++++++++- 1 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/http.c b/http.c
index 1320c50..abee89e 100644
--- a/http.c
+++ b/http.c@@ -41,6 +41,7 @@ static long curl_low_speed_time = -1; static int curl_ftp_no_epsv; static const char *curl_http_proxy; static char *user_name, *user_pass; +static const char *user_agent = NULL; #if LIBCURL_VERSION_NUM >= 0x071700 /* Use CURLOPT_KEYPASSWD as is */
@@ -196,6 +197,9 @@ static int http_options(const char *var, const char *value, void *cb)
return 0;
}
+ if (!strcmp("http.useragent", var))
+ return git_config_string(&user_agent, var, value);
+
/* Fall back on the default ones */
return git_default_config(var, value, cb);
}@@ -279,7 +283,10 @@ static CURL *get_curl_handle(void) if (getenv("GIT_CURL_VERBOSE")) curl_easy_setopt(result, CURLOPT_VERBOSE, 1); - curl_easy_setopt(result, CURLOPT_USERAGENT, GIT_USER_AGENT); + if (user_agent != NULL) + curl_easy_setopt(result, CURLOPT_USERAGENT, user_agent); + else + curl_easy_setopt(result, CURLOPT_USERAGENT, GIT_USER_AGENT); if (curl_ftp_no_epsv) curl_easy_setopt(result, CURLOPT_FTP_USE_EPSV, 0);
@@ -379,6 +386,7 @@ void http_init(struct remote *remote) set_from_env(&ssl_capath, "GIT_SSL_CAPATH"); #endif set_from_env(&ssl_cainfo, "GIT_SSL_CAINFO"); + set_from_env(&user_agent, "GIT_USER_AGENT"); low_speed_limit = getenv("GIT_HTTP_LOW_SPEED_LIMIT"); if (low_speed_limit != NULL)
--
1.7.1.1