aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--packages/OS400/README.OS4002
-rw-r--r--packages/OS400/ccsidcurl.c4
-rw-r--r--packages/OS400/curl.inc.in42
3 files changed, 35 insertions, 13 deletions
diff --git a/packages/OS400/README.OS400 b/packages/OS400/README.OS400
index b57e74d40..58c75b7b1 100644
--- a/packages/OS400/README.OS400
+++ b/packages/OS400/README.OS400
@@ -107,6 +107,8 @@ options:
CURLOPT_PROXYPASSWORD
CURLOPT_NOPROXY
CURLOPT_SOCKS5_GSSAPI_SERVICE
+ CURLOPT_MAIL_FROM
+ CURLOPT_MAIL_RCPT
Else it is the same as for curl_easy_setopt().
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.
diff --git a/packages/OS400/ccsidcurl.c b/packages/OS400/ccsidcurl.c
index 4a38f7c59..4d722d565 100644
--- a/packages/OS400/ccsidcurl.c
+++ b/packages/OS400/ccsidcurl.c
@@ -1030,7 +1030,7 @@ curl_easy_setopt_ccsid(CURL * curl, CURLoption tag, ...)
if (testwarn) {
testwarn = 0;
- if ((int) STRING_LAST != (int) STRING_SOCKS5_GSSAPI_SERVICE + 1)
+ if ((int) STRING_LAST != (int) STRING_MAIL_RCPT + 1)
curl_mfprintf(stderr,
"*** WARNING: curl_easy_setopt_ccsid() should be reworked ***\n");
}
@@ -1083,6 +1083,8 @@ curl_easy_setopt_ccsid(CURL * curl, CURLoption tag, ...)
/* SSH2 not (yet) implemented on OS400. */
/* case CURLOPT_SSH_KNOWNHOSTS: */
case CURLOPT_SOCKS5_GSSAPI_SERVICE:
+ case CURLOPT_MAIL_FROM:
+ case CURLOPT_MAIL_RCPT:
s = va_arg(arg, char *);
ccsid = va_arg(arg, unsigned int);
diff --git a/packages/OS400/curl.inc.in b/packages/OS400/curl.inc.in
index 4b2af311b..91b96be8d 100644
--- a/packages/OS400/curl.inc.in
+++ b/packages/OS400/curl.inc.in
@@ -521,29 +521,41 @@
d c 3
*
d CURLPROTO_HTTP...
- d c X'0001'
+ d c X'00000001'
d CURLPROTO_HTTPS...
- d c X'0002'
+ d c X'00000002'
d CURLPROTO_FTP...
- d c X'0004'
+ d c X'00000004'
d CURLPROTO_FTPS...
- d c X'0008'
+ d c X'00000008'
d CURLPROTO_SCP...
- d c X'0010'
+ d c X'00000010'
d CURLPROTO_SFTP...
- d c X'0020'
+ d c X'00000020'
d CURLPROTO_TELNET...
- d c X'0040'
+ d c X'00000040'
d CURLPROTO_LDAP...
- d c X'0080'
+ d c X'00000080'
d CURLPROTO_LDAPS...
- d c X'0100'
+ d c X'00000100'
d CURLPROTO_DICT...
- d c X'0200'
+ d c X'00000200'
d CURLPROTO_FILE...
- d c X'0400'
+ d c X'00000400'
d CURLPROTO_TFTP...
- d c X'0800'
+ d c X'00000800'
+ d CURLPROTO_IMAP...
+ d c X'00001000'
+ d CURLPROTO_IMAPS...
+ d c X'00002000'
+ d CURLPROTO_POP3...
+ d c X'00004000'
+ d CURLPROTO_POP3S...
+ d c X'00008000'
+ d CURLPROTO_SMTP...
+ d c X'00010000'
+ d CURLPROTO_SMTPS...
+ d c X'00020000'
*
d CURLoption s 10i 0 based(######ptr######) Enum
d CURLOPT_FILE c 10001
@@ -877,7 +889,13 @@
d c 20184
d CURLOPT_SSH_KEYDATA...
d c 10185
+ d CURLOPT_MAIL_FROM...
+ d c 10186
+ d CURLOPT_MAIL_RCPT...
+ d c 10187
*
+ d CURLOPT_SERVER_RESPONSE_TIMEOUT...
+ d c 00112
d CURLOPT_POST301...
d c 00161 Obsolescent
*