luo980/curl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

OS400: Fix symbols

Browse Source 
- 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
This commit is contained in:
Jay Satiro 2017-02-01 18:28:29 -05:00
parent 1c877a0712
commit a49d2d0e25
4 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
packages/OS400/README.OS400
View File

@ -63,6 +63,7 @@ designer. CCSID 0 can be used to select the current job's CCSID.
_ curl_easy_setopt_ccsid() _ curl_easy_setopt_ccsid()
Variable arguments are a string pointer and a CCSID (unsigned int) for Variable arguments are a string pointer and a CCSID (unsigned int) for
options: options:
CURLOPT_ABSTRACT_UNIX_SOCKET
CURLOPT_CAINFO CURLOPT_CAINFO
CURLOPT_CAPATH CURLOPT_CAPATH
CURLOPT_COOKIE CURLOPT_COOKIE
@ -90,6 +91,7 @@ options:
CURLOPT_NOPROXY CURLOPT_NOPROXY
CURLOPT_PASSWORD CURLOPT_PASSWORD
CURLOPT_PINNEDPUBLICKEY CURLOPT_PINNEDPUBLICKEY
CURLOPT_PRE_PROXY
CURLOPT_PROXY CURLOPT_PROXY
CURLOPT_PROXYPASSWORD CURLOPT_PROXYPASSWORD
CURLOPT_PROXYUSERNAME CURLOPT_PROXYUSERNAME
@ -116,7 +118,6 @@ options:
CURLOPT_RTSP_TRANSPORT CURLOPT_RTSP_TRANSPORT
CURLOPT_SERVICE_NAME CURLOPT_SERVICE_NAME
CURLOPT_SOCKS5_GSSAPI_SERVICE CURLOPT_SOCKS5_GSSAPI_SERVICE
CURLOPT_SOCKS_PROXY
CURLOPT_SSH_HOST_PUBLIC_KEY_MD5 CURLOPT_SSH_HOST_PUBLIC_KEY_MD5
CURLOPT_SSH_KNOWNHOSTS CURLOPT_SSH_KNOWNHOSTS
CURLOPT_SSH_PRIVATE_KEYFILE CURLOPT_SSH_PRIVATE_KEYFILE

3
packages/OS400/ccsidcurl.c
View File

@ -1135,6 +1135,7 @@ curl_easy_setopt_ccsid(CURL * curl, CURLoption tag, ...)
switch (tag) { switch (tag) {
case CURLOPT_ABSTRACT_UNIX_SOCKET:
case CURLOPT_CAINFO: case CURLOPT_CAINFO:
case CURLOPT_CAPATH: case CURLOPT_CAPATH:
case CURLOPT_COOKIE: case CURLOPT_COOKIE:
@ -1161,6 +1162,7 @@ curl_easy_setopt_ccsid(CURL * curl, CURLoption tag, ...)
case CURLOPT_NOPROXY: case CURLOPT_NOPROXY:
case CURLOPT_PASSWORD: case CURLOPT_PASSWORD:
case CURLOPT_PINNEDPUBLICKEY: case CURLOPT_PINNEDPUBLICKEY:
case CURLOPT_PRE_PROXY:
case CURLOPT_PROXY: case CURLOPT_PROXY:
case CURLOPT_PROXYPASSWORD: case CURLOPT_PROXYPASSWORD:
case CURLOPT_PROXYUSERNAME: case CURLOPT_PROXYUSERNAME:
@ -1187,7 +1189,6 @@ curl_easy_setopt_ccsid(CURL * curl, CURLoption tag, ...)
case CURLOPT_RTSP_TRANSPORT: case CURLOPT_RTSP_TRANSPORT:
case CURLOPT_SERVICE_NAME: case CURLOPT_SERVICE_NAME:
case CURLOPT_SOCKS5_GSSAPI_SERVICE: case CURLOPT_SOCKS5_GSSAPI_SERVICE:
case CURLOPT_SOCKS_PROXY:
case CURLOPT_SSH_HOST_PUBLIC_KEY_MD5: case CURLOPT_SSH_HOST_PUBLIC_KEY_MD5:
case CURLOPT_SSH_KNOWNHOSTS: case CURLOPT_SSH_KNOWNHOSTS:
case CURLOPT_SSH_PRIVATE_KEYFILE: case CURLOPT_SSH_PRIVATE_KEYFILE:

6
packages/OS400/curl.inc.in
View File

@ -1294,11 +1294,11 @@
d c 10260 d c 10260
d CURLOPT_PROXY_SSL_OPTIONS... d CURLOPT_PROXY_SSL_OPTIONS...
d c 00261 d c 00261
d CURLOPT_SOCKS_PROXY... d CURLOPT_PRE_PROXY...
d c 10262 d c 10262
d CURLOPT_SOCKS_PROXYTYPE...
d c 00263
d CURLOPT_PROXY_PINNEDPUBLICKEY... d CURLOPT_PROXY_PINNEDPUBLICKEY...
d c 10263
d CURLOPT_ABSTRACT_UNIX_SOCKET...
d c 10264 d c 10264
* *
/if not defined(CURL_NO_OLDIES) /if not defined(CURL_NO_OLDIES)

1
src/tool_setopt.h
View File

@ -71,7 +71,6 @@ extern const NameValueUnsigned setopt_nv_CURLAUTH[];
#define setopt_nv_CURLOPT_PROTOCOLS setopt_nv_CURLPROTO #define setopt_nv_CURLOPT_PROTOCOLS setopt_nv_CURLPROTO
#define setopt_nv_CURLOPT_REDIR_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_PROXYTYPE setopt_nv_CURLPROXY
#define setopt_nv_CURLOPT_SOCKS_PROXYTYPE setopt_nv_CURL_SOCKS_PROXY
#define setopt_nv_CURLOPT_PROXYAUTH setopt_nv_CURLAUTH #define setopt_nv_CURLOPT_PROXYAUTH setopt_nv_CURLAUTH
/* Intercept setopt calls for --libcurl */ /* Intercept setopt calls for --libcurl */