Commit 93c04cb1 authored by Patrick Monnerat's avatar Patrick Monnerat
Browse files

os400: sync ILE/RPG binding

parent c34fa31f

packages/OS400/README.OS400

+5 −4
Original line number Diff line number Diff line
@@ -76,16 +76,16 @@ options: 
        CURLOPT_DNS_SERVERS

        CURLOPT_EGDSOCKET

        CURLOPT_ENCODING

        CURLOPT_FTPPORT

        CURLOPT_FTP_ACCOUNT

        CURLOPT_FTP_ALTERNATIVE_TO_USER

        CURLOPT_FTPPORT

        CURLOPT_INTERFACE

        CURLOPT_ISSUERCERT

        CURLOPT_KEYPASSWD

        CURLOPT_KRBLEVEL

        CURLOPT_LOGIN_OPTIONS

        CURLOPT_MAIL_FROM

        CURLOPT_MAIL_AUTH

        CURLOPT_MAIL_FROM

        CURLOPT_NETRC_FILE

        CURLOPT_NOPROXY

        CURLOPT_PASSWORD
@@ -101,9 +101,9 @@ options: 
        CURLOPT_PROXY_SERVICE_NAME

        CURLOPT_PROXY_SSLCERT

        CURLOPT_PROXY_SSLCERTTYPE

        CURLOPT_PROXY_SSL_CIPHER_LIST

        CURLOPT_PROXY_SSLKEY

        CURLOPT_PROXY_SSLKEYTYPE

        CURLOPT_PROXY_SSL_CIPHER_LIST

        CURLOPT_PROXY_TLSAUTH_PASSWORD

        CURLOPT_PROXY_TLSAUTH_TYPE

        CURLOPT_PROXY_TLSAUTH_USERNAME
@@ -122,10 +122,10 @@ options: 
        CURLOPT_SSH_PUBLIC_KEYFILE

        CURLOPT_SSLCERT

        CURLOPT_SSLCERTTYPE

        CURLOPT_SSL_CIPHER_LIST

        CURLOPT_SSLENGINE

        CURLOPT_SSLKEY

        CURLOPT_SSLKEYTYPE

        CURLOPT_SSL_CIPHER_LIST

        CURLOPT_TLSAUTH_PASSWORD

        CURLOPT_TLSAUTH_TYPE

        CURLOPT_TLSAUTH_USERNAME
@@ -173,6 +173,7 @@ use: 
        CURLINFO_PRIMARY_IP

        CURLINFO_RTSP_SESSION_ID

        CURLINFO_LOCAL_IP

        CURLINFO_SCHEME

  Likewise, the following options are followed by a struct curl_slist * * and a

CCSID.

        CURLINFO_SSL_ENGINES

packages/OS400/ccsidcurl.c

+6 −6
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
 *                            | (__| |_| |  _ <| |___

 *                             \___|\___/|_| \_\_____|

 *

 * Copyright (C) 1998 - 2015, Daniel Stenberg, <daniel@haxx.se>, et al.

 * Copyright (C) 1998 - 2016, Daniel Stenberg, <daniel@haxx.se>, et al.

 *

 * This software is licensed as described in the file COPYING, which

 * you should have received as part of this distribution. The terms
@@ -615,7 +615,7 @@ curl_easy_getinfo_ccsid(CURL * curl, CURLINFO info, ...) 
  struct curl_certinfo * cipf;

  struct curl_certinfo * cipt;



  /* WARNING: unlike curl_easy_get_info(), the strings returned by this

  /* WARNING: unlike curl_easy_getinfo(), the strings returned by this

     procedure have to be free'ed. */



  data = (struct Curl_easy *) curl;
@@ -1147,16 +1147,16 @@ curl_easy_setopt_ccsid(CURL * curl, CURLoption tag, ...) 
  case CURLOPT_DNS_SERVERS:

  case CURLOPT_EGDSOCKET:

  case CURLOPT_ENCODING:

  case CURLOPT_FTPPORT:

  case CURLOPT_FTP_ACCOUNT:

  case CURLOPT_FTP_ALTERNATIVE_TO_USER:

  case CURLOPT_FTPPORT:

  case CURLOPT_INTERFACE:

  case CURLOPT_ISSUERCERT:

  case CURLOPT_KEYPASSWD:

  case CURLOPT_KRBLEVEL:

  case CURLOPT_LOGIN_OPTIONS:

  case CURLOPT_MAIL_FROM:

  case CURLOPT_MAIL_AUTH:

  case CURLOPT_MAIL_FROM:

  case CURLOPT_NETRC_FILE:

  case CURLOPT_NOPROXY:

  case CURLOPT_PASSWORD:
@@ -1172,9 +1172,9 @@ curl_easy_setopt_ccsid(CURL * curl, CURLoption tag, ...) 
  case CURLOPT_PROXY_SERVICE_NAME:

  case CURLOPT_PROXY_SSLCERT:

  case CURLOPT_PROXY_SSLCERTTYPE:

  case CURLOPT_PROXY_SSL_CIPHER_LIST:

  case CURLOPT_PROXY_SSLKEY:

  case CURLOPT_PROXY_SSLKEYTYPE:

  case CURLOPT_PROXY_SSL_CIPHER_LIST:

  case CURLOPT_PROXY_TLSAUTH_PASSWORD:

  case CURLOPT_PROXY_TLSAUTH_TYPE:

  case CURLOPT_PROXY_TLSAUTH_USERNAME:
@@ -1193,10 +1193,10 @@ curl_easy_setopt_ccsid(CURL * curl, CURLoption tag, ...) 
  case CURLOPT_SSH_PUBLIC_KEYFILE:

  case CURLOPT_SSLCERT:

  case CURLOPT_SSLCERTTYPE:

  case CURLOPT_SSL_CIPHER_LIST:

  case CURLOPT_SSLENGINE:

  case CURLOPT_SSLKEY:

  case CURLOPT_SSLKEYTYPE:

  case CURLOPT_SSL_CIPHER_LIST:

  case CURLOPT_TLSAUTH_PASSWORD:

  case CURLOPT_TLSAUTH_TYPE:

  case CURLOPT_TLSAUTH_USERNAME:

packages/OS400/curl.inc.in

+5 −1
Original line number Diff line number Diff line
@@ -1482,8 +1482,12 @@ 
     d                 c                   X'0040002D'

     d  CURLINFO_HTTP_VERSION...                                                CURLINFO_LONG + 46

     d                 c                   X'0020002E'

     d  CURLINFO_PROXY_SSL_VERIFYRESULT...                                      CURLINFO_LONG + 45

     d  CURLINFO_PROXY_SSL_VERIFYRESULT...                                      CURLINFO_LONG + 47

     d                 c                   X'0020002F'

     d  CURLINFO_PROTOCOL...                                                    CURLINFO_LONG + 48

     d                 c                   X'00200030'

     d  CURLINFO_SCHEME...                                                      CURLINFO_STRING + 49

     d                 c                   X'00100031'

      *

     d  CURLINFO_HTTP_CODE...                                                   Old ...RESPONSE_CODE

     d                 c                   X'00200002'