Skip to content

Commit 3a24189

Browse files
committed
Updated lib versions
1 parent 65de106 commit 3a24189

File tree

19 files changed

+427
-255
lines changed

19 files changed

+427
-255
lines changed

example/iOS Test App/cacert.pem

Lines changed: 296 additions & 181 deletions
Large diffs are not rendered by default.

example/iOS Test App/iOS Test App.xcodeproj/project.pbxproj

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -337,6 +337,7 @@
337337
"$(PROJECT_DIR)/include/**",
338338
);
339339
INFOPLIST_FILE = "iOS Test App/Info.plist";
340+
"IPHONEOS_DEPLOYMENT_TARGET[sdk=macosx*]" = 14.2;
340341
LD_RUNPATH_SEARCH_PATHS = (
341342
"$(inherited)",
342343
"@executable_path/Frameworks",
@@ -350,6 +351,7 @@
350351
PRODUCT_BUNDLE_IDENTIFIER = "com.jasonacox.iOS-Test-App";
351352
PRODUCT_NAME = "$(TARGET_NAME)";
352353
SUPPORTS_MACCATALYST = YES;
354+
TARGETED_DEVICE_FAMILY = "1,2,6";
353355
USE_HEADERMAP = YES;
354356
};
355357
name = Debug;
@@ -366,6 +368,7 @@
366368
"$(PROJECT_DIR)/include/**",
367369
);
368370
INFOPLIST_FILE = "iOS Test App/Info.plist";
371+
"IPHONEOS_DEPLOYMENT_TARGET[sdk=macosx*]" = 14.2;
369372
LD_RUNPATH_SEARCH_PATHS = (
370373
"$(inherited)",
371374
"@executable_path/Frameworks",
@@ -379,6 +382,7 @@
379382
PRODUCT_BUNDLE_IDENTIFIER = "com.jasonacox.iOS-Test-App";
380383
PRODUCT_NAME = "$(TARGET_NAME)";
381384
SUPPORTS_MACCATALYST = YES;
385+
TARGETED_DEVICE_FAMILY = "1,2,6";
382386
USE_HEADERMAP = YES;
383387
};
384388
name = Release;

example/iOS Test App/iOS Test App/AppDelegate.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
//
99
// COPYRIGHT AND PERMISSION NOTICE
1010
//
11-
// Copyright (c) 2014-2021 Jason A. Cox, jason@jasonacox.com, and contributors,
11+
// Copyright (c) 2014-2022 Jason A. Cox, jason@jasonacox.com, and contributors,
1212
// see the THANKS file.
1313
//
1414
// All rights reserved.

example/iOS Test App/iOS Test App/AppDelegate.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
//
77
// COPYRIGHT AND PERMISSION NOTICE
88
//
9-
// Copyright (c) 2014-2021 Jason A. Cox, jasonacox@me.com, and many contributors,
9+
// Copyright (c) 2014-2022 Jason A. Cox, jasonacox@me.com, and many contributors,
1010
// see the THANKS file.
1111
//
1212
// All rights reserved.

example/iOS Test App/iOS Test App/ViewController.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
//
77
// COPYRIGHT AND PERMISSION NOTICE
88
//
9-
// Copyright (c) 2014-2021 Jason A. Cox, jasonacox@me.com, and many contributors,
9+
// Copyright (c) 2014-2022 Jason A. Cox, jasonacox@me.com, and many contributors,
1010
// see the THANKS file.
1111
//
1212
// All rights reserved.

example/iOS Test App/iOS Test App/ViewController.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
//
77
// COPYRIGHT AND PERMISSION NOTICE
88
//
9-
// Copyright (c) 2014-2021 Jason A. Cox, jasonacox@me.com, and many contributors,
9+
// Copyright (c) 2014-2022 Jason A. Cox, jasonacox@me.com, and many contributors,
1010
// see the THANKS file.
1111
//
1212
// All rights reserved.

example/iOS Test App/iOS Test App/main.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
// iOS Test App
44
//
55
// Created by Jason on 11/19/16.
6-
// Copyright © 2016 Jason Cox. All rights reserved.
6+
// Copyright © 2016-2022 Jason Cox. All rights reserved.
77
//
88

99
#import <UIKit/UIKit.h>

example/iOS Test App/include/curl/curl.h

Lines changed: 16 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* | (__| |_| | _ <| |___
88
* \___|\___/|_| \_\_____|
99
*
10-
* Copyright (C) 1998 - 2021, Daniel Stenberg, <daniel@haxx.se>, et al.
10+
* Copyright (C) 1998 - 2022, Daniel Stenberg, <daniel@haxx.se>, 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
@@ -73,23 +73,18 @@
7373
defined(ANDROID) || defined(__ANDROID__) || defined(__OpenBSD__) || \
7474
defined(__CYGWIN__) || defined(AMIGA) || defined(__NuttX__) || \
7575
(defined(__FreeBSD_version) && (__FreeBSD_version < 800000)) || \
76-
(defined(__MidnightBSD_version) && (__MidnightBSD_version < 100000)) || \
77-
defined(__VXWORKS__)
76+
(defined(__MidnightBSD_version) && (__MidnightBSD_version < 100000))
7877
#include <sys/select.h>
7978
#endif
8079

8180
#if !defined(CURL_WIN32) && !defined(_WIN32_WCE)
8281
#include <sys/socket.h>
8382
#endif
8483

85-
#if !defined(CURL_WIN32) && !defined(__WATCOMC__) && !defined(__VXWORKS__)
84+
#if !defined(CURL_WIN32)
8685
#include <sys/time.h>
8786
#endif
8887

89-
#ifdef __BEOS__
90-
#include <support/SupportDefs.h>
91-
#endif
92-
9388
/* Compatibility for non-Clang compilers */
9489
#ifndef __has_declspec_attribute
9590
# define __has_declspec_attribute(x) 0
@@ -529,10 +524,6 @@ typedef enum {
529524
CURLE_UPLOAD_FAILED, /* 25 - failed upload "command" */
530525
CURLE_READ_ERROR, /* 26 - couldn't open/read from file */
531526
CURLE_OUT_OF_MEMORY, /* 27 */
532-
/* Note: CURLE_OUT_OF_MEMORY may sometimes indicate a conversion error
533-
instead of a memory allocation error if CURL_DOES_CONVERSIONS
534-
is defined
535-
*/
536527
CURLE_OPERATION_TIMEDOUT, /* 28 - the timeout time was reached */
537528
CURLE_OBSOLETE29, /* 29 - NOT USED */
538529
CURLE_FTP_PORT_FAILED, /* 30 - FTP PORT operation failed */
@@ -569,7 +560,7 @@ typedef enum {
569560
CURLE_PEER_FAILED_VERIFICATION, /* 60 - peer's certificate or fingerprint
570561
wasn't verified fine */
571562
CURLE_BAD_CONTENT_ENCODING, /* 61 - Unrecognized/bad encoding */
572-
CURLE_LDAP_INVALID_URL, /* 62 - Invalid LDAP URL */
563+
CURLE_OBSOLETE62, /* 62 - NOT IN USE since 7.82.0 */
573564
CURLE_FILESIZE_EXCEEDED, /* 63 - Maximum file size exceeded */
574565
CURLE_USE_SSL_FAILED, /* 64 - Requested FTP SSL level failed */
575566
CURLE_SEND_FAIL_REWIND, /* 65 - Sending the data requires a rewind
@@ -585,11 +576,7 @@ typedef enum {
585576
CURLE_REMOTE_FILE_EXISTS, /* 73 - File already exists */
586577
CURLE_TFTP_NOSUCHUSER, /* 74 - No such user */
587578
CURLE_CONV_FAILED, /* 75 - conversion failed */
588-
CURLE_CONV_REQD, /* 76 - caller must register conversion
589-
callbacks using curl_easy_setopt options
590-
CURLOPT_CONV_FROM_NETWORK_FUNCTION,
591-
CURLOPT_CONV_TO_NETWORK_FUNCTION, and
592-
CURLOPT_CONV_FROM_UTF8_FUNCTION */
579+
CURLE_OBSOLETE76, /* 76 - NOT IN USE since 7.82.0 */
593580
CURLE_SSL_CACERT_BADFILE, /* 77 - could not load CACERT file, missing
594581
or wrong format */
595582
CURLE_REMOTE_FILE_NOT_FOUND, /* 78 - remote file not found */
@@ -683,13 +670,13 @@ typedef enum {
683670
/* The following were added earlier */
684671

685672
#define CURLE_OPERATION_TIMEOUTED CURLE_OPERATION_TIMEDOUT
686-
687673
#define CURLE_HTTP_NOT_FOUND CURLE_HTTP_RETURNED_ERROR
688674
#define CURLE_HTTP_PORT_FAILED CURLE_INTERFACE_FAILED
689675
#define CURLE_FTP_COULDNT_STOR_FILE CURLE_UPLOAD_FAILED
690-
691676
#define CURLE_FTP_PARTIAL_FILE CURLE_PARTIAL_FILE
692677
#define CURLE_FTP_BAD_DOWNLOAD_RESUME CURLE_BAD_DOWNLOAD_RESUME
678+
#define CURLE_LDAP_INVALID_URL CURLE_OBSOLETE62
679+
#define CURLE_CONV_REQD CURLE_OBSOLETE76
693680

694681
/* This was the error code 50 in 7.7.3 and a few earlier versions, this
695682
is no longer used by libcurl but is instead #defined here only to not
@@ -2062,7 +2049,7 @@ typedef enum {
20622049
* (in seconds) */
20632050
CURLOPT(CURLOPT_MAXAGE_CONN, CURLOPTTYPE_LONG, 288),
20642051

2065-
/* SASL authorisation identity */
2052+
/* SASL authorization identity */
20662053
CURLOPT(CURLOPT_SASL_AUTHZID, CURLOPTTYPE_STRINGPOINT, 289),
20672054

20682055
/* allow RCPT TO command to fail for some recipients */
@@ -2132,6 +2119,9 @@ typedef enum {
21322119
* (in seconds) */
21332120
CURLOPT(CURLOPT_MAXLIFETIME_CONN, CURLOPTTYPE_LONG, 314),
21342121

2122+
/* Set MIME option flags. */
2123+
CURLOPT(CURLOPT_MIME_OPTIONS, CURLOPTTYPE_LONG, 315),
2124+
21352125
CURLOPT_LASTENTRY /* the last unused */
21362126
} CURLoption;
21372127

@@ -2291,6 +2281,9 @@ CURL_EXTERN int curl_strnequal(const char *s1, const char *s2, size_t n);
22912281
typedef struct curl_mime curl_mime; /* Mime context. */
22922282
typedef struct curl_mimepart curl_mimepart; /* Mime part context. */
22932283

2284+
/* CURLMIMEOPT_ defines are for the CURLOPT_MIME_OPTIONS option. */
2285+
#define CURLMIMEOPT_FORMESCAPE (1<<0) /* Use backslash-escaping for forms. */
2286+
22942287
/*
22952288
* NAME curl_mime_init()
22962289
*
@@ -2826,7 +2819,7 @@ typedef enum {
28262819
CURLCLOSEPOLICY_LAST /* last, never use this */
28272820
} curl_closepolicy;
28282821

2829-
#define CURL_GLOBAL_SSL (1<<0) /* no purpose since since 7.57.0 */
2822+
#define CURL_GLOBAL_SSL (1<<0) /* no purpose since 7.57.0 */
28302823
#define CURL_GLOBAL_WIN32 (1<<1)
28312824
#define CURL_GLOBAL_ALL (CURL_GLOBAL_SSL|CURL_GLOBAL_WIN32)
28322825
#define CURL_GLOBAL_NOTHING 0
@@ -3076,6 +3069,7 @@ CURL_EXTERN CURLcode curl_easy_pause(CURL *handle, int bitmask);
30763069
#include "multi.h"
30773070
#include "urlapi.h"
30783071
#include "options.h"
3072+
#include "header.h"
30793073

30803074
/* the typechecker doesn't work in C++ (yet) */
30813075
#if defined(__GNUC__) && defined(__GNUC_MINOR__) && \

example/iOS Test App/include/curl/curlver.h

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* | (__| |_| | _ <| |___
88
* \___|\___/|_| \_\_____|
99
*
10-
* Copyright (C) 1998 - 2021, Daniel Stenberg, <daniel@haxx.se>, et al.
10+
* Copyright (C) 1998 - 2022, Daniel Stenberg, <daniel@haxx.se>, 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
@@ -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 - 2021 Daniel Stenberg, <daniel@haxx.se>."
29+
#define LIBCURL_COPYRIGHT "1996 - 2022 Daniel Stenberg, <daniel@haxx.se>."
3030

3131
/* This is the version number of the libcurl package from which this header
3232
file origins: */
33-
#define LIBCURL_VERSION "7.80.0"
33+
#define LIBCURL_VERSION "7.83.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 80
39-
#define LIBCURL_VERSION_PATCH 0
38+
#define LIBCURL_VERSION_MINOR 83
39+
#define LIBCURL_VERSION_PATCH 1
4040

4141
/* This is the numeric version of the libcurl version number, meant for easier
4242
parsing and comparisons 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 0x075000
60+
#define LIBCURL_VERSION_NUM 0x075301
6161

6262
/*
6363
* This is the date and time when the full source package was created. The
@@ -68,7 +68,7 @@
6868
*
6969
* "2007-11-23"
7070
*/
71-
#define LIBCURL_TIMESTAMP "2021-11-10"
71+
#define LIBCURL_TIMESTAMP "2022-05-11"
7272

7373
#define CURL_VERSION_BITS(x,y,z) ((x)<<16|(y)<<8|(z))
7474
#define CURL_AT_LEAST_VERSION(x,y,z) \
Lines changed: 64 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
1+
#ifndef CURLINC_HEADER_H
2+
#define CURLINC_HEADER_H
3+
/***************************************************************************
4+
* _ _ ____ _
5+
* Project ___| | | | _ \| |
6+
* / __| | | | |_) | |
7+
* | (__| |_| | _ <| |___
8+
* \___|\___/|_| \_\_____|
9+
*
10+
* Copyright (C) 2018 - 2022, Daniel Stenberg, <daniel@haxx.se>, et al.
11+
*
12+
* This software is licensed as described in the file COPYING, which
13+
* you should have received as part of this distribution. The terms
14+
* are also available at https://curl.se/docs/copyright.html.
15+
*
16+
* You may opt to use, copy, modify, merge, publish, distribute and/or sell
17+
* copies of the Software, and permit persons to whom the Software is
18+
* furnished to do so, under the terms of the COPYING file.
19+
*
20+
* This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
21+
* KIND, either express or implied.
22+
*
23+
***************************************************************************/
24+
25+
struct curl_header {
26+
char *name; /* this might not use the same case */
27+
char *value;
28+
size_t amount; /* number of headers using this name */
29+
size_t index; /* ... of this instance, 0 or higher */
30+
unsigned int origin; /* see bits below */
31+
void *anchor; /* handle privately used by libcurl */
32+
};
33+
34+
/* 'origin' bits */
35+
#define CURLH_HEADER (1<<0) /* plain server header */
36+
#define CURLH_TRAILER (1<<1) /* trailers */
37+
#define CURLH_CONNECT (1<<2) /* CONNECT headers */
38+
#define CURLH_1XX (1<<3) /* 1xx headers */
39+
#define CURLH_PSEUDO (1<<4) /* pseudo headers */
40+
41+
typedef enum {
42+
CURLHE_OK,
43+
CURLHE_BADINDEX, /* header exists but not with this index */
44+
CURLHE_MISSING, /* no such header exists */
45+
CURLHE_NOHEADERS, /* no headers at all exist (yet) */
46+
CURLHE_NOREQUEST, /* no request with this number was used */
47+
CURLHE_OUT_OF_MEMORY, /* out of memory while processing */
48+
CURLHE_BAD_ARGUMENT, /* a function argument was not okay */
49+
CURLHE_NOT_BUILT_IN /* if API was disabled in the build */
50+
} CURLHcode;
51+
52+
CURL_EXTERN CURLHcode curl_easy_header(CURL *easy,
53+
const char *name,
54+
size_t index,
55+
unsigned int origin,
56+
int request,
57+
struct curl_header **hout);
58+
59+
CURL_EXTERN struct curl_header *curl_easy_nextheader(CURL *easy,
60+
unsigned int origin,
61+
int request,
62+
struct curl_header *prev);
63+
64+
#endif /* CURLINC_HEADER_H */

0 commit comments

Comments
 (0)