Commit 4608d015 authored by Patrick Monnerat's avatar Patrick Monnerat
Browse files

Continue sync work on OS400 specific code and RPG binding.

parent a24fe59e
Loading
Loading
Loading
Loading
+1 −0
Original line number Diff line number Diff line
@@ -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.
+2 −1
Original line number Diff line number Diff line
@@ -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);

+9 −0
Original line number Diff line number Diff line
@@ -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