diff options
| author | Nils Gillmann <gillmann@gnunet.org> | 2018-05-23 10:24:02 +0000 |
|---|---|---|
| committer | Nils Gillmann <gillmann@gnunet.org> | 2018-05-23 10:24:02 +0000 |
| commit | 97f0e8cf8585325401b9d19e433131722f978984 (patch) | |
| tree | 935fa45929a646222b5abdd260a7bfd4be2cd836 /include | |
| parent | 422f18ebe7ad2cbcd5d45ed05ae02e959e4a7d8b (diff) | |
| parent | cb013830383f1ccc9757aba36bc32df5ec281c02 (diff) | |
| download | gnurl-97f0e8cf8585325401b9d19e433131722f978984.tar.gz gnurl-97f0e8cf8585325401b9d19e433131722f978984.tar.bz2 gnurl-97f0e8cf8585325401b9d19e433131722f978984.zip | |
Merge tag 'curl-7_60_0' (with fixes)
curl 7.60.0
Signed-off-by: Nils Gillmann <gillmann@gnunet.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/gnurl/curl.h | 6 | ||||
| -rw-r--r-- | include/gnurl/curlver.h | 6 | ||||
| -rw-r--r-- | include/gnurl/system.h | 4 |
3 files changed, 12 insertions, 4 deletions
diff --git a/include/gnurl/curl.h b/include/gnurl/curl.h index fa019eca9..3fd4ca87d 100644 --- a/include/gnurl/curl.h +++ b/include/gnurl/curl.h @@ -1841,6 +1841,12 @@ typedef enum { /* User data to pass to the resolver start callback. */ CINIT(RESOLVER_START_DATA, OBJECTPOINT, 273), + /* send HAProxy PROXY protocol header? */ + CINIT(HAPROXYPROTOCOL, LONG, 274), + + /* shuffle addresses before use when DNS returns multiple */ + CINIT(DNS_SHUFFLE_ADDRESSES, LONG, 275), + CURLOPT_LASTENTRY /* the last unused */ } CURLoption; diff --git a/include/gnurl/curlver.h b/include/gnurl/curlver.h index 5149d2f77..26f2371a7 100644 --- a/include/gnurl/curlver.h +++ b/include/gnurl/curlver.h @@ -30,12 +30,12 @@ /* This is the version number of the libcurl package from which this header file origins: */ -#define LIBCURL_VERSION "7.59.0-DEV" +#define LIBCURL_VERSION "7.60.0-DEV" /* The numeric version number is also available "in parts" by using these defines: */ #define LIBCURL_VERSION_MAJOR 7 -#define LIBCURL_VERSION_MINOR 59 +#define LIBCURL_VERSION_MINOR 60 #define LIBCURL_VERSION_PATCH 0 /* This is the numeric version of the libcurl version number, meant for easier @@ -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 0x073B00 +#define LIBCURL_VERSION_NUM 0x073C00 /* * This is the date and time when the full source package was created. The diff --git a/include/gnurl/system.h b/include/gnurl/system.h index 07bbd9ca9..eac4cfeb6 100644 --- a/include/gnurl/system.h +++ b/include/gnurl/system.h @@ -300,7 +300,9 @@ #elif defined(__SUNPRO_C) /* Oracle Solaris Studio */ # if !defined(__LP64) && (defined(__ILP32) || \ - defined(__i386) || defined(__sparcv8)) + defined(__i386) || \ + defined(__sparcv8) || \ + defined(__sparcv8plus)) # define CURL_TYPEOF_CURL_OFF_T long long # define CURL_FORMAT_CURL_OFF_T "lld" # define CURL_FORMAT_CURL_OFF_TU "llu" |