diff options
| author | Jay Satiro <raysatiro@yahoo.com> | 2017-02-01 18:28:29 -0500 |
|---|---|---|
| committer | Jay Satiro <raysatiro@yahoo.com> | 2017-02-01 18:28:29 -0500 |
| commit | a49d2d0e25b5441e34ae29dcd18f2658a951eace (patch) | |
| tree | 25f2a1bb6c4e15e8991c992074b60c73d5493799 | |
| parent | 1c877a0712b7851c7f286007193668058ed2e987 (diff) | |
OS400: Fix symbols
- s/CURLOPT_SOCKS_PROXY/CURLOPT_PRE_PROXY
Follow-up to 7907a2b and 845522c.
- Fix incorrect id for CURLOPT_PROXY_PINNEDPUBLICKEY.
- Add id for CURLOPT_ABSTRACT_UNIX_SOCKET.
Bug: https://github.com/curl/curl/issues/1237
Reported-by: jonrumsey@users.noreply.github.com
| -rw-r--r-- | packages/OS400/README.OS400 | 3 | ||||
| -rw-r--r-- | packages/OS400/ccsidcurl.c | 3 | ||||
| -rw-r--r-- | packages/OS400/curl.inc.in | 6 | ||||
| -rw-r--r-- | src/tool_setopt.h | 1 |
4 files changed, 7 insertions, 6 deletions
diff --git a/packages/OS400/README.OS400 b/packages/OS400/README.OS400 index 5efad0f6b..92eff4e53 100644 --- a/packages/OS400/README.OS400 +++ b/packages/OS400/README.OS400 @@ -63,6 +63,7 @@ designer. CCSID 0 can be used to select the current job's CCSID. _ curl_easy_setopt_ccsid() Variable arguments are a string pointer and a CCSID (unsigned int) for options: + CURLOPT_ABSTRACT_UNIX_SOCKET CURLOPT_CAINFO CURLOPT_CAPATH CURLOPT_COOKIE @@ -90,6 +91,7 @@ options: CURLOPT_NOPROXY CURLOPT_PASSWORD CURLOPT_PINNEDPUBLICKEY + CURLOPT_PRE_PROXY CURLOPT_PROXY CURLOPT_PROXYPASSWORD CURLOPT_PROXYUSERNAME @@ -116,7 +118,6 @@ options: CURLOPT_RTSP_TRANSPORT CURLOPT_SERVICE_NAME CURLOPT_SOCKS5_GSSAPI_SERVICE - CURLOPT_SOCKS_PROXY CURLOPT_SSH_HOST_PUBLIC_KEY_MD5 CURLOPT_SSH_KNOWNHOSTS CURLOPT_SSH_PRIVATE_KEYFILE diff --git a/packages/OS400/ccsidcurl.c b/packages/OS400/ccsidcurl.c index b1c124434..c5ac3d35a 100644 --- a/packages/OS400/ccsidcurl.c +++ b/packages/OS400/ccsidcurl.c @@ -1135,6 +1135,7 @@ curl_easy_setopt_ccsid(CURL * curl, CURLoption tag, ...) switch (tag) { + case CURLOPT_ABSTRACT_UNIX_SOCKET: case CURLOPT_CAINFO: case CURLOPT_CAPATH: case CURLOPT_COOKIE: @@ -1161,6 +1162,7 @@ curl_easy_setopt_ccsid(CURL * curl, CURLoption tag, ...) case CURLOPT_NOPROXY: case CURLOPT_PASSWORD: case CURLOPT_PINNEDPUBLICKEY: + case CURLOPT_PRE_PROXY: case CURLOPT_PROXY: case CURLOPT_PROXYPASSWORD: case CURLOPT_PROXYUSERNAME: @@ -1187,7 +1189,6 @@ curl_easy_setopt_ccsid(CURL * curl, CURLoption tag, ...) case CURLOPT_RTSP_TRANSPORT: case CURLOPT_SERVICE_NAME: case CURLOPT_SOCKS5_GSSAPI_SERVICE: - case CURLOPT_SOCKS_PROXY: case CURLOPT_SSH_HOST_PUBLIC_KEY_MD5: case CURLOPT_SSH_KNOWNHOSTS: case CURLOPT_SSH_PRIVATE_KEYFILE: diff --git a/packages/OS400/curl.inc.in b/packages/OS400/curl.inc.in index a3ed83781..c6224a781 100644 --- a/packages/OS400/curl.inc.in +++ b/packages/OS400/curl.inc.in @@ -1294,11 +1294,11 @@ d c 10260 d CURLOPT_PROXY_SSL_OPTIONS... d c 00261 - d CURLOPT_SOCKS_PROXY... + d CURLOPT_PRE_PROXY... d c 10262 - d CURLOPT_SOCKS_PROXYTYPE... - d c 00263 d CURLOPT_PROXY_PINNEDPUBLICKEY... + d c 10263 + d CURLOPT_ABSTRACT_UNIX_SOCKET... d c 10264 * /if not defined(CURL_NO_OLDIES) diff --git a/src/tool_setopt.h b/src/tool_setopt.h index fecf24fa3..c27541b8b 100644 --- a/src/tool_setopt.h +++ b/src/tool_setopt.h @@ -71,7 +71,6 @@ extern const NameValueUnsigned setopt_nv_CURLAUTH[]; #define setopt_nv_CURLOPT_PROTOCOLS setopt_nv_CURLPROTO #define setopt_nv_CURLOPT_REDIR_PROTOCOLS setopt_nv_CURLPROTO #define setopt_nv_CURLOPT_PROXYTYPE setopt_nv_CURLPROXY -#define setopt_nv_CURLOPT_SOCKS_PROXYTYPE setopt_nv_CURL_SOCKS_PROXY #define setopt_nv_CURLOPT_PROXYAUTH setopt_nv_CURLAUTH /* Intercept setopt calls for --libcurl */ |