summaryrefslogtreecommitdiff
path: root/packages
diff options
context:
space:
mode:
authorPatrick Monnerat <patrick@monnerat.net>2016-11-26 18:52:30 +0100
committerPatrick Monnerat <patrick@monnerat.net>2016-11-26 18:52:30 +0100
commitd2c5503e0cdc1f75b47b15ba1de9848cdf4c168e (patch)
tree314bc1a8f8d86e96dcbb5228c6fca075a113686b /packages
parenta4b2f7aafde33c2ab810adb6c3d119c9a0b824e7 (diff)
downloadcurl-d2c5503e0cdc1f75b47b15ba1de9848cdf4c168e.tar.gz
os400: support CURLOPT_PROXY_PINNEDPUBLICKEY
Also define it in ILE/RPG binding.
Diffstat (limited to 'packages')
-rw-r--r--packages/OS400/README.OS4001
-rw-r--r--packages/OS400/ccsidcurl.c1
-rw-r--r--packages/OS400/curl.inc.in4
3 files changed, 6 insertions, 0 deletions
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