undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'jk/fix-remote-curl-url-wo-proto' into maint

Browse Source 
"git fetch http::/site/path" did not die correctly and segfaulted
instead.

* jk/fix-remote-curl-url-wo-proto:
  remote-curl: handle URLs without protocol
This commit is contained in:
Junio C Hamano 2016-09-29 16:49:38 -07:00
commit 35ec7fd479
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
http.c
View File

@ -723,7 +723,7 @@ static CURL *get_curl_handle(void)
* precedence here, as in CURL. * precedence here, as in CURL.
*/ */
if (!curl_http_proxy) { if (!curl_http_proxy) {
if (!strcmp(http_auth.protocol, "https")) { if (http_auth.protocol && !strcmp(http_auth.protocol, "https")) {
var_override(&curl_http_proxy, getenv("HTTPS_PROXY")); var_override(&curl_http_proxy, getenv("HTTPS_PROXY"));
var_override(&curl_http_proxy, getenv("https_proxy")); var_override(&curl_http_proxy, getenv("https_proxy"));
} else { } else {

8
t/t5550-http-fetch-dumb.sh
View File

@ -299,5 +299,13 @@ test_expect_success 'git client does not send an empty Accept-Language' '
! grep "^=> Send header: Accept-Language:" stderr ! grep "^=> Send header: Accept-Language:" stderr
' '
test_expect_success 'remote-http complains cleanly about malformed urls' '
# do not actually issue "list" or other commands, as we do not
# want to rely on what curl would actually do with such a broken
# URL. This is just about making sure we do not segfault during
# initialization.
test_must_fail git remote-http http::/example.com/repo.git
'
stop_httpd stop_httpd
test_done test_done