diff options
| author | Patrick Monnerat <patrick@monnerat.net> | 2018-05-30 01:45:40 +0200 |
|---|---|---|
| committer | Patrick Monnerat <patrick@monnerat.net> | 2018-05-30 01:45:40 +0200 |
| commit | e40ab75e9b179573847ce7f061f579ddce51804e (patch) | |
| tree | 06793442bff1f8c43efba61d074b8feb4e4dabc9 | |
| parent | c2dc7d9c6cce8881d5e5458c5b75f694bce0335d (diff) | |
| download | curl-e40ab75e9b179573847ce7f061f579ddce51804e.tar.gz | |
os400: sync EBCDIC wrappers and ILE/RPG binding with latest options
| -rw-r--r-- | packages/OS400/README.OS400 | 8 | ||||
| -rw-r--r-- | packages/OS400/ccsidcurl.c | 2 | ||||
| -rw-r--r-- | packages/OS400/curl.inc.in | 58 |
3 files changed, 66 insertions, 2 deletions
diff --git a/packages/OS400/README.OS400 b/packages/OS400/README.OS400 index c766a1f6e..2f9910377 100644 --- a/packages/OS400/README.OS400 +++ b/packages/OS400/README.OS400 @@ -107,6 +107,7 @@ options: CURLOPT_PROXY_SSLKEY CURLOPT_PROXY_SSLKEYTYPE CURLOPT_PROXY_SSL_CIPHER_LIST + CURLOPT_PROXY_TLS13_CIPHERS CURLOPT_PROXY_TLSAUTH_PASSWORD CURLOPT_PROXY_TLSAUTH_TYPE CURLOPT_PROXY_TLSAUTH_USERNAME @@ -129,6 +130,7 @@ options: CURLOPT_SSLKEY CURLOPT_SSLKEYTYPE CURLOPT_SSL_CIPHER_LIST + CURLOPT_TLS13_CIPHERS CURLOPT_TLSAUTH_PASSWORD CURLOPT_TLSAUTH_TYPE CURLOPT_TLSAUTH_USERNAME @@ -318,8 +320,10 @@ _ Procedures curl_easy_setopt_long(), curl_easy_setopt_object(), curl_easy_setopt_function() and curl_easy_setopt_offset() are all alias prototypes to curl_easy_setopt(), but with different parameter lists. _ Procedures curl_easy_getinfo_string(), curl_easy_getinfo_long(), - curl_easy_getinfo_double() and curl_easy_getinfo_slist() are all alias - prototypes to curl_easy_getinfo(), but with different parameter lists. + curl_easy_getinfo_double(), curl_easy_getinfo_slist(), + curl_easy_getinfo_ptr(), curl_easy_getinfo_socket() and + curl_easy_getinfo_off_t() are all alias prototypes to curl_easy_getinfo(), + but with different parameter lists. _ Procedures curl_multi_setopt_long(), curl_multi_setopt_object(), curl_multi_setopt_function() and curl_multi_setopt_offset() are all alias prototypes to curl_multi_setopt(), but with different parameter lists. diff --git a/packages/OS400/ccsidcurl.c b/packages/OS400/ccsidcurl.c index f442efa5a..af53f6761 100644 --- a/packages/OS400/ccsidcurl.c +++ b/packages/OS400/ccsidcurl.c @@ -1179,6 +1179,7 @@ curl_easy_setopt_ccsid(CURL * curl, CURLoption tag, ...) case CURLOPT_PROXY_SSLKEY: case CURLOPT_PROXY_SSLKEYTYPE: case CURLOPT_PROXY_SSL_CIPHER_LIST: + case CURLOPT_PROXY_TLS13_CIPHERS: case CURLOPT_PROXY_TLSAUTH_PASSWORD: case CURLOPT_PROXY_TLSAUTH_TYPE: case CURLOPT_PROXY_TLSAUTH_USERNAME: @@ -1201,6 +1202,7 @@ curl_easy_setopt_ccsid(CURL * curl, CURLoption tag, ...) case CURLOPT_SSLKEY: case CURLOPT_SSLKEYTYPE: case CURLOPT_SSL_CIPHER_LIST: + case CURLOPT_TLS13_CIPHERS: case CURLOPT_TLSAUTH_PASSWORD: case CURLOPT_TLSAUTH_TYPE: case CURLOPT_TLSAUTH_USERNAME: diff --git a/packages/OS400/curl.inc.in b/packages/OS400/curl.inc.in index 1a06eca5d..cfecd1f0c 100644 --- a/packages/OS400/curl.inc.in +++ b/packages/OS400/curl.inc.in @@ -66,8 +66,11 @@ d CURLINFO_DOUBLE... d c X'00300000' d CURLINFO_SLIST c X'00400000' + d CURLINFO_PTR c X'00400000' d CURLINFO_SOCKET... d c X'00500000' + d CURLINFO_OFF_T... + d c X'00600000' d CURLINFO_MASK c X'000FFFFF' d CURLINFO_TYPEMASK... d c X'00F00000' @@ -175,6 +178,8 @@ d c X'00000010' d CURLAUTH_NTLM_WB... d c X'00000020' + d CURLAUTH_BEARER... + d c X'00000040' d CURLAUTH_ONLY... d c X'80000000' d CURLAUTH_ANY c X'7FFFFFEF' @@ -1337,6 +1342,10 @@ d c 00274 d CURLOPT_DNS_SHUFFLE_ADDRESSES... d c 00275 + d CURLOPT_TLS13_CIPHERS... + d c 10276 + d CURLOPT_PROXY_TLS13_CIPHERS... + d c 10277 * /if not defined(CURL_NO_OLDIES) d CURLOPT_FILE c 10001 @@ -1445,12 +1454,20 @@ d c X'00300006' d CURLINFO_SIZE_UPLOAD... CURLINFO_DOUBLE + 7 d c X'00300007' + d CURLINFO_SIZE_UPLOAD_T... CURLINFO_OFF_T + 7 + d c X'00600007' d CURLINFO_SIZE_DOWNLOAD... CURLINFO_DOUBLE + 8 d c X'00300008' + d CURLINFO_SIZE_DOWNLOAD_T... CURLINFO_OFF_T + 8 + d c X'00600008' d CURLINFO_SPEED_DOWNLOAD... CURLINFO_DOUBLE + 9 d c X'00300009' + d CURLINFO_SPEED_DOWNLOAD_T... CURLINFO_OFF_T + 9 + d c X'00600009' d CURLINFO_SPEED_UPLOAD... CURLINFO_DOUBLE + 10 d c X'0030000A' + d CURLINFO_SPEED_UPLOAD_T... CURLINFO_OFF_T + 10 + d c X'0060000A' d CURLINFO_HEADER_SIZE... CURLINFO_LONG + 11 d c X'0020000B' d CURLINFO_REQUEST_SIZE... CURLINFO_LONG + 12 @@ -1459,10 +1476,16 @@ d c X'0020000D' d CURLINFO_FILETIME... CURLINFO_LONG + 14 d c X'0020000E' + d CURLINFO_FILETIME_T... CURLINFO_OFF_T + 14 + d c X'0060000E' d CURLINFO_CONTENT_LENGTH_DOWNLOAD... CURLINFO_DOUBLE + 15 d c X'0030000F' + d CURLINFO_CONTENT_LENGTH_DOWNLOAD_T... CURLINFO_OFF_T + 15 + d c X'0060000F' d CURLINFO_CONTENT_LENGTH_UPLOAD... CURLINFO_DOUBLE + 16 d c X'00300010' + d CURLINFO_CONTENT_LENGTH_UPLOAD_T... CURLINFO_OFF_T + 16 + d c X'00600010' d CURLINFO_STARTTRANSFER_TIME... CURLINFO_DOUBLE + 17 d c X'00300011' d CURLINFO_CONTENT_TYPE... CURLINFO_STRING + 18 @@ -1529,6 +1552,20 @@ d c X'00200030' d CURLINFO_SCHEME... CURLINFO_STRING + 49 d c X'00100031' + d CURLINFO_TOTAL_TIME_T... CURLINFO_OFF_T + 50 + d c X'00600032' + d CURLINFO_NAMELOOKUP_TIME_T... CURLINFO_OFF_T + 51 + d c X'00600033' + d CURLINFO_CONNECT_TIME_T... CURLINFO_OFF_T + 52 + d c X'00600034' + d CURLINFO_PRETRANSFER_TIME_T... CURLINFO_OFF_T + 53 + d c X'00600035' + d CURLINFO_STARTTRANSFER_TIME_T... CURLINFO_OFF_T + 54 + d c X'00600036' + d CURLINFO_REDIRECT_TIME_T... CURLINFO_OFF_T + 55 + d c X'00600037' + d CURLINFO_APPCONNECT_TIME_T... CURLINFO_OFF_T + 56 + d c X'00600036' * d CURLINFO_HTTP_CODE... Old ...RESPONSE_CODE d c X'00200002' @@ -2261,6 +2298,27 @@ d info value like(CURLINFO) d slistarg * options(*nopass) struct curl_slist * * + d curl_easy_getinfo_ptr... + d pr extproc('curl_easy_getinfo') + d like(CURLcode) + d curl * value CURL * + d info value like(CURLINFO) + d ptrarg * options(*nopass) void * + * + d curl_easy_getinfo_socket... + d pr extproc('curl_easy_getinfo') + d like(CURLcode) + d curl * value CURL * + d info value like(CURLINFO) + d socketarg like(curl_socket_t) options(*nopass) + * + d curl_easy_getinfo_off_t... + d pr extproc('curl_easy_getinfo') + d like(CURLcode) + d curl * value CURL * + d info value like(CURLINFO) + d offsetarg like(curl_off_t) options(*nopass) + * * d curl_easy_duphandle... d pr * extproc('curl_easy_duphandle') CURL * |