generic-library/curl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

- Take new char * options into account in OS400 curl_easy_setopt_ccsid().

Browse Source 
- Keep RPG binding, STRING_* table end check and OS400 README up to date.
This commit is contained in:
Patrick Monnerat
2011-03-14 17:54:57 +01:00
parent 7711086536
commit ed8749e308
3 changed files with 19 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
packages/OS400/README.OS400
View File

@@ -110,6 +110,9 @@ options:
CURLOPT_RTSP_TRANSPORT CURLOPT_RTSP_TRANSPORT
CURLOPT_SOCKS5_GSSAPI_SERVICE CURLOPT_SOCKS5_GSSAPI_SERVICE
CURLOPT_MAIL_FROM CURLOPT_MAIL_FROM
CURLOPT_TLSAUTH_USERNAME
CURLOPT_TLSAUTH_PASSWORD
CURLOPT_TLSAUTH_TYPE
Else it is the same as for curl_easy_setopt(). Else it is the same as for curl_easy_setopt().
Note that CURLOPT_ERRORBUFFER is not in the list above, since it gives the Note that CURLOPT_ERRORBUFFER is not in the list above, since it gives the
address of an (empty) character buffer, not the address of a string. address of an (empty) character buffer, not the address of a string.

9
packages/OS400/ccsidcurl.c
View File

@@ -1029,7 +1029,11 @@ curl_easy_setopt_ccsid(CURL * curl, CURLoption tag, ...)
if (testwarn) { if (testwarn) {
testwarn = 0; testwarn = 0;
#ifdef USE_TLS_SRP
if ((int) STRING_LAST != (int) STRING_TLSAUTH_PASSWORD + 1)
#else
if ((int) STRING_LAST != (int) STRING_MAIL_FROM + 1) if ((int) STRING_LAST != (int) STRING_MAIL_FROM + 1)
#endif
curl_mfprintf(stderr, curl_mfprintf(stderr,
"*** WARNING: curl_easy_setopt_ccsid() should be reworked ***\n"); "*** WARNING: curl_easy_setopt_ccsid() should be reworked ***\n");
} }
@@ -1086,6 +1090,11 @@ curl_easy_setopt_ccsid(CURL * curl, CURLoption tag, ...)
/* case CURLOPT_SSH_KNOWNHOSTS: */ /* case CURLOPT_SSH_KNOWNHOSTS: */
case CURLOPT_SOCKS5_GSSAPI_SERVICE: case CURLOPT_SOCKS5_GSSAPI_SERVICE:
case CURLOPT_MAIL_FROM: case CURLOPT_MAIL_FROM:
#ifdef USE_TLS_SRP
case CURLOPT_TLSAUTH_USERNAME:
case CURLOPT_TLSAUTH_PASSWORD:
case CURLOPT_TLSAUTH_TYPE:
#endif
s = va_arg(arg, char *); s = va_arg(arg, char *);
ccsid = va_arg(arg, unsigned int); ccsid = va_arg(arg, unsigned int);

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

@@ -474,8 +474,6 @@
d c 87 d c 87
d CURLE_CHUNK_FAILED... d CURLE_CHUNK_FAILED...
d c 88 d c 88
d CURLE_TLSAUTH_FAILED...
d c 89
* *
d curlioerr s 10i 0 based(######ptr######) Enum d curlioerr s 10i 0 based(######ptr######) Enum
d CURLIOE_OK c 0 d CURLIOE_OK c 0
@@ -1279,6 +1277,13 @@
d CURLSOCKTYPE_IPCXN... d CURLSOCKTYPE_IPCXN...
d c 0 d c 0
* *
d CURL_SOCKOPT_OK...
d c 0
d CURL_SOCKOPT_ERROR...
d c 1
d CURL_SOCKOPT_ALREADY_CONNECTED...
d c 2
*
d CURLMcode s 10i 0 based(######ptr######) Enum d CURLMcode s 10i 0 based(######ptr######) Enum
d CURLM_CALL_MULTI_PERFORM... d CURLM_CALL_MULTI_PERFORM...
d c -1 d c -1