diff options
| author | ng0 <ng0@n0.is> | 2019-02-25 11:15:00 +0000 |
|---|---|---|
| committer | ng0 <ng0@n0.is> | 2019-02-25 11:15:00 +0000 |
| commit | 2a251478463006d1deacf1610987d75054ba4fb8 (patch) | |
| tree | 41bfad1ee4f0d2cee35c88d7de02ce0356307379 /include | |
| parent | 810ed5cbb8e14bd8c1f9bfed76b3811a1cdd0207 (diff) | |
| parent | f3294d9d86e6a7915a967efff2842089b8b0d071 (diff) | |
| download | gnurl-2a251478463006d1deacf1610987d75054ba4fb8.tar.gz gnurl-2a251478463006d1deacf1610987d75054ba4fb8.tar.bz2 gnurl-2a251478463006d1deacf1610987d75054ba4fb8.zip | |
Merge tag 'curl-7_64_0'
curl 7.64.0
Diffstat (limited to 'include')
| -rw-r--r-- | include/gnurl/curl.h | 19 | ||||
| -rw-r--r-- | include/gnurl/curlver.h | 6 | ||||
| -rw-r--r-- | include/gnurl/urlapi.h | 4 |
3 files changed, 25 insertions, 4 deletions
diff --git a/include/gnurl/curl.h b/include/gnurl/curl.h index 3c5ce709a..88e1f39e8 100644 --- a/include/gnurl/curl.h +++ b/include/gnurl/curl.h @@ -355,11 +355,21 @@ typedef int (*curl_seek_callback)(void *instream, signal libcurl to pause sending data on the current transfer. */ #define CURL_READFUNC_PAUSE 0x10000001 +/* Return code for when the trailing headers' callback has terminated + without any errors*/ +#define CURL_TRAILERFUNC_OK 0 +/* Return code for when was an error in the trailing header's list and we + want to abort the request */ +#define CURL_TRAILERFUNC_ABORT 1 + typedef size_t (*curl_read_callback)(char *buffer, size_t size, size_t nitems, void *instream); +typedef int (*curl_trailer_callback)(struct curl_slist **list, + void *userdata); + typedef enum { CURLSOCKTYPE_IPCXN, /* socket created for a specific IP connection */ CURLSOCKTYPE_ACCEPT, /* socket created by accept() call */ @@ -1875,6 +1885,15 @@ typedef enum { /* Specify URL using CURL URL API. */ CINIT(CURLU, OBJECTPOINT, 282), + /* add trailing data just after no more data is available */ + CINIT(TRAILERFUNCTION, FUNCTIONPOINT, 283), + + /* pointer to be passed to HTTP_TRAILER_FUNCTION */ + CINIT(TRAILERDATA, OBJECTPOINT, 284), + + /* set this to 1L to allow HTTP/0.9 responses or 0L to disallow */ + CINIT(HTTP09_ALLOWED, LONG, 285), + CURLOPT_LASTENTRY /* the last unused */ } CURLoption; diff --git a/include/gnurl/curlver.h b/include/gnurl/curlver.h index 4422a1a0b..a6ceb3413 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.63.0-DEV" +#define LIBCURL_VERSION "7.64.0-DEV" /* The numeric version number is also available "in parts" by using these defines: */ #define LIBCURL_VERSION_MAJOR 7 -#define LIBCURL_VERSION_MINOR 63 +#define LIBCURL_VERSION_MINOR 64 #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 0x073F00 +#define LIBCURL_VERSION_NUM 0x074000 /* * This is the date and time when the full source package was created. The diff --git a/include/gnurl/urlapi.h b/include/gnurl/urlapi.h index 90dd56c00..850faa97a 100644 --- a/include/gnurl/urlapi.h +++ b/include/gnurl/urlapi.h @@ -7,7 +7,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 2018, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 2018 - 2019, 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 @@ -22,6 +22,8 @@ * ***************************************************************************/ +#include "curl.h" + #ifdef __cplusplus extern "C" { #endif |