diff options
author | ng0 <ng0@n0.is> | 2019-05-22 16:37:08 +0000 |
---|---|---|
committer | ng0 <ng0@n0.is> | 2019-05-22 16:37:08 +0000 |
commit | 76775eb29a045f4354ef7138deaf2e1721708dd4 (patch) | |
tree | 48e9517d65525dac2eeb54baac0e37bce9b58ca1 /include | |
parent | a341c3159eaeb4a6386fc3360f8d082e25b26ec3 (diff) | |
parent | 885ce31401b6789c959131754b1e5ae518964072 (diff) | |
download | gnurl-76775eb29a045f4354ef7138deaf2e1721708dd4.tar.gz gnurl-76775eb29a045f4354ef7138deaf2e1721708dd4.tar.bz2 gnurl-76775eb29a045f4354ef7138deaf2e1721708dd4.zip |
Merge tag 'curl-7_65_0' of https://github.com/curl/curl
7.65.0
Diffstat (limited to 'include')
-rw-r--r-- | include/gnurl/curl.h | 7 | ||||
-rw-r--r-- | include/gnurl/curlver.h | 10 | ||||
-rw-r--r-- | include/gnurl/typecheck-gcc.h | 10 | ||||
-rw-r--r-- | include/gnurl/urlapi.h | 3 |
4 files changed, 14 insertions, 16 deletions
diff --git a/include/gnurl/curl.h b/include/gnurl/curl.h index 86a24184a..d83b21798 100644 --- a/include/gnurl/curl.h +++ b/include/gnurl/curl.h @@ -114,7 +114,7 @@ typedef void CURLSH; #ifdef CURL_STATICLIB # define CURL_EXTERN -#elif defined(WIN32) || defined(_WIN32) || defined(__SYMBIAN32__) || \ +#elif defined(WIN32) || defined(__SYMBIAN32__) || \ (__has_declspec_attribute(dllexport) && \ __has_declspec_attribute(dllimport)) # if defined(BUILDING_LIBCURL) @@ -290,7 +290,7 @@ typedef enum { struct curl_fileinfo { char *filename; curlfiletype filetype; - time_t time; + time_t time; /* always zero! */ unsigned int perm; int uid; int gid; @@ -1918,6 +1918,9 @@ typedef enum { /* alt-svc cache file name to possibly read from/write to */ CINIT(ALTSVC, STRINGPOINT, 287), + /* maximum age of a connection to consider it for reuse (in seconds) */ + CINIT(MAXAGE_CONN, LONG, 288), + CURLOPT_LASTENTRY /* the last unused */ } CURLoption; diff --git a/include/gnurl/curlver.h b/include/gnurl/curlver.h index 479cd8e6c..bca53cb6b 100644 --- a/include/gnurl/curlver.h +++ b/include/gnurl/curlver.h @@ -30,13 +30,13 @@ /* This is the version number of the libcurl package from which this header file origins: */ -#define LIBCURL_VERSION "7.64.1-DEV" +#define LIBCURL_VERSION "7.65.0-DEV" /* The numeric version number is also available "in parts" by using these defines: */ #define LIBCURL_VERSION_MAJOR 7 -#define LIBCURL_VERSION_MINOR 64 -#define LIBCURL_VERSION_PATCH 1 +#define LIBCURL_VERSION_MINOR 65 +#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 0x074001 +#define LIBCURL_VERSION_NUM 0x074100 /* * This is the date and time when the full source package was created. The @@ -70,7 +70,7 @@ */ #define LIBCURL_TIMESTAMP "[unreleased]" -#define CURL_VERSION_BITS(x,y,z) ((x)<<16|(y)<<8|z) +#define CURL_VERSION_BITS(x,y,z) ((x)<<16|(y)<<8|(z)) #define CURL_AT_LEAST_VERSION(x,y,z) \ (LIBCURL_VERSION_NUM >= CURL_VERSION_BITS(x, y, z)) diff --git a/include/gnurl/typecheck-gcc.h b/include/gnurl/typecheck-gcc.h index 8018ea37f..2d1de4d43 100644 --- a/include/gnurl/typecheck-gcc.h +++ b/include/gnurl/typecheck-gcc.h @@ -113,7 +113,6 @@ __extension__ ({ \ }) /* wraps curl_easy_getinfo() with typechecking */ -/* FIXME: don't allow const pointers */ #define curl_easy_getinfo(handle, info, arg) \ __extension__ ({ \ __typeof__(info) _curl_info = info; \ @@ -146,9 +145,8 @@ __extension__ ({ \ curl_easy_getinfo(handle, _curl_info, arg); \ }) -/* TODO: typechecking for curl_share_setopt() and curl_multi_setopt(), - * for now just make sure that the functions are called with three - * arguments +/* + * For now, just make sure that the functions are called with three arguments */ #define curl_share_setopt(share,opt,param) curl_share_setopt(share,opt,param) #define curl_multi_setopt(handle,opt,param) curl_multi_setopt(handle,opt,param) @@ -506,10 +504,6 @@ _CURL_WARNING(_curl_easy_getinfo_err_curl_off_t, _curl_is_arr((expr), char) || \ _curl_is_arr((expr), unsigned char)) -/* FIXME: the whole callback checking is messy... - * The idea is to tolerate char vs. void and const vs. not const - * pointers in arguments at least - */ /* helper: __builtin_types_compatible_p distinguishes between functions and * function pointers, hide it */ #define _curl_callback_compatible(func, type) \ diff --git a/include/gnurl/urlapi.h b/include/gnurl/urlapi.h index 850faa97a..58e89d85c 100644 --- a/include/gnurl/urlapi.h +++ b/include/gnurl/urlapi.h @@ -60,7 +60,8 @@ typedef enum { CURLUPART_PORT, CURLUPART_PATH, CURLUPART_QUERY, - CURLUPART_FRAGMENT + CURLUPART_FRAGMENT, + CURLUPART_ZONEID /* added in 7.65.0 */ } CURLUPart; #define CURLU_DEFAULT_PORT (1<<0) /* return default port number */ |