moparisthebest
/
curl
mirror of https://github.com/moparisthebest/curl
1
0
Fork 0
Code Issues Releases Wiki Activity

_ Adapt OS400 EBCDIC wrappers to new options. 

_ Update RPG binding accordingly.
_ Fix new options comments.
This commit is contained in:
Patrick Monnerat 2008-10-10 15:54:07 +00:00
parent 0722e91eb9
commit bb1f6e6818
4 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/url.c
View File

@ -1536,14 +1536,14 @@ CURLcode Curl_setopt(struct SessionHandle *data, CURLoption option,
break; break;
case CURLOPT_USERNAME: case CURLOPT_USERNAME:
/* /*
* user:password to use in the operation * authentication user name to use in the operation
*/ */
result = setstropt(&data->set.str[STRING_USERNAME], result = setstropt(&data->set.str[STRING_USERNAME],
va_arg(param, char *)); va_arg(param, char *));
break; break;
case CURLOPT_PASSWORD: case CURLOPT_PASSWORD:
/* /*
* user:password to use in the operation * authentication password to use in the operation
*/ */
result = setstropt(&data->set.str[STRING_PASSWORD], result = setstropt(&data->set.str[STRING_PASSWORD],
va_arg(param, char *)); va_arg(param, char *));

2
packages/OS400/README.OS400
View File

@ -101,6 +101,8 @@ options:
CURLOPT_SSH_HOST_PUBLIC_KEY_MD5 CURLOPT_SSH_HOST_PUBLIC_KEY_MD5
CURLOPT_CRLFILE CURLOPT_CRLFILE
CURLOPT_ISSUERCERT CURLOPT_ISSUERCERT
CURLOPT_USERNAME
CURLOPT_PASSWORD
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.

6
packages/OS400/ccsidcurl.c
View File

@ -728,7 +728,7 @@ curl_formadd_ccsid(struct curl_httppost * * httppost,
/* Allocate the local curl_forms array. */ /* Allocate the local curl_forms array. */
lformlen = ALLOC_GRANULE; lformlen = ALLOC_GRANULE;
lforms = malloc(lformlen * sizeof(struct curl_forms)); lforms = malloc(lformlen * sizeof *lforms);
if (!lforms) if (!lforms)
return CURL_FORMADD_MEMORY; return CURL_FORMADD_MEMORY;
@ -1030,7 +1030,7 @@ curl_easy_setopt_ccsid(CURL * curl, CURLoption tag, ...)
if (testwarn) { if (testwarn) {
testwarn = 0; testwarn = 0;
if ((int) STRING_LAST != (int) STRING_SSL_ISSUERCERT + 1) if ((int) STRING_LAST != (int) STRING_PASSWORD + 1)
curl_mfprintf(stderr, curl_mfprintf(stderr,
"*** WARNING: curl_easy_setopt_ccsid() should be reworked ***\n"); "*** WARNING: curl_easy_setopt_ccsid() should be reworked ***\n");
} }
@ -1075,6 +1075,8 @@ curl_easy_setopt_ccsid(CURL * curl, CURLoption tag, ...)
case CURLOPT_SSH_HOST_PUBLIC_KEY_MD5: case CURLOPT_SSH_HOST_PUBLIC_KEY_MD5:
case CURLOPT_CRLFILE: case CURLOPT_CRLFILE:
case CURLOPT_ISSUERCERT: case CURLOPT_ISSUERCERT:
case CURLOPT_USERNAME:
case CURLOPT_PASSWORD:
s = va_arg(arg, char *); s = va_arg(arg, char *);
ccsid = va_arg(arg, unsigned int); ccsid = va_arg(arg, unsigned int);

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

@ -782,6 +782,10 @@
d c 00171 d c 00171
d CURLOPT_CERTINFO... d CURLOPT_CERTINFO...
d c 00172 d c 00172
d CURLOPT_USERNAME...
d c 10173
d CURLOPT_PASSWORD...
d c 10174
* *
d CURLOPT_POST301... d CURLOPT_POST301...
d c 00161 Obsolescent d c 00161 Obsolescent