From: Patrick Monnerat <Patrick.Monnerat@datasphere.ch> Date: Tue, 17 Feb 2009 16:16:07 +0000 (+0000) Subject: Continue sync work on OS400 specific code and RPG binding. X-Git-Tag: curl-7_19_4~35 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4608d0157ee890a669aa2e88b81023d8bb7347e7;p=curl Continue sync work on OS400 specific code and RPG binding. --- diff --git a/packages/OS400/README.OS400 b/packages/OS400/README.OS400 index 7f78292a2..b57e74d40 100644 --- a/packages/OS400/README.OS400 +++ b/packages/OS400/README.OS400 @@ -106,6 +106,7 @@ options: CURLOPT_PROXYUSERNAME CURLOPT_PROXYPASSWORD CURLOPT_NOPROXY + CURLOPT_SOCKS5_GSSAPI_SERVICE 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 1591978a5..14630b633 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_NOPROXY + 1) + if ((int) STRING_LAST != (int) STRING_SOCKS5_GSSAPI_SERVICE + 1) curl_mfprintf(stderr, "*** WARNING: curl_easy_setopt_ccsid() should be reworked ***\n"); } @@ -1080,6 +1080,7 @@ curl_easy_setopt_ccsid(CURL * curl, CURLoption tag, ...) case CURLOPT_PROXYUSERNAME: case CURLOPT_PROXYPASSWORD: case CURLOPT_NOPROXY: + case CURLOPT_SOCKS5_GSSAPI_SERVICE: 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 30b044bcb..d822896a0 100644 --- a/packages/OS400/curl.inc.in +++ b/packages/OS400/curl.inc.in @@ -468,6 +468,15 @@ d CURLFTPAUTH_SSL... d c 1 d CURLFTPAUTH_TLS... + d c 2 + * + d curl_ftpcreatedir... + d s 10i 0 based(######ptr######) Enum + d CURLFTP_CREATE_DIR_NONE... + d c 0 + d CURLFTP_CREATE_DIR... + d c 1 + d CURLFTP_CREATE_DIR_RETRY... d c 2 * d curl_ftpmethod s 10i 0 based(######ptr######) Enum