|
30 | 30 | */
|
31 | 31 |
|
32 | 32 | #ifdef CURL_NO_OLDIES
|
33 |
| -#define CURL_STRICTER |
| 33 | +#define CURL_STRICTER /* not used since 8.11.0 */ |
34 | 34 | #endif
|
35 | 35 |
|
36 | 36 | /* Compile-time deprecation macros. */
|
37 |
| -#if (defined(__GNUC__) && \ |
38 |
| - ((__GNUC__ > 12) || ((__GNUC__ == 12) && (__GNUC_MINOR__ >= 1 ))) || \ |
39 |
| - defined(__IAR_SYSTEMS_ICC__)) && \ |
40 |
| - !defined(__INTEL_COMPILER) && \ |
| 37 | +#if (defined(__GNUC__) && \ |
| 38 | + ((__GNUC__ > 12) || ((__GNUC__ == 12) && (__GNUC_MINOR__ >= 1))) || \ |
| 39 | + (defined(__clang__) && __clang_major__ >= 3) || \ |
| 40 | + defined(__IAR_SYSTEMS_ICC__)) && \ |
| 41 | + !defined(__INTEL_COMPILER) && \ |
41 | 42 | !defined(CURL_DISABLE_DEPRECATION) && !defined(BUILDING_LIBCURL)
|
42 | 43 | #define CURL_DEPRECATED(version, message) \
|
43 | 44 | __attribute__((deprecated("since " # version ". " message)))
|
|
76 | 77 | #if defined(_WIN32) && !defined(_WIN32_WCE) && !defined(__CYGWIN__)
|
77 | 78 | #if !(defined(_WINSOCKAPI_) || defined(_WINSOCK_H) || \
|
78 | 79 | defined(__LWIP_OPT_H__) || defined(LWIP_HDR_OPT_H))
|
79 |
| -/* The check above prevents the winsock2 inclusion if winsock.h already was |
| 80 | +/* The check above prevents the winsock2.h inclusion if winsock.h already was |
80 | 81 | included, since they cannot co-exist without problems */
|
81 | 82 | #include <winsock2.h>
|
82 | 83 | #include <ws2tcpip.h>
|
|
113 | 114 | extern "C" {
|
114 | 115 | #endif
|
115 | 116 |
|
116 |
| -#if defined(BUILDING_LIBCURL) || defined(CURL_STRICTER) |
117 |
| -typedef struct Curl_easy CURL; |
118 |
| -typedef struct Curl_share CURLSH; |
119 |
| -#else |
120 | 117 | typedef void CURL;
|
121 | 118 | typedef void CURLSH;
|
122 |
| -#endif |
123 | 119 |
|
124 | 120 | /*
|
125 | 121 | * libcurl external API function linkage decorations.
|
@@ -253,12 +249,12 @@ typedef int (*curl_xferinfo_callback)(void *clientp,
|
253 | 249 | #endif
|
254 | 250 |
|
255 | 251 | #ifndef CURL_MAX_WRITE_SIZE
|
256 |
| - /* Tests have proven that 20K is a very bad buffer size for uploads on |
257 |
| - Windows, while 16K for some odd reason performed a lot better. |
258 |
| - We do the ifndef check to allow this value to easier be changed at build |
259 |
| - time for those who feel adventurous. The practical minimum is about |
260 |
| - 400 bytes since libcurl uses a buffer of this size as a scratch area |
261 |
| - (unrelated to network send operations). */ |
| 252 | + /* Tests have proven that 20K is a bad buffer size for uploads on Windows, |
| 253 | + while 16K for some odd reason performed a lot better. We do the ifndef |
| 254 | + check to allow this value to easier be changed at build time for those |
| 255 | + who feel adventurous. The practical minimum is about 400 bytes since |
| 256 | + libcurl uses a buffer of this size as a scratch area (unrelated to |
| 257 | + network send operations). */ |
262 | 258 | #define CURL_MAX_WRITE_SIZE 16384
|
263 | 259 | #endif
|
264 | 260 |
|
@@ -721,6 +717,8 @@ typedef enum {
|
721 | 717 | with them. */
|
722 | 718 | #define CURLOPT_WRITEINFO CURLOPT_OBSOLETE40
|
723 | 719 | #define CURLOPT_CLOSEPOLICY CURLOPT_OBSOLETE72
|
| 720 | +#define CURLOPT_OBSOLETE72 9999 |
| 721 | +#define CURLOPT_OBSOLETE40 9999 |
724 | 722 |
|
725 | 723 | #endif /* !CURL_NO_OLDIES */
|
726 | 724 |
|
@@ -940,6 +938,9 @@ typedef enum {
|
940 | 938 | a client certificate for authentication. (Schannel) */
|
941 | 939 | #define CURLSSLOPT_AUTO_CLIENT_CERT (1<<5)
|
942 | 940 |
|
| 941 | +/* If possible, send data using TLS 1.3 early data */ |
| 942 | +#define CURLSSLOPT_EARLYDATA (1<<6) |
| 943 | + |
943 | 944 | /* The default connection attempt delay in milliseconds for happy eyeballs.
|
944 | 945 | CURLOPT_HAPPY_EYEBALLS_TIMEOUT_MS.3 and happy-eyeballs-timeout-ms.d document
|
945 | 946 | this value, keep them in sync. */
|
@@ -1250,8 +1251,7 @@ typedef enum {
|
1250 | 1251 | /* send linked-list of post-transfer QUOTE commands */
|
1251 | 1252 | CURLOPT(CURLOPT_POSTQUOTE, CURLOPTTYPE_SLISTPOINT, 39),
|
1252 | 1253 |
|
1253 |
| - /* OBSOLETE, do not use! */ |
1254 |
| - CURLOPT(CURLOPT_OBSOLETE40, CURLOPTTYPE_OBJECTPOINT, 40), |
| 1254 | + /* 40 is not used */ |
1255 | 1255 |
|
1256 | 1256 | /* talk a lot */
|
1257 | 1257 | CURLOPT(CURLOPT_VERBOSE, CURLOPTTYPE_LONG, 41),
|
@@ -1352,9 +1352,7 @@ typedef enum {
|
1352 | 1352 | /* Max amount of cached alive connections */
|
1353 | 1353 | CURLOPT(CURLOPT_MAXCONNECTS, CURLOPTTYPE_LONG, 71),
|
1354 | 1354 |
|
1355 |
| - /* OBSOLETE, do not use! */ |
1356 |
| - CURLOPT(CURLOPT_OBSOLETE72, CURLOPTTYPE_LONG, 72), |
1357 |
| - |
| 1355 | + /* 72 = OBSOLETE */ |
1358 | 1356 | /* 73 = OBSOLETE */
|
1359 | 1357 |
|
1360 | 1358 | /* Set to explicitly use a new connection for the upcoming transfer.
|
@@ -1398,7 +1396,7 @@ typedef enum {
|
1398 | 1396 | operation. Set filename to "-" (dash) to make it go to stdout. */
|
1399 | 1397 | CURLOPT(CURLOPT_COOKIEJAR, CURLOPTTYPE_STRINGPOINT, 82),
|
1400 | 1398 |
|
1401 |
| - /* Specify which SSL ciphers to use */ |
| 1399 | + /* Specify which TLS 1.2 (1.1, 1.0) ciphers to use */ |
1402 | 1400 | CURLOPT(CURLOPT_SSL_CIPHER_LIST, CURLOPTTYPE_STRINGPOINT, 83),
|
1403 | 1401 |
|
1404 | 1402 | /* Specify which HTTP version to use! This must be set to one of the
|
@@ -2022,7 +2020,7 @@ typedef enum {
|
2022 | 2020 | /* password for the SSL private key for proxy */
|
2023 | 2021 | CURLOPT(CURLOPT_PROXY_KEYPASSWD, CURLOPTTYPE_STRINGPOINT, 258),
|
2024 | 2022 |
|
2025 |
| - /* Specify which SSL ciphers to use for proxy */ |
| 2023 | + /* Specify which TLS 1.2 (1.1, 1.0) ciphers to use for proxy */ |
2026 | 2024 | CURLOPT(CURLOPT_PROXY_SSL_CIPHER_LIST, CURLOPTTYPE_STRINGPOINT, 259),
|
2027 | 2025 |
|
2028 | 2026 | /* CRL file for proxy */
|
@@ -2203,7 +2201,7 @@ typedef enum {
|
2203 | 2201 | /* specify which protocols that libcurl is allowed to follow directs to */
|
2204 | 2202 | CURLOPT(CURLOPT_REDIR_PROTOCOLS_STR, CURLOPTTYPE_STRINGPOINT, 319),
|
2205 | 2203 |
|
2206 |
| - /* websockets options */ |
| 2204 | + /* WebSockets options */ |
2207 | 2205 | CURLOPT(CURLOPT_WS_OPTIONS, CURLOPTTYPE_LONG, 320),
|
2208 | 2206 |
|
2209 | 2207 | /* CA cache timeout */
|
@@ -2645,7 +2643,7 @@ CURL_EXTERN char *curl_getenv(const char *variable);
|
2645 | 2643 | *
|
2646 | 2644 | * DESCRIPTION
|
2647 | 2645 | *
|
2648 |
| - * Returns a static ascii string of the libcurl version. |
| 2646 | + * Returns a static ASCII string of the libcurl version. |
2649 | 2647 | */
|
2650 | 2648 | CURL_EXTERN char *curl_version(void);
|
2651 | 2649 |
|
@@ -2953,7 +2951,9 @@ typedef enum {
|
2953 | 2951 | CURLINFO_CONN_ID = CURLINFO_OFF_T + 64,
|
2954 | 2952 | CURLINFO_QUEUE_TIME_T = CURLINFO_OFF_T + 65,
|
2955 | 2953 | CURLINFO_USED_PROXY = CURLINFO_LONG + 66,
|
2956 |
| - CURLINFO_LASTONE = 66 |
| 2954 | + CURLINFO_POSTTRANSFER_TIME_T = CURLINFO_OFF_T + 67, |
| 2955 | + CURLINFO_EARLYDATA_SENT_T = CURLINFO_OFF_T + 68, |
| 2956 | + CURLINFO_LASTONE = 68 |
2957 | 2957 | } CURLINFO;
|
2958 | 2958 |
|
2959 | 2959 | /* CURLINFO_RESPONSE_CODE is the new name for the option previously known as
|
@@ -3236,7 +3236,9 @@ CURL_EXTERN CURLcode curl_easy_pause(CURL *handle, int bitmask);
|
3236 | 3236 | #include "options.h"
|
3237 | 3237 | #include "header.h"
|
3238 | 3238 | #include "websockets.h"
|
| 3239 | +#ifndef CURL_SKIP_INCLUDE_MPRINTF |
3239 | 3240 | #include "mprintf.h"
|
| 3241 | +#endif |
3240 | 3242 |
|
3241 | 3243 | /* the typechecker does not work in C++ (yet) */
|
3242 | 3244 | #if defined(__GNUC__) && defined(__GNUC_MINOR__) && \
|
|
0 commit comments