fixup! http: add support for selecting SSL backends at runtime

This change delays configuring the SSL backend until just before
curl_global_init(). Rationale: we now support the system gitconfig to
say something different than, say, the command-line config (before, cURL
would say that the SSL backend had been configured already).

Signed-off-by: Johannes Schindelin <[email protected]>

Author: dscho

http.c

@@ -144,6 +144,8 @@ static struct active_request_slot *active_queue_head;
 
 static char *cached_accept_language;
 
+static char *http_ssl_backend;
+
 size_t fread_buffer(char *ptr, size_t eltsize, size_t nmemb, void *buffer_)
 {
 	size_t size = eltsize * nmemb;
@@ -291,28 +293,11 @@ static int http_options(const char *var, const char *value, void *cb)
 		curl_ssl_try = git_config_bool(var, value);
 		return 0;
 	}
-#if LIBCURL_VERSION_NUM >= 0x073800 || \
-		defined(CURL_WITH_EXPERIMENTAL_SSL_BACKEND_SUPPORT)
 	if (!strcmp("http.sslbackend", var)) {
-		const curl_ssl_backend **backends;
-		struct strbuf buf = STRBUF_INIT;
-		int i;
-
-		switch (curl_global_sslset(-1, value, &backends)) {
-		case CURLSSLSET_UNKNOWN_BACKEND:
-			strbuf_addf(&buf, _("Unsupported SSL backend '%s'. "
-					    "Supported SSL backends:"), value);
-			for (i = 0; backends[i]; i++)
-				strbuf_addf(&buf, "\n\t%s", backends[i]->name);
-			die(buf.buf);
-		case CURLSSLSET_TOO_LATE:
-			die(_("Could not set SSL backend to '%s': already set"),
-			    value);
-		case CURLSSLSET_OK:
-			break; /* Okay! */
-		}
+		free(http_ssl_backend);
+		http_ssl_backend = xstrdup_or_null(value);
+		return 0;
 	}
-#endif
 
 	if (!strcmp("http.minsessions", var)) {
 		min_curl_sessions = git_config_int(var, value);
@@ -936,6 +921,30 @@ void http_init(struct remote *remote, const char *url, int proactive_auth)
 	git_config(urlmatch_config_entry, &config);
 	free(normalized_url);
 
+#if LIBCURL_VERSION_NUM >= 0x073800 || \
+		defined(CURL_WITH_EXPERIMENTAL_SSL_BACKEND_SUPPORT)
+	if (http_ssl_backend) {
+		const curl_ssl_backend **backends;
+		struct strbuf buf = STRBUF_INIT;
+		int i;
+
+		switch (curl_global_sslset(-1, http_ssl_backend, &backends)) {
+		case CURLSSLSET_UNKNOWN_BACKEND:
+			strbuf_addf(&buf, _("Unsupported SSL backend '%s'. "
+					    "Supported SSL backends:"),
+					    http_ssl_backend);
+			for (i = 0; backends[i]; i++)
+				strbuf_addf(&buf, "\n\t%s", backends[i]->name);
+			die(buf.buf);
+		case CURLSSLSET_TOO_LATE:
+			die(_("Could not set SSL backend to '%s': already set"),
+			    http_ssl_backend);
+		case CURLSSLSET_OK:
+			break; /* Okay! */
+		}
+	}
+#endif
+
 	if (curl_global_init(CURL_GLOBAL_ALL) != CURLE_OK)
 		die("curl_global_init failed");