[PATCH 3/6] connect: only match the host with core.gitProxy
- From
Mike Hommey <mh@glandium.org>
- Date
- May 1, 2016, 06:02 UTC
- Message-ID
- <1462082573-17992-4-git-send-email-mh@glandium.org>
- In-Reply-To
- <1462082573-17992-1-git-send-email-mh@glandium.org>
Currently, core.gitProxy doesn't actually match purely on domain names as documented: it also matches ports.
So a core.gitProxy value like "script for kernel.org" doesn't make the script called for an url like git://kernel.org:port/path, while it is called for git://kernel.org/path.
This per-port behavior seems like an oversight rather than a deliberate choice, so, make git://kernel.org:port/path call the gitProxy script in the case described above.
Signed-off-by: Mike Hommey <mh@glandium.org> --- connect.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/connect.c b/connect.c index 98449bc..1c8ed6b 100644 --- a/connect.c +++ b/connect.c @@ -695,7 +695,7 @@ struct child_process *git_connect(int fd[2], const char *url, /* These underlying connection commands die() if they * cannot connect. */ - if (git_use_proxy(hostandport)) + if (git_use_proxy(host)) conn = git_proxy_connect(fd, hostandport); else git_tcp_connect(fd, hostandport, flags);
-- 2.8.1.16.g58dac65.dirty