Continue sync work on OS400 specific code and RPG binding.

diff --git a/packages/OS400/README.OS400 b/packages/OS400/README.OS400
index 7f78292a28ea9427d1578314651576751d99cf90..b57e74d4057beb8aa4806186bcc17ba6009a732b 100644 (file)
--- 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 1591978a587a6387bf7cae0bafbe4ca37be83fb3..14630b633d1e428a21fb3c7d15e5bca4ca860aa5 100644 (file)
--- 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 30b044bcbef882382fedc9c5fef270e582838520..d822896a0520ee31046cb1b9e564c2f66a97d242 100644 (file)
--- 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