From f58f843f66fa6ce7902867f5f24593aef5e56dd3 Mon Sep 17 00:00:00 2001 From: Patrick Monnerat Date: Mon, 2 Dec 2013 14:33:51 +0100 Subject: [PATCH] OS400: sync wrappers and RPG binding. --- packages/OS400/ccsidcurl.c | 13 ++++++++++--- packages/OS400/curl.inc.in | 31 +++++++++++++++++++++++++++++++ 2 files changed, 41 insertions(+), 3 deletions(-) diff --git a/packages/OS400/ccsidcurl.c b/packages/OS400/ccsidcurl.c index 923bb1bdb..0c99a47f9 100644 --- a/packages/OS400/ccsidcurl.c +++ b/packages/OS400/ccsidcurl.c @@ -648,7 +648,8 @@ curl_easy_getinfo_ccsid(CURL * curl, CURLINFO info, ...) case CURLINFO_SLIST: ccsid = va_arg(arg, unsigned int); - if(info == CURLINFO_CERTINFO) { + switch (info) { + case CURLINFO_CERTINFO: cipf = *(struct curl_certinfo * *) paramp; if(cipf) { if(!(cipt = (struct curl_certinfo *) malloc(sizeof *cipt))) @@ -679,12 +680,18 @@ curl_easy_getinfo_ccsid(CURL * curl, CURLINFO info, ...) *(struct curl_certinfo * *) paramp = cipt; } - } - else { + + break; + + case CURLINFO_TLS_SESSION: + break; + + default: slp = (struct curl_slist * *) paramp; if(*slp) if(!(*slp = slist_convert(ccsid, *slp, ASCII_CCSID))) ret = CURLE_OUT_OF_MEMORY; + break; } } diff --git a/packages/OS400/curl.inc.in b/packages/OS400/curl.inc.in index dfc172cd2..bb8807ca3 100644 --- a/packages/OS400/curl.inc.in +++ b/packages/OS400/curl.inc.in @@ -1349,10 +1349,35 @@ d c X'00100029' d CURLINFO_LOCAL_PORT... CURLINFO_LONG + 42 d c X'0020002A' + d CURLINFO_TLS_SESSION... CURLINFO_SLIST + 43 + d c X'0040002B' * d CURLINFO_HTTP_CODE... Old ...RESPONSE_CODE d c X'00200002' * + d curl_sslbackend... + d s 10i 0 based(######ptr######) Enum + d CURLSSLBACKEND_NONE... + d c 0 + d CURLSSLBACKEND_OPENSSL... + d c 1 + d CURLSSLBACKEND_GNUTLS... + d c 2 + d CURLSSLBACKEND_NSS... + d c 3 + d CURLSSLBACKEND_QSOSSL... + d c 4 + d CURLSSLBACKEND_GSKIT... + d c 5 + d CURLSSLBACKEND_POLARSSL... + d c 6 + d CURLSSLBACKEND_CYASSL... + d c 7 + d CURLSSLBACKEND_SCHANNEL... + d c 8 + d CURLSSLBACKEND_DARWINSSL... + d c 9 + * d curl_closepolicy... d s 10i 0 based(######ptr######) Enum d CURLCLOSEPOLICY_OLDEST... @@ -1645,6 +1670,12 @@ d group * char * d target * char * * + d curl_tlssessioninfo... + d ds based(######ptr######) + d qualified + d backend like(curl_sslbackend) + d internals * void * + * d curl_fileinfo ds based(######ptr######) d qualified d filename * char *