Re: [PATCH 2/6] remote-http(s): Support SOCKS proxies
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Oct 26, 2015, 20:15 UTC
- Message-ID
- <xmqq7fm9gze2.fsf@gitster.mtv.corp.google.com>
- In-Reply-To
- <bf218d020e24216f55d1514c4459e645b13ec075.1445865176.git.johannes.schindelin@gmx.de>
Johannes Schindelin <johannes.schindelin@gmx.de> writes:
Show 5 quoted lines
> 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.
Show 26 quoted lines
> ---
> 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);