luo980/curl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

os400: sync with latest changes

Browse Source 
- Conversion support for new version info character field rtmp_version.
- New ILE/RPG declarations.

Closes #13402
This commit is contained in:
Patrick Monnerat 2024-04-17 17:39:23 +02:00 committed by Daniel Stenberg
parent c22f463071
commit 411d12886e
No known key found for this signature in database
GPG Key ID: 5CC908FDB71E12C2
2 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
packages/OS400/ccsidcurl.c
View File

@ -437,7 +437,8 @@ curl_version_info_ccsid(CURLversion stamp, unsigned int ccsid)
offsetof(curl_version_info_data, zstd_version), offsetof(curl_version_info_data, zstd_version),
offsetof(curl_version_info_data, hyper_version), offsetof(curl_version_info_data, hyper_version),
offsetof(curl_version_info_data, gsasl_version), offsetof(curl_version_info_data, gsasl_version),
offsetof(curl_version_info_data, feature_names) offsetof(curl_version_info_data, feature_names),
offsetof(curl_version_info_data, rtmp_version)
}; };
/* The assertion below is possible, because although the second operand /* The assertion below is possible, because although the second operand
@ -1097,9 +1098,7 @@ curl_easy_setopt_ccsid(CURL *easy, CURLoption tag, ...)
case CURLOPT_DNS_LOCAL_IP6: case CURLOPT_DNS_LOCAL_IP6:
case CURLOPT_DNS_SERVERS: case CURLOPT_DNS_SERVERS:
case CURLOPT_DOH_URL: case CURLOPT_DOH_URL:
#ifdef USE_ECH
case CURLOPT_ECH: case CURLOPT_ECH:
#endif
case CURLOPT_EGDSOCKET: case CURLOPT_EGDSOCKET:
case CURLOPT_FTPPORT: case CURLOPT_FTPPORT:
case CURLOPT_FTP_ACCOUNT: case CURLOPT_FTP_ACCOUNT:

21
packages/OS400/curl.inc.in
View File

@ -206,8 +206,10 @@
d CURLAUTH_NTLM c X'00000008' d CURLAUTH_NTLM c X'00000008'
d CURLAUTH_DIGEST_IE... d CURLAUTH_DIGEST_IE...
d c X'00000010' d c X'00000010'
/if not defined(CURL_NO_OLDIES)
d CURLAUTH_NTLM_WB... d CURLAUTH_NTLM_WB...
d c X'00000020' d c X'00000020'
/endif
d CURLAUTH_BEARER... d CURLAUTH_BEARER...
d c X'00000040' d c X'00000040'
d CURLAUTH_AWS_SIGV4... d CURLAUTH_AWS_SIGV4...
@ -669,6 +671,8 @@
d c 99 d c 99
d CURLE_TOO_LARGE... d CURLE_TOO_LARGE...
d c 100 d c 100
d CURLE_ECH_REQUIRED...
d c 101
* *
/if not defined(CURL_NO_OLDIES) /if not defined(CURL_NO_OLDIES)
d CURLE_URL_MALFORMAT_USER... d CURLE_URL_MALFORMAT_USER...
@ -1661,6 +1665,7 @@
d c 10323 d c 10323
d CURLOPT_SERVER_RESPONSE_TIMEOUT_MS... d CURLOPT_SERVER_RESPONSE_TIMEOUT_MS...
d c 00324 d c 00324
d CURLOPT_ECH c 10325
* *
/if not defined(CURL_NO_OLDIES) /if not defined(CURL_NO_OLDIES)
d CURLOPT_FILE c 10001 d CURLOPT_FILE c 10001
@ -1902,6 +1907,8 @@
d c X'00600040' d c X'00600040'
d CURLINFO_QUEUE_TIME_T... CURLINFO_OFF_T + 65 d CURLINFO_QUEUE_TIME_T... CURLINFO_OFF_T + 65
d c X'00600041' d c X'00600041'
d CURLINFO_USED_PROXY... CURLINFO_LONG + 66
d c X'00200042'
* *
d CURLINFO_HTTP_CODE... Old ...RESPONSE_CODE d CURLINFO_HTTP_CODE... Old ...RESPONSE_CODE
d c X'00200002' d c X'00200002'
@ -2065,8 +2072,10 @@
d c 9 d c 9
d CURLVERSION_ELEVENTH... d CURLVERSION_ELEVENTH...
d c 10 d c 10
d CURLVERSION_TWELFTH...
d c 11
d CURLVERSION_NOW... d CURLVERSION_NOW...
d c 10 CURLVERSION_ELEVENTH d c 11 CURLVERSION_ELEVENTH
* *
d CURLHcode s 10i 0 based(######ptr######) Enum d CURLHcode s 10i 0 based(######ptr######) Enum
d CURLHE_OK c 0 d CURLHE_OK c 0
@ -2413,6 +2422,8 @@
d gsasl_version... d gsasl_version...
d * const char * d * const char *
d feature_names... d feature_names...
d * const char *
d rtmp_version...
d * const char * d * const char *
* *
d curl_certinfo ds based(######ptr######) d curl_certinfo ds based(######ptr######)
@ -3015,6 +3026,14 @@
d running_handles... d running_handles...
d 10i 0 d 10i 0
* *
d curl_multi_waitfds...
d pr extproc('curl_multi_waitfds')
d like(CURLMcode)
d multi * value CURLM *
d ufds * value curl_waitfd *
d size 10u 0 value
d fd_count 10u 0
*
d curl_multi_socket_action... d curl_multi_socket_action...
d pr extproc('curl_multi_socket_action') d pr extproc('curl_multi_socket_action')
d like(CURLMcode) d like(CURLMcode)