Skip to content
This repository was archived by the owner on Jan 16, 2024. It is now read-only.

Commit edfa7f8

Browse files
jeroenjeroen
committed
update entire stack
1 parent 9c553aa commit edfa7f8

24 files changed

+243
-174
lines changed

‎include/curl/curl.h‎

Lines changed: 123 additions & 84 deletions
Large diffs are not rendered by default.

‎include/curl/curlbuild.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
*
1313
* This software is licensed as described in the file COPYING, which
1414
* you should have received as part of this distribution. The terms
15-
* are also available at http://curl.haxx.se/docs/copyright.html.
15+
* are also available at https://curl.haxx.se/docs/copyright.html.
1616
*
1717
* You may opt to use, copy, modify, merge, publish, distribute and/or sell
1818
* copies of the Software, and permit persons to whom the Software is
@@ -36,7 +36,7 @@
3636
*
3737
* If you think that something actually needs to be changed, adjusted
3838
* or fixed in this file, then, report it on the libcurl development
39-
* mailing list: http://cool.haxx.se/mailman/listinfo/curl-library/
39+
* mailing list: https://cool.haxx.se/mailman/listinfo/curl-library/
4040
*
4141
* This header file shall only export symbols which are 'curl' or 'CURL'
4242
* prefixed, otherwise public name space would be polluted.

‎include/curl/curlrules.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
*
1212
* This software is licensed as described in the file COPYING, which
1313
* you should have received as part of this distribution. The terms
14-
* are also available at http://curl.haxx.se/docs/copyright.html.
14+
* are also available at https://curl.haxx.se/docs/copyright.html.
1515
*
1616
* You may opt to use, copy, modify, merge, publish, distribute and/or sell
1717
* copies of the Software, and permit persons to whom the Software is
@@ -47,7 +47,7 @@
4747
* library is properly built and used.
4848
*
4949
* You can find further help on the libcurl development mailing list:
50-
* http://cool.haxx.se/mailman/listinfo/curl-library/
50+
* https://cool.haxx.se/mailman/listinfo/curl-library/
5151
*
5252
* NOTE 2
5353
* ------

‎include/curl/curlver.h‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@
77
* | (__| |_| | _ <| |___
88
* \___|\___/|_| \_\_____|
99
*
10-
* Copyright (C) 1998 - 2015, Daniel Stenberg, <[email protected]>, et al.
10+
* Copyright (C) 1998 - 2016, Daniel Stenberg, <[email protected]>, et al.
1111
*
1212
* This software is licensed as described in the file COPYING, which
1313
* you should have received as part of this distribution. The terms
14-
* are also available at http://curl.haxx.se/docs/copyright.html.
14+
* are also available at https://curl.haxx.se/docs/copyright.html.
1515
*
1616
* You may opt to use, copy, modify, merge, publish, distribute and/or sell
1717
* copies of the Software, and permit persons to whom the Software is
@@ -26,17 +26,17 @@
2626
a script at release-time. This was made its own header file in 7.11.2 */
2727

2828
/* This is the global package copyright */
29-
#define LIBCURL_COPYRIGHT "1996 - 2015 Daniel Stenberg, <[email protected]>."
29+
#define LIBCURL_COPYRIGHT "1996 - 2016 Daniel Stenberg, <[email protected]>."
3030

3131
/* This is the version number of the libcurl package from which this header
3232
file origins: */
33-
#define LIBCURL_VERSION "7.43.0"
33+
#define LIBCURL_VERSION "7.47.1"
3434

3535
/* The numeric version number is also available "in parts" by using these
3636
defines: */
3737
#define LIBCURL_VERSION_MAJOR 7
38-
#define LIBCURL_VERSION_MINOR 43
39-
#define LIBCURL_VERSION_PATCH 0
38+
#define LIBCURL_VERSION_MINOR 47
39+
#define LIBCURL_VERSION_PATCH 1
4040

4141
/* This is the numeric version of the libcurl version number, meant for easier
4242
parsing and comparions by programs. The LIBCURL_VERSION_NUM define will
@@ -57,7 +57,7 @@
5757
CURL_VERSION_BITS() macro since curl's own configure script greps for it
5858
and needs it to contain the full number.
5959
*/
60-
#define LIBCURL_VERSION_NUM 0x072b00
60+
#define LIBCURL_VERSION_NUM 0x072f01
6161

6262
/*
6363
* This is the date and time when the full source package was created. The
@@ -68,7 +68,7 @@
6868
*
6969
* "Mon Feb 12 11:35:33 UTC 2007"
7070
*/
71-
#define LIBCURL_TIMESTAMP "Wed Jun 17 05:56:00 UTC 2015"
71+
#define LIBCURL_TIMESTAMP "Mon Feb 8 09:27:16 UTC 2016"
7272

7373
#define CURL_VERSION_BITS(x,y,z) ((x)<<16|(y)<<8|z)
7474
#define CURL_AT_LEAST_VERSION(x,y,z) \

‎include/curl/easy.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
*
1212
* This software is licensed as described in the file COPYING, which
1313
* you should have received as part of this distribution. The terms
14-
* are also available at http://curl.haxx.se/docs/copyright.html.
14+
* are also available at https://curl.haxx.se/docs/copyright.html.
1515
*
1616
* You may opt to use, copy, modify, merge, publish, distribute and/or sell
1717
* copies of the Software, and permit persons to whom the Software is

‎include/curl/mprintf.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
*
1212
* This software is licensed as described in the file COPYING, which
1313
* you should have received as part of this distribution. The terms
14-
* are also available at http://curl.haxx.se/docs/copyright.html.
14+
* are also available at https://curl.haxx.se/docs/copyright.html.
1515
*
1616
* You may opt to use, copy, modify, merge, publish, distribute and/or sell
1717
* copies of the Software, and permit persons to whom the Software is

‎include/curl/multi.h‎

Lines changed: 32 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
*
1212
* This software is licensed as described in the file COPYING, which
1313
* you should have received as part of this distribution. The terms
14-
* are also available at http://curl.haxx.se/docs/copyright.html.
14+
* are also available at https://curl.haxx.se/docs/copyright.html.
1515
*
1616
* You may opt to use, copy, modify, merge, publish, distribute and/or sell
1717
* copies of the Software, and permit persons to whom the Software is
@@ -370,6 +370,12 @@ typedef enum {
370370
/* maximum number of open connections in total */
371371
CINIT(MAX_TOTAL_CONNECTIONS, LONG, 13),
372372

373+
/* This is the server push callback function pointer */
374+
CINIT(PUSHFUNCTION, FUNCTIONPOINT, 14),
375+
376+
/* This is the argument passed to the server push callback */
377+
CINIT(PUSHDATA, OBJECTPOINT, 15),
378+
373379
CURLMOPT_LASTENTRY /* the last unused */
374380
} CURLMoption;
375381

@@ -397,6 +403,31 @@ CURL_EXTERN CURLMcode curl_multi_setopt(CURLM *multi_handle,
397403
CURL_EXTERN CURLMcode curl_multi_assign(CURLM *multi_handle,
398404
curl_socket_t sockfd, void *sockp);
399405

406+
407+
/*
408+
* Name: curl_push_callback
409+
*
410+
* Desc: This callback gets called when a new stream is being pushed by the
411+
* server. It approves or denies the new stream.
412+
*
413+
* Returns: CURL_PUSH_OK or CURL_PUSH_DENY.
414+
*/
415+
#define CURL_PUSH_OK 0
416+
#define CURL_PUSH_DENY 1
417+
418+
struct curl_pushheaders; /* forward declaration only */
419+
420+
CURL_EXTERN char *curl_pushheader_bynum(struct curl_pushheaders *h,
421+
size_t num);
422+
CURL_EXTERN char *curl_pushheader_byname(struct curl_pushheaders *h,
423+
const char *name);
424+
425+
typedef int (*curl_push_callback)(CURL *parent,
426+
CURL *easy,
427+
size_t num_headers,
428+
struct curl_pushheaders *headers,
429+
void *userp);
430+
400431
#ifdef __cplusplus
401432
} /* end of extern "C" */
402433
#endif

‎include/curl/stdcheaders.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
*
1212
* This software is licensed as described in the file COPYING, which
1313
* you should have received as part of this distribution. The terms
14-
* are also available at http://curl.haxx.se/docs/copyright.html.
14+
* are also available at https://curl.haxx.se/docs/copyright.html.
1515
*
1616
* You may opt to use, copy, modify, merge, publish, distribute and/or sell
1717
* copies of the Software, and permit persons to whom the Software is

‎include/curl/typecheck-gcc.h‎

Lines changed: 67 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@
77
* | (__| |_| | _ <| |___
88
* \___|\___/|_| \_\_____|
99
*
10-
* Copyright (C) 1998 - 2014, Daniel Stenberg, <[email protected]>, et al.
10+
* Copyright (C) 1998 - 2015, Daniel Stenberg, <[email protected]>, et al.
1111
*
1212
* This software is licensed as described in the file COPYING, which
1313
* you should have received as part of this distribution. The terms
14-
* are also available at http://curl.haxx.se/docs/copyright.html.
14+
* are also available at https://curl.haxx.se/docs/copyright.html.
1515
*
1616
* You may opt to use, copy, modify, merge, publish, distribute and/or sell
1717
* copies of the Software, and permit persons to whom the Software is
@@ -218,60 +218,67 @@ _CURL_WARNING(_curl_easy_getinfo_err_curl_slist,
218218

219219
/* evaluates to true if option takes a char* argument */
220220
#define _curl_is_string_option(option) \
221-
((option) == CURLOPT_URL || \
222-
(option) == CURLOPT_PROXY || \
223-
(option) == CURLOPT_INTERFACE || \
224-
(option) == CURLOPT_NETRC_FILE || \
225-
(option) == CURLOPT_USERPWD || \
226-
(option) == CURLOPT_USERNAME || \
227-
(option) == CURLOPT_PASSWORD || \
228-
(option) == CURLOPT_PROXYUSERPWD || \
229-
(option) == CURLOPT_PROXYUSERNAME || \
230-
(option) == CURLOPT_PROXYPASSWORD || \
231-
(option) == CURLOPT_NOPROXY || \
232-
(option) == CURLOPT_ACCEPT_ENCODING || \
233-
(option) == CURLOPT_REFERER || \
234-
(option) == CURLOPT_USERAGENT || \
221+
((option) == CURLOPT_ACCEPT_ENCODING || \
222+
(option) == CURLOPT_CAINFO || \
223+
(option) == CURLOPT_CAPATH || \
235224
(option) == CURLOPT_COOKIE || \
236225
(option) == CURLOPT_COOKIEFILE || \
237226
(option) == CURLOPT_COOKIEJAR || \
238227
(option) == CURLOPT_COOKIELIST || \
228+
(option) == CURLOPT_CRLFILE || \
229+
(option) == CURLOPT_CUSTOMREQUEST || \
230+
(option) == CURLOPT_DEFAULT_PROTOCOL || \
231+
(option) == CURLOPT_DNS_INTERFACE || \
232+
(option) == CURLOPT_DNS_LOCAL_IP4 || \
233+
(option) == CURLOPT_DNS_LOCAL_IP6 || \
234+
(option) == CURLOPT_DNS_SERVERS || \
235+
(option) == CURLOPT_EGDSOCKET || \
239236
(option) == CURLOPT_FTPPORT || \
240-
(option) == CURLOPT_FTP_ALTERNATIVE_TO_USER || \
241237
(option) == CURLOPT_FTP_ACCOUNT || \
242-
(option) == CURLOPT_RANGE || \
243-
(option) == CURLOPT_CUSTOMREQUEST || \
244-
(option) == CURLOPT_SSLCERT || \
245-
(option) == CURLOPT_SSLCERTTYPE || \
246-
(option) == CURLOPT_SSLKEY || \
247-
(option) == CURLOPT_SSLKEYTYPE || \
238+
(option) == CURLOPT_FTP_ALTERNATIVE_TO_USER || \
239+
(option) == CURLOPT_INTERFACE || \
240+
(option) == CURLOPT_ISSUERCERT || \
248241
(option) == CURLOPT_KEYPASSWD || \
249-
(option) == CURLOPT_SSLENGINE || \
250-
(option) == CURLOPT_CAINFO || \
251-
(option) == CURLOPT_CAPATH || \
252-
(option) == CURLOPT_RANDOM_FILE || \
253-
(option) == CURLOPT_EGDSOCKET || \
254-
(option) == CURLOPT_SSL_CIPHER_LIST || \
255242
(option) == CURLOPT_KRBLEVEL || \
256-
(option) == CURLOPT_SSH_HOST_PUBLIC_KEY_MD5 || \
257-
(option) == CURLOPT_SSH_PUBLIC_KEYFILE || \
258-
(option) == CURLOPT_SSH_PRIVATE_KEYFILE || \
259-
(option) == CURLOPT_CRLFILE || \
260-
(option) == CURLOPT_ISSUERCERT || \
261-
(option) == CURLOPT_SOCKS5_GSSAPI_SERVICE || \
262-
(option) == CURLOPT_SSH_KNOWNHOSTS || \
243+
(option) == CURLOPT_LOGIN_OPTIONS || \
244+
(option) == CURLOPT_MAIL_AUTH || \
263245
(option) == CURLOPT_MAIL_FROM || \
246+
(option) == CURLOPT_NETRC_FILE || \
247+
(option) == CURLOPT_NOPROXY || \
248+
(option) == CURLOPT_PASSWORD || \
249+
(option) == CURLOPT_PINNEDPUBLICKEY || \
250+
(option) == CURLOPT_PROXY || \
251+
(option) == CURLOPT_PROXYPASSWORD || \
252+
(option) == CURLOPT_PROXYUSERNAME || \
253+
(option) == CURLOPT_PROXYUSERPWD || \
254+
(option) == CURLOPT_PROXY_SERVICE_NAME || \
255+
(option) == CURLOPT_RANDOM_FILE || \
256+
(option) == CURLOPT_RANGE || \
257+
(option) == CURLOPT_REFERER || \
264258
(option) == CURLOPT_RTSP_SESSION_ID || \
265259
(option) == CURLOPT_RTSP_STREAM_URI || \
266260
(option) == CURLOPT_RTSP_TRANSPORT || \
267-
(option) == CURLOPT_XOAUTH2_BEARER || \
268-
(option) == CURLOPT_DNS_SERVERS || \
269-
(option) == CURLOPT_DNS_INTERFACE || \
270-
(option) == CURLOPT_DNS_LOCAL_IP4 || \
271-
(option) == CURLOPT_DNS_LOCAL_IP6 || \
272-
(option) == CURLOPT_LOGIN_OPTIONS || \
273-
(option) == CURLOPT_PROXY_SERVICE_NAME || \
274261
(option) == CURLOPT_SERVICE_NAME || \
262+
(option) == CURLOPT_SOCKS5_GSSAPI_SERVICE || \
263+
(option) == CURLOPT_SSH_HOST_PUBLIC_KEY_MD5 || \
264+
(option) == CURLOPT_SSH_KNOWNHOSTS || \
265+
(option) == CURLOPT_SSH_PRIVATE_KEYFILE || \
266+
(option) == CURLOPT_SSH_PUBLIC_KEYFILE || \
267+
(option) == CURLOPT_SSLCERT || \
268+
(option) == CURLOPT_SSLCERTTYPE || \
269+
(option) == CURLOPT_SSLENGINE || \
270+
(option) == CURLOPT_SSLKEY || \
271+
(option) == CURLOPT_SSLKEYTYPE || \
272+
(option) == CURLOPT_SSL_CIPHER_LIST || \
273+
(option) == CURLOPT_TLSAUTH_PASSWORD || \
274+
(option) == CURLOPT_TLSAUTH_TYPE || \
275+
(option) == CURLOPT_TLSAUTH_USERNAME || \
276+
(option) == CURLOPT_UNIX_SOCKET_PATH || \
277+
(option) == CURLOPT_URL || \
278+
(option) == CURLOPT_USERAGENT || \
279+
(option) == CURLOPT_USERNAME || \
280+
(option) == CURLOPT_USERPWD || \
281+
(option) == CURLOPT_XOAUTH2_BEARER || \
275282
0)
276283

277284
/* evaluates to true if option takes a curl_write_callback argument */
@@ -287,21 +294,22 @@ _CURL_WARNING(_curl_easy_getinfo_err_curl_slist,
287294

288295
/* evaluates to true if option takes a data argument to pass to a callback */
289296
#define _curl_is_cb_data_option(option) \
290-
((option) == CURLOPT_WRITEDATA || \
291-
(option) == CURLOPT_READDATA || \
297+
((option) == CURLOPT_CHUNK_DATA || \
298+
(option) == CURLOPT_CLOSESOCKETDATA || \
299+
(option) == CURLOPT_DEBUGDATA || \
300+
(option) == CURLOPT_FNMATCH_DATA || \
301+
(option) == CURLOPT_HEADERDATA || \
302+
(option) == CURLOPT_INTERLEAVEDATA || \
292303
(option) == CURLOPT_IOCTLDATA || \
293-
(option) == CURLOPT_SOCKOPTDATA || \
294304
(option) == CURLOPT_OPENSOCKETDATA || \
305+
(option) == CURLOPT_PRIVATE || \
295306
(option) == CURLOPT_PROGRESSDATA || \
296-
(option) == CURLOPT_HEADERDATA || \
297-
(option) == CURLOPT_DEBUGDATA || \
298-
(option) == CURLOPT_SSL_CTX_DATA || \
307+
(option) == CURLOPT_READDATA || \
299308
(option) == CURLOPT_SEEKDATA || \
300-
(option) == CURLOPT_PRIVATE || \
309+
(option) == CURLOPT_SOCKOPTDATA || \
301310
(option) == CURLOPT_SSH_KEYDATA || \
302-
(option) == CURLOPT_INTERLEAVEDATA || \
303-
(option) == CURLOPT_CHUNK_DATA || \
304-
(option) == CURLOPT_FNMATCH_DATA || \
311+
(option) == CURLOPT_SSL_CTX_DATA || \
312+
(option) == CURLOPT_WRITEDATA || \
305313
0)
306314

307315
/* evaluates to true if option takes a POST data argument (void* or char*) */
@@ -312,13 +320,15 @@ _CURL_WARNING(_curl_easy_getinfo_err_curl_slist,
312320

313321
/* evaluates to true if option takes a struct curl_slist * argument */
314322
#define _curl_is_slist_option(option) \
315-
((option) == CURLOPT_HTTPHEADER || \
316-
(option) == CURLOPT_HTTP200ALIASES || \
317-
(option) == CURLOPT_QUOTE || \
323+
((option) == CURLOPT_HTTP200ALIASES || \
324+
(option) == CURLOPT_HTTPHEADER || \
325+
(option) == CURLOPT_MAIL_RCPT || \
318326
(option) == CURLOPT_POSTQUOTE || \
319327
(option) == CURLOPT_PREQUOTE || \
328+
(option) == CURLOPT_PROXYHEADER || \
329+
(option) == CURLOPT_QUOTE || \
330+
(option) == CURLOPT_RESOLVE || \
320331
(option) == CURLOPT_TELNETOPTIONS || \
321-
(option) == CURLOPT_MAIL_RCPT || \
322332
0)
323333

324334
/* groups of curl_easy_getinfo infos that take the same type of argument */

‎lib/i386/libcrypto.a‎

2.93 KB
Binary file not shown.

0 commit comments

Comments
 (0)