From b1ef70f7d9fdfa1431b948df6ae7bb0b15966dee Mon Sep 17 00:00:00 2001 From: Elliott Hughes Date: Tue, 30 Oct 2018 11:28:38 -0700 Subject: Update to curl 7.61.1 - September 5 2018. Bug: N/A Test: builds, boots, `vendor/google/tools/fake-ota on streaming` works Change-Id: Ic8598fc9d0bc029640ea3cbcecf4820d1de8f6ae --- docs/libcurl/opts/CURLOPT_PROXY.3 | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'docs/libcurl/opts/CURLOPT_PROXY.3') diff --git a/docs/libcurl/opts/CURLOPT_PROXY.3 b/docs/libcurl/opts/CURLOPT_PROXY.3 index 236f754f..525e653b 100644 --- a/docs/libcurl/opts/CURLOPT_PROXY.3 +++ b/docs/libcurl/opts/CURLOPT_PROXY.3 @@ -5,7 +5,7 @@ .\" * | (__| |_| | _ <| |___ .\" * \___|\___/|_| \_\_____| .\" * -.\" * Copyright (C) 1998 - 2017, Daniel Stenberg, , et al. +.\" * Copyright (C) 1998 - 2018, Daniel Stenberg, , et al. .\" * .\" * This software is licensed as described in the file COPYING, which .\" * you should have received as part of this distribution. The terms @@ -20,7 +20,7 @@ .\" * .\" ************************************************************************** .\" -.TH CURLOPT_PROXY 3 "April 17, 2018" "libcurl 7.61.0" "curl_easy_setopt options" +.TH CURLOPT_PROXY 3 "August 24, 2018" "libcurl 7.61.1" "curl_easy_setopt options" .SH NAME CURLOPT_PROXY \- set proxy to use @@ -80,10 +80,8 @@ libcurl respects the proxy environment variables named \fBhttp_proxy\fP, proxy for that URL scheme. So for a "FTP://" URL, the \fBftp_proxy\fP is considered. \fBall_proxy\fP is used if no protocol specific proxy was set. -If \fBno_proxy\fP (or \fBNO_PROXY\fP) is set, it can specify a list of host -names to not use a proxy for (even if one of the previous mention variables -are set). That is the exact equivalent of setting the \fICURLOPT_NOPROXY(3)\fP -option. +If \fBno_proxy\fP (or \fBNO_PROXY\fP) is set, it is the exact equivalent of +setting the \fICURLOPT_NOPROXY(3)\fP option. The \fICURLOPT_PROXY(3)\fP and \fICURLOPT_NOPROXY(3)\fP options override environment variables. -- cgit v1.2.3