Merge branch 'js/http-https-proxy-fix' into next

* js/http-https-proxy-fix: http: accept https:// proxies again
2026-06-28 08:46:49 -07:00 · 2026-06-28 08:46:49 -07:00 · a7fdf2ec97
parent 766c0a55de f6c8bae5cd
commit a7fdf2ec97
1 changed files with 2 additions and 0 deletions
--- a/http.c
+++ b/http.c
@ -819,6 +819,8 @@ static int set_curl_proxy_type(CURL *result, const char *protocol)
 		if (has_proxy_cert_password())
 			curl_easy_setopt(result, CURLOPT_PROXY_KEYPASSWD,
 					 proxy_cert_auth.password);
+
+		return 0;
 	}

 	return -1;