]> git.ipfire.org Git - thirdparty/git.git/commit - http.c
remote-http(s): support SOCKS proxies
authorPat Thoyts <patthoyts@users.sourceforge.net>
Mon, 26 Oct 2015 13:15:07 +0000 (14:15 +0100)
committerJeff King <peff@peff.net>
Fri, 20 Nov 2015 12:31:39 +0000 (07:31 -0500)
commit6d7afe07f29df75f831a46fb0f657fa37e561779
tree6a7786659df2979d582398a98389fe061b4fdce4
parenta2558fb8e1e387b630312311e1d22c95663da5d0
remote-http(s): support SOCKS proxies

With this patch we properly support SOCKS proxies, configured e.g. like
this:

git config http.proxy socks5://192.168.67.1:32767

Without this patch, Git mistakenly tries to use SOCKS proxies as if they
were HTTP proxies, resulting in a error message like:

fatal: unable to access 'http://.../': Proxy CONNECT aborted

This patch was required to work behind a faulty AP and scraped from
http://stackoverflow.com/questions/15227130/#15228479 and guarded with
an appropriate cURL version check by Johannes Schindelin.

Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
http.c