diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2018-10-30 23:00:37 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-10-30 23:00:37 +0000 |
| commit | 849332cb73701636b19b97f3d82e8e9fa0d51a30 (patch) | |
| tree | 24facefd22d2ca56694f740049660701da90ee9a /docs/libcurl/opts/CURLOPT_PROXY.3 | |
| parent | 8c49d19ccbe7df4ce7b150f5d92eaddcc7f369df (diff) | |
| parent | b1ef70f7d9fdfa1431b948df6ae7bb0b15966dee (diff) | |
| download | external_curl-849332cb73701636b19b97f3d82e8e9fa0d51a30.tar.gz external_curl-849332cb73701636b19b97f3d82e8e9fa0d51a30.tar.bz2 external_curl-849332cb73701636b19b97f3d82e8e9fa0d51a30.zip | |
Merge "Update to curl 7.61.1 - September 5 2018."android-wear-8.0.0_r2android-o-mr1-iot-release-smart-display-r9android-o-mr1-iot-release-smart-display-r8android-o-mr1-iot-release-smart-display-r5android-o-mr1-iot-release-smart-display-r40.1Jandroid-o-mr1-iot-release-smart-display-r4android-o-mr1-iot-release-smart-display-r39android-o-mr1-iot-release-smart-display-r30android-o-mr1-iot-release-smart-display-r22android-o-mr1-iot-release-smart-display-r14android-o-mr1-iot-release-smart-clock-r6android-o-mr1-iot-release-smart-clock-r2android-o-mr1-iot-release-smart-clock-fsiandroid-o-mr1-iot-release-smart-clock-fcsandroid-n-iot-release-ihome-igv1
Diffstat (limited to 'docs/libcurl/opts/CURLOPT_PROXY.3')
| -rw-r--r-- | docs/libcurl/opts/CURLOPT_PROXY.3 | 10 |
1 files changed, 4 insertions, 6 deletions
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, <daniel@haxx.se>, et al. +.\" * Copyright (C) 1998 - 2018, Daniel Stenberg, <daniel@haxx.se>, 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. |