From: Junio C Hamano <gitster@pobox•com>
To: Johannes Schindelin <johannes.schindelin@gmx•de>
Cc: Pat Thoyts <patthoyts@users•sourceforge.net>, git@vger•kernel.org
Subject: Re: [PATCH 2/6] remote-http(s): Support SOCKS proxies
Date: Mon, 26 Oct 2015 13:15:17 -0700 [thread overview]
Message-ID: <xmqq7fm9gze2.fsf@gitster.mtv.corp.google.com> (raw)
In-Reply-To: <bf218d020e24216f55d1514c4459e645b13ec075.1445865176.git.johannes.schindelin@gmx.de> (Johannes Schindelin's message of "Mon, 26 Oct 2015 14:15:07 +0100 (CET)")
Johannes Schindelin <johannes.schindelin@gmx•de> writes:
> 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: Johannes Schindelin <johannes.schindelin@gmx•de>
Thanks.
The code looks OK but the last paragraph makes _us_ worried. What
is the licensing status of the original at SO? I can see that you
are taking legal responsibility with the Signed-off-by: line; you
state that to the best of your knowledge the patch is covered under
an appropriate open source license and you ahve the right under that
license to submit it here to the project.
But it is my job to double check when in doubt, hence this question.
> ---
> http.c | 11 +++++++++++
> 1 file changed, 11 insertions(+)
>
> diff --git a/http.c b/http.c
> index 7da76ed..6b89dea 100644
> --- a/http.c
> +++ b/http.c
> @@ -465,6 +465,17 @@ static CURL *get_curl_handle(void)
>
> if (curl_http_proxy) {
> curl_easy_setopt(result, CURLOPT_PROXY, curl_http_proxy);
> +#if LIBCURL_VERSION_NUM >= 0x071800
> + if (starts_with(curl_http_proxy, "socks5"))
> + curl_easy_setopt(result,
> + CURLOPT_PROXYTYPE, CURLPROXY_SOCKS5);
> + else if (starts_with(curl_http_proxy, "socks4a"))
> + curl_easy_setopt(result,
> + CURLOPT_PROXYTYPE, CURLPROXY_SOCKS4A);
> + else if (starts_with(curl_http_proxy, "socks"))
> + curl_easy_setopt(result,
> + CURLOPT_PROXYTYPE, CURLPROXY_SOCKS4);
> +#endif
> }
> #if LIBCURL_VERSION_NUM >= 0x070a07
> curl_easy_setopt(result, CURLOPT_PROXYAUTH, CURLAUTH_ANY);
next prev parent reply other threads:[~2015-10-26 20:15 UTC|newest]
Thread overview: 48+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-10-26 13:14 [PATCH 0/6] Miscellaneous platform-independent patches from Git for Windows Johannes Schindelin
2015-10-26 13:14 ` [PATCH 1/6] Only use CURLOPT_LOGIN_OPTIONS if it is actually available Johannes Schindelin
2015-10-26 20:17 ` Junio C Hamano
2015-10-26 13:15 ` [PATCH 2/6] remote-http(s): Support SOCKS proxies Johannes Schindelin
2015-10-26 20:15 ` Junio C Hamano [this message]
2015-10-27 1:23 ` James McCoy
2015-10-27 1:40 ` Junio C Hamano
2015-10-27 15:50 ` Johannes Schindelin
2015-10-27 15:53 ` Johannes Schindelin
2015-10-27 17:27 ` Junio C Hamano
2015-10-27 19:38 ` Junio C Hamano
2015-10-27 21:01 ` Junio C Hamano
2015-10-30 18:38 ` Johannes Schindelin
2015-11-09 22:28 ` Pat Thoyts
2015-11-16 21:49 ` Johannes Schindelin
2015-11-18 6:52 ` Junio C Hamano
2015-10-26 13:15 ` [PATCH 3/6] Facilitate debugging Git executables in tests with gdb Johannes Schindelin
2015-10-26 19:17 ` Jonathan Nieder
2015-10-27 9:42 ` Johannes Schindelin
2015-10-27 16:34 ` Junio C Hamano
2015-10-27 23:28 ` Jeff King
2015-10-27 23:39 ` Stefan Beller
2015-10-27 23:58 ` Jeff King
2015-10-30 18:25 ` Johannes Schindelin
2015-10-30 19:26 ` Jeff King
2015-10-30 18:27 ` Johannes Schindelin
2015-10-30 18:32 ` Junio C Hamano
2015-10-30 19:02 ` Jonathan Nieder
2015-10-30 19:14 ` Johannes Schindelin
2015-10-30 19:56 ` Jeff King
2015-10-30 21:30 ` Jonathan Nieder
2015-10-30 21:53 ` Junio C Hamano
2015-10-30 18:31 ` Johannes Schindelin
2015-10-30 18:55 ` Jonathan Nieder
2015-10-27 18:09 ` Duy Nguyen
2015-10-29 16:44 ` Junio C Hamano
2015-10-29 5:15 ` Victor Leschuk
2015-10-30 18:42 ` Johannes Schindelin
2015-11-01 5:31 ` Victor Leschuk
2015-11-01 13:37 ` Johannes Schindelin
2015-10-26 13:15 ` [PATCH 4/6] Squelch warning about an integer overflow Johannes Schindelin
2015-10-26 20:23 ` Junio C Hamano
2015-10-30 18:18 ` Johannes Schindelin
2015-10-30 18:21 ` Junio C Hamano
2015-10-26 13:15 ` [PATCH 5/6] Silence GCC's "cast of pointer to integer of a different size" warning Johannes Schindelin
2015-10-26 20:20 ` Junio C Hamano
2015-10-26 13:15 ` [PATCH 6/6] Correct fscanf formatting string for I64u values Johannes Schindelin
2015-10-26 20:20 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqq7fm9gze2.fsf@gitster.mtv.corp.google.com \
--to=gitster@pobox$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
--cc=johannes.schindelin@gmx$(echo .)de \
--cc=patthoyts@users$(echo .)sourceforge.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox