From d2c5503e0cdc1f75b47b15ba1de9848cdf4c168e Mon Sep 17 00:00:00 2001 From: Patrick Monnerat Date: Sat, 26 Nov 2016 18:52:30 +0100 Subject: os400: support CURLOPT_PROXY_PINNEDPUBLICKEY Also define it in ILE/RPG binding. --- packages/OS400/README.OS400 | 1 + packages/OS400/ccsidcurl.c | 1 + packages/OS400/curl.inc.in | 4 ++++ 3 files changed, 6 insertions(+) diff --git a/packages/OS400/README.OS400 b/packages/OS400/README.OS400 index e709f40db..5efad0f6b 100644 --- a/packages/OS400/README.OS400 +++ b/packages/OS400/README.OS400 @@ -98,6 +98,7 @@ options: CURLOPT_PROXY_CAPATH CURLOPT_PROXY_CRLFILE CURLOPT_PROXY_KEYPASSWD + CURLOPT_PROXY_PINNEDPUBLICKEY CURLOPT_PROXY_SERVICE_NAME CURLOPT_PROXY_SSLCERT CURLOPT_PROXY_SSLCERTTYPE diff --git a/packages/OS400/ccsidcurl.c b/packages/OS400/ccsidcurl.c index 60824422b..b1c124434 100644 --- a/packages/OS400/ccsidcurl.c +++ b/packages/OS400/ccsidcurl.c @@ -1169,6 +1169,7 @@ curl_easy_setopt_ccsid(CURL * curl, CURLoption tag, ...) case CURLOPT_PROXY_CAPATH: case CURLOPT_PROXY_CRLFILE: case CURLOPT_PROXY_KEYPASSWD: + case CURLOPT_PROXY_PINNEDPUBLICKEY: case CURLOPT_PROXY_SERVICE_NAME: case CURLOPT_PROXY_SSLCERT: case CURLOPT_PROXY_SSLCERTTYPE: diff --git a/packages/OS400/curl.inc.in b/packages/OS400/curl.inc.in index c0b0330a8..a3ed83781 100644 --- a/packages/OS400/curl.inc.in +++ b/packages/OS400/curl.inc.in @@ -127,6 +127,8 @@ d c X'00080000' d CURL_VERSION_PSL... d c X'00100000' + d CURL_VERSION_HTTPS_PROXY... + d c X'00200000' * d CURL_HTTPPOST_FILENAME... d c X'00000001' @@ -1296,6 +1298,8 @@ d c 10262 d CURLOPT_SOCKS_PROXYTYPE... d c 00263 + d CURLOPT_PROXY_PINNEDPUBLICKEY... + d c 10264 * /if not defined(CURL_NO_OLDIES) d CURLOPT_FILE c 10001 -- cgit v1.2.3