diff options
| -rw-r--r-- | RELEASE-NOTES | 2 | ||||
| -rw-r--r-- | docs/cmdline-opts/noproxy.d | 4 | ||||
| -rw-r--r-- | docs/cmdline-opts/page-footer | 2 | ||||
| -rw-r--r-- | docs/curl.1 | 21 | ||||
| -rw-r--r-- | include/curl/curl.h | 4 | ||||
| -rw-r--r-- | include/curl/curlver.h | 12 |
6 files changed, 30 insertions, 15 deletions
diff --git a/RELEASE-NOTES b/RELEASE-NOTES index e8578a05d..ef13f2768 100644 --- a/RELEASE-NOTES +++ b/RELEASE-NOTES @@ -1,4 +1,4 @@ -Curl and libcurl 7.52.2 +Curl and libcurl 7.53.0 Public curl releases: 163 Command line options: 204 diff --git a/docs/cmdline-opts/noproxy.d b/docs/cmdline-opts/noproxy.d index e0d2d598c..a216e75f4 100644 --- a/docs/cmdline-opts/noproxy.d +++ b/docs/cmdline-opts/noproxy.d @@ -10,6 +10,6 @@ a domain which contains the hostname, or the hostname itself. For example, local.com would match local.com, local.com:80, and www.local.com, but not www.notlocal.com. -Since 7.52.2, This option overrides the environment variables that disable -the proxy. If there's an environment variable disabling a proxy, you can set +Since 7.53.0, This option overrides the environment variables that disable the +proxy. If there's an environment variable disabling a proxy, you can set noproxy list to \&"" to override it. diff --git a/docs/cmdline-opts/page-footer b/docs/cmdline-opts/page-footer index c7b1ae014..5be76b968 100644 --- a/docs/cmdline-opts/page-footer +++ b/docs/cmdline-opts/page-footer @@ -24,7 +24,7 @@ Sets the proxy server to use if no protocol-specific proxy is set. list of host names that shouldn't go through any proxy. If set to a asterisk \&'*' only, it matches all hosts. -Since 7.52.2, this environment variable disable the proxy even if specify +Since 7.53.0, this environment variable disable the proxy even if specify --proxy option. That is .B NO_PROXY=direct.example.com curl -x http://proxy.example.com .B http://direct.example.com diff --git a/docs/curl.1 b/docs/curl.1 index b930b246f..dfee670e9 100644 --- a/docs/curl.1 +++ b/docs/curl.1 @@ -141,6 +141,8 @@ the --option version of them. (This concept with --no options was added in same command line option.) .IP "--abstract-unix-socket <path>" (HTTP) Connect through an abstract Unix domain socket, instead of using the network. +Note: netstat shows the path of an abstract socket prefixed with '@', however +the <path> argument should not have this leading character. Added in 7.53.0. .IP "--anyauth" @@ -1194,7 +1196,7 @@ for each. \fI-:, --next\fP will reset all local options and only global ones will have their values survive over to the operation following the \fI-:, --next\fP instruction. Global -options include \fI-v, --verbose\fP and \fI--fail-early\fP. +options include \fI-v, --verbose\fP, \fI--trace\fP, \fI--trace-ascii\fP and \fI--fail-early\fP. For example, you can do both a GET and a POST in a single command line: @@ -1246,6 +1248,10 @@ a domain which contains the hostname, or the hostname itself. For example, local.com would match local.com, local.com:80, and www.local.com, but not www.notlocal.com. +Since 7.53.0, This option overrides the environment variables that disable the +proxy. If there's an environment variable disabling a proxy, you can set +noproxy list to \&"" to override it. + Added in 7.19.4. .IP "--ntlm-wb" (HTTP) Enables NTLM much in the style \fI--ntlm\fP does, but hand over the authentication @@ -2429,8 +2435,7 @@ about to be transferred. This includes time_pretransfer and also the time the server needed to calculate the result. .TP .B time_total -The total time, in seconds, that the full operation lasted. The time will be -displayed with millisecond resolution. +The total time, in seconds, that the full operation lasted. .TP .B url_effective The URL that was fetched last. This is most meaningful if you've told curl @@ -2469,6 +2474,16 @@ Sets the proxy server to use if no protocol-specific proxy is set. .IP "NO_PROXY <comma-separated list of hosts>" list of host names that shouldn't go through any proxy. If set to a asterisk \&'*' only, it matches all hosts. + +Since 7.53.0, this environment variable disable the proxy even if specify +\fI-x, --proxy\fP option. That is +.B NO_PROXY=direct.example.com curl -x http://proxy.example.com +.B http://direct.example.com +accesses the target URL directly, and +.B NO_PROXY=direct.example.com curl -x http://proxy.example.com +.B http://somewhere.example.com +accesses the target URL through proxy. + .SH "PROXY PROTOCOL PREFIXES" Since curl version 7.21.7, the proxy string may be specified with a protocol:// prefix to specify alternative proxy protocols. diff --git a/include/curl/curl.h b/include/curl/curl.h index a626caf38..74ac0350e 100644 --- a/include/curl/curl.h +++ b/include/curl/curl.h @@ -7,7 +7,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2016, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2017, 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 @@ -479,7 +479,7 @@ typedef enum { CURLE_LDAP_CANNOT_BIND, /* 38 */ CURLE_LDAP_SEARCH_FAILED, /* 39 */ CURLE_OBSOLETE40, /* 40 - NOT USED */ - CURLE_FUNCTION_NOT_FOUND, /* 41 - NOT USED starting with 7.52.2 */ + CURLE_FUNCTION_NOT_FOUND, /* 41 - NOT USED starting with 7.53.0 */ CURLE_ABORTED_BY_CALLBACK, /* 42 */ CURLE_BAD_FUNCTION_ARGUMENT, /* 43 */ CURLE_OBSOLETE44, /* 44 - NOT USED */ diff --git a/include/curl/curlver.h b/include/curl/curlver.h index 1c87a9cd3..530e8df20 100644 --- a/include/curl/curlver.h +++ b/include/curl/curlver.h @@ -7,7 +7,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2016, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2017, 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 @@ -26,17 +26,17 @@ a script at release-time. This was made its own header file in 7.11.2 */ /* This is the global package copyright */ -#define LIBCURL_COPYRIGHT "1996 - 2016 Daniel Stenberg, <daniel@haxx.se>." +#define LIBCURL_COPYRIGHT "1996 - 2017 Daniel Stenberg, <daniel@haxx.se>." /* This is the version number of the libcurl package from which this header file origins: */ -#define LIBCURL_VERSION "7.52.2-DEV" +#define LIBCURL_VERSION "7.53.0-DEV" /* The numeric version number is also available "in parts" by using these defines: */ #define LIBCURL_VERSION_MAJOR 7 -#define LIBCURL_VERSION_MINOR 52 -#define LIBCURL_VERSION_PATCH 2 +#define LIBCURL_VERSION_MINOR 53 +#define LIBCURL_VERSION_PATCH 0 /* This is the numeric version of the libcurl version number, meant for easier parsing and comparions by programs. The LIBCURL_VERSION_NUM define will @@ -57,7 +57,7 @@ CURL_VERSION_BITS() macro since curl's own configure script greps for it and needs it to contain the full number. */ -#define LIBCURL_VERSION_NUM 0x073402 +#define LIBCURL_VERSION_NUM 0x073500 /* * This is the date and time when the full source package was created. The |