Skip to content

Commit 05dbad8

Browse files
committed
Update iOS example
1 parent 1c64481 commit 05dbad8

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

149 files changed

+17163
-7434
lines changed

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

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -337,7 +337,6 @@
337337
"$(PROJECT_DIR)/include/**",
338338
);
339339
INFOPLIST_FILE = "iOS Test App/Info.plist";
340-
"IPHONEOS_DEPLOYMENT_TARGET[sdk=macosx*]" = 14.2;
341340
LD_RUNPATH_SEARCH_PATHS = (
342341
"$(inherited)",
343342
"@executable_path/Frameworks",
@@ -350,8 +349,8 @@
350349
MARKETING_VERSION = 1.1;
351350
PRODUCT_BUNDLE_IDENTIFIER = "com.jasonacox.iOS-Test-App";
352351
PRODUCT_NAME = "$(TARGET_NAME)";
353-
SUPPORTS_MACCATALYST = YES;
354-
TARGETED_DEVICE_FAMILY = "1,2,6";
352+
SUPPORTS_MACCATALYST = NO;
353+
TARGETED_DEVICE_FAMILY = "1,2";
355354
USE_HEADERMAP = YES;
356355
};
357356
name = Debug;
@@ -368,7 +367,6 @@
368367
"$(PROJECT_DIR)/include/**",
369368
);
370369
INFOPLIST_FILE = "iOS Test App/Info.plist";
371-
"IPHONEOS_DEPLOYMENT_TARGET[sdk=macosx*]" = 14.2;
372370
LD_RUNPATH_SEARCH_PATHS = (
373371
"$(inherited)",
374372
"@executable_path/Frameworks",
@@ -381,8 +379,8 @@
381379
MARKETING_VERSION = 1.1;
382380
PRODUCT_BUNDLE_IDENTIFIER = "com.jasonacox.iOS-Test-App";
383381
PRODUCT_NAME = "$(TARGET_NAME)";
384-
SUPPORTS_MACCATALYST = YES;
385-
TARGETED_DEVICE_FAMILY = "1,2,6";
382+
SUPPORTS_MACCATALYST = NO;
383+
TARGETED_DEVICE_FAMILY = "1,2";
386384
USE_HEADERMAP = YES;
387385
};
388386
name = Release;

example/iOS Test App/iOS Test App/cacert.pem

Lines changed: 93 additions & 190 deletions
Large diffs are not rendered by default.

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

Lines changed: 201 additions & 99 deletions
Large diffs are not rendered by default.

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* | (__| |_| | _ <| |___
88
* \___|\___/|_| \_\_____|
99
*
10-
* Copyright (C) 1998 - 2022, Daniel Stenberg, <daniel@haxx.se>, et al.
10+
* Copyright (C) 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
@@ -28,17 +28,17 @@
2828
a script at release-time. This was made its own header file in 7.11.2 */
2929

3030
/* This is the global package copyright */
31-
#define LIBCURL_COPYRIGHT "1996 - 2022 Daniel Stenberg, <daniel@haxx.se>."
31+
#define LIBCURL_COPYRIGHT "Daniel Stenberg, <daniel@haxx.se>."
3232

3333
/* This is the version number of the libcurl package from which this header
3434
file origins: */
35-
#define LIBCURL_VERSION "7.84.0"
35+
#define LIBCURL_VERSION "8.1.2"
3636

3737
/* The numeric version number is also available "in parts" by using these
3838
defines: */
39-
#define LIBCURL_VERSION_MAJOR 7
40-
#define LIBCURL_VERSION_MINOR 84
41-
#define LIBCURL_VERSION_PATCH 0
39+
#define LIBCURL_VERSION_MAJOR 8
40+
#define LIBCURL_VERSION_MINOR 1
41+
#define LIBCURL_VERSION_PATCH 2
4242

4343
/* This is the numeric version of the libcurl version number, meant for easier
4444
parsing and comparisons by programs. The LIBCURL_VERSION_NUM define will
@@ -59,7 +59,7 @@
5959
CURL_VERSION_BITS() macro since curl's own configure script greps for it
6060
and needs it to contain the full number.
6161
*/
62-
#define LIBCURL_VERSION_NUM 0x075400
62+
#define LIBCURL_VERSION_NUM 0x080102
6363

6464
/*
6565
* This is the date and time when the full source package was created. The
@@ -70,7 +70,7 @@
7070
*
7171
* "2007-11-23"
7272
*/
73-
#define LIBCURL_TIMESTAMP "2022-06-27"
73+
#define LIBCURL_TIMESTAMP "2023-05-30"
7474

7575
#define CURL_VERSION_BITS(x,y,z) ((x)<<16|(y)<<8|(z))
7676
#define CURL_AT_LEAST_VERSION(x,y,z) \

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

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* | (__| |_| | _ <| |___
88
* \___|\___/|_| \_\_____|
99
*
10-
* Copyright (C) 1998 - 2022, Daniel Stenberg, <daniel@haxx.se>, et al.
10+
* Copyright (C) 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
@@ -48,13 +48,13 @@ CURL_EXTERN void curl_easy_cleanup(CURL *curl);
4848
*
4949
* DESCRIPTION
5050
*
51-
* Request internal information from the curl session with this function. The
52-
* third argument MUST be a pointer to a long, a pointer to a char * or a
53-
* pointer to a double (as the documentation describes elsewhere). The data
54-
* pointed to will be filled in accordingly and can be relied upon only if the
55-
* function returns CURLE_OK. This function is intended to get used *AFTER* a
56-
* performed transfer, all results from this function are undefined until the
57-
* transfer is completed.
51+
* Request internal information from the curl session with this function.
52+
* The third argument MUST be pointing to the specific type of the used option
53+
* which is documented in each man page of the option. The data pointed to
54+
* will be filled in accordingly and can be relied upon only if the function
55+
* returns CURLE_OK. This function is intended to get used *AFTER* a performed
56+
* transfer, all results from this function are undefined until the transfer
57+
* is completed.
5858
*/
5959
CURL_EXTERN CURLcode curl_easy_getinfo(CURL *curl, CURLINFO info, ...);
6060

@@ -119,7 +119,7 @@ CURL_EXTERN CURLcode curl_easy_send(CURL *curl, const void *buffer,
119119
CURL_EXTERN CURLcode curl_easy_upkeep(CURL *curl);
120120

121121
#ifdef __cplusplus
122-
}
122+
} /* end of extern "C" */
123123
#endif
124124

125125
#endif

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

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* | (__| |_| | _ <| |___
88
* \___|\___/|_| \_\_____|
99
*
10-
* Copyright (C) 2018 - 2022, Daniel Stenberg, <daniel@haxx.se>, et al.
10+
* Copyright (C) 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
@@ -24,6 +24,10 @@
2424
*
2525
***************************************************************************/
2626

27+
#ifdef __cplusplus
28+
extern "C" {
29+
#endif
30+
2731
struct curl_header {
2832
char *name; /* this might not use the same case */
2933
char *value;
@@ -63,4 +67,8 @@ CURL_EXTERN struct curl_header *curl_easy_nextheader(CURL *easy,
6367
int request,
6468
struct curl_header *prev);
6569

70+
#ifdef __cplusplus
71+
} /* end of extern "C" */
72+
#endif
73+
6674
#endif /* CURLINC_HEADER_H */

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* | (__| |_| | _ <| |___
88
* \___|\___/|_| \_\_____|
99
*
10-
* Copyright (C) 1998 - 2022, Daniel Stenberg, <daniel@haxx.se>, et al.
10+
* Copyright (C) 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
@@ -46,7 +46,7 @@ CURL_EXTERN char *curl_maprintf(const char *format, ...);
4646
CURL_EXTERN char *curl_mvaprintf(const char *format, va_list args);
4747

4848
#ifdef __cplusplus
49-
}
49+
} /* end of extern "C" */
5050
#endif
5151

5252
#endif /* CURLINC_MPRINTF_H */

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* | (__| |_| | _ <| |___
88
* \___|\___/|_| \_\_____|
99
*
10-
* Copyright (C) 1998 - 2022, Daniel Stenberg, <daniel@haxx.se>, et al.
10+
* Copyright (C) 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
@@ -124,7 +124,7 @@ struct curl_waitfd {
124124
/*
125125
* Name: curl_multi_init()
126126
*
127-
* Desc: inititalize multi-style curl usage
127+
* Desc: initialize multi-style curl usage
128128
*
129129
* Returns: a new CURLM handle to use in all 'curl_multi' functions.
130130
*/
@@ -318,16 +318,16 @@ typedef int (*curl_multi_timer_callback)(CURLM *multi, /* multi handle */
318318
void *userp); /* private callback
319319
pointer */
320320

321-
CURL_EXTERN CURLMcode curl_multi_socket(CURLM *multi_handle, curl_socket_t s,
322-
int *running_handles);
321+
CURL_EXTERN CURLMcode CURL_DEPRECATED(7.19.5, "Use curl_multi_socket_action()")
322+
curl_multi_socket(CURLM *multi_handle, curl_socket_t s, int *running_handles);
323323

324324
CURL_EXTERN CURLMcode curl_multi_socket_action(CURLM *multi_handle,
325325
curl_socket_t s,
326326
int ev_bitmask,
327327
int *running_handles);
328328

329-
CURL_EXTERN CURLMcode curl_multi_socket_all(CURLM *multi_handle,
330-
int *running_handles);
329+
CURL_EXTERN CURLMcode CURL_DEPRECATED(7.19.5, "Use curl_multi_socket_action()")
330+
curl_multi_socket_all(CURLM *multi_handle, int *running_handles);
331331

332332
#ifndef CURL_ALLOW_OLD_MULTI_SOCKET
333333
/* This macro below was added in 7.16.3 to push users who recompile to use

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* | (__| |_| | _ <| |___
88
* \___|\___/|_| \_\_____|
99
*
10-
* Copyright (C) 2018 - 2022, Daniel Stenberg, <daniel@haxx.se>, et al.
10+
* Copyright (C) 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
@@ -33,7 +33,7 @@ typedef enum {
3333
CURLOT_VALUES, /* (a defined set or bitmask) */
3434
CURLOT_OFF_T, /* curl_off_t (a range of values) */
3535
CURLOT_OBJECT, /* pointer (void *) */
36-
CURLOT_STRING, /* (char * to zero terminated buffer) */
36+
CURLOT_STRING, /* (char * to null-terminated buffer) */
3737
CURLOT_SLIST, /* (struct curl_slist *) */
3838
CURLOT_CBPTR, /* (void * passed as-is to a callback) */
3939
CURLOT_BLOB, /* blob (struct curl_blob *) */

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* | (__| |_| | _ <| |___
88
* \___|\___/|_| \_\_____|
99
*
10-
* Copyright (C) 1998 - 2022, Daniel Stenberg, <daniel@haxx.se>, et al.
10+
* Copyright (C) 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

0 commit comments

Comments
 (0)