diff options
| -rw-r--r-- | Documentation/config.txt | 7 | ||||
| -rw-r--r-- | http.c | 17 |
2 files changed, 1 insertions, 23 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index a54ede350..b77d66da2 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -1158,13 +1158,6 @@ http.noEPSV:: support EPSV mode. Can be overridden by the 'GIT_CURL_FTP_NO_EPSV' environment variable. Default is false (curl will use EPSV). -http.authAny:: - Allow any HTTP authentication method, not only basic. Enabling - this lowers the performance slightly, by having to do requests - without any authentication to discover the authentication method - to use. Can be overridden by the 'GIT_HTTP_AUTH_ANY' - environment variable. Default is false. - i18n.commitEncoding:: Character encoding the commit messages are stored in; git itself does not care per se, but this information is necessary e.g. when @@ -40,9 +40,6 @@ 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; -#ifdef LIBCURL_CAN_HANDLE_AUTH_ANY -static int curl_http_auth_any = 0; -#endif #if LIBCURL_VERSION_NUM >= 0x071700 /* Use CURLOPT_KEYPASSWD as is */ @@ -197,12 +194,6 @@ static int http_options(const char *var, const char *value, void *cb) http_post_buffer = LARGE_PACKET_MAX; return 0; } -#ifdef LIBCURL_CAN_HANDLE_AUTH_ANY - if (!strcmp("http.authany", var)) { - curl_http_auth_any = git_config_bool(var, value); - return 0; - } -#endif /* Fall back on the default ones */ return git_default_config(var, value, cb); @@ -254,8 +245,7 @@ static CURL *get_curl_handle(void) curl_easy_setopt(result, CURLOPT_NETRC, CURL_NETRC_OPTIONAL); #endif #ifdef LIBCURL_CAN_HANDLE_AUTH_ANY - if (curl_http_auth_any) - curl_easy_setopt(result, CURLOPT_HTTPAUTH, CURLAUTH_ANY); + curl_easy_setopt(result, CURLOPT_HTTPAUTH, CURLAUTH_ANY); #endif init_curl_http_auth(result); @@ -408,11 +398,6 @@ void http_init(struct remote *remote) if (getenv("GIT_CURL_FTP_NO_EPSV")) curl_ftp_no_epsv = 1; -#ifdef LIBCURL_CAN_HANDLE_AUTH_ANY - if (getenv("GIT_HTTP_AUTH_ANY")) - curl_http_auth_any = 1; -#endif - if (remote && remote->url && remote->url[0]) { http_auth_init(remote->url[0]); if (!ssl_cert_password_required && |