[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] [gnurl] 105/173: OS400: Fix symbols
From: |
gnunet |
Subject: |
[GNUnet-SVN] [gnurl] 105/173: OS400: Fix symbols |
Date: |
Fri, 24 Feb 2017 14:02:07 +0100 |
This is an automated email from the git hooks/post-receive script.
ng0 pushed a commit to annotated tag gnurl-7.53.1
in repository gnurl.
commit a49d2d0e25b5441e34ae29dcd18f2658a951eace
Author: Jay Satiro <address@hidden>
AuthorDate: Wed Feb 1 18:28:29 2017 -0500
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: address@hidden
---
packages/OS400/README.OS400 | 3 ++-
packages/OS400/ccsidcurl.c | 3 ++-
packages/OS400/curl.inc.in | 6 +++---
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 */
--
To stop receiving notification emails like this one, please contact
address@hidden
- [GNUnet-SVN] [gnurl] 90/173: cmdline-opts/gen.pl: Open input files in CRLF mode, (continued)
- [GNUnet-SVN] [gnurl] 90/173: cmdline-opts/gen.pl: Open input files in CRLF mode, gnunet, 2017/02/24
- [GNUnet-SVN] [gnurl] 59/173: next.d: --trace and --trace-ascii are also global, gnunet, 2017/02/24
- [GNUnet-SVN] [gnurl] 72/173: nss: use the correct lock in nss_find_slot_by_name(), gnunet, 2017/02/24
- [GNUnet-SVN] [gnurl] 44/173: STARTTLS: Don't print response character in denied messages, gnunet, 2017/02/24
- [GNUnet-SVN] [gnurl] 35/173: ROADMAP: 2017 cleanup, gnunet, 2017/02/24
- [GNUnet-SVN] [gnurl] 71/173: http2: disable server push if not requested, gnunet, 2017/02/24
- [GNUnet-SVN] [gnurl] 83/173: CURLOPT_BUFFERSIZE: support enlarging receive buffer, gnunet, 2017/02/24
- [GNUnet-SVN] [gnurl] 67/173: TODO: implemened "--fail-fast to exit on first transfer fail", gnunet, 2017/02/24
- [GNUnet-SVN] [gnurl] 45/173: rand: make it work without TLS backing, gnunet, 2017/02/24
- [GNUnet-SVN] [gnurl] 73/173: bump: next release will be 7.53.0, gnunet, 2017/02/24
- [GNUnet-SVN] [gnurl] 105/173: OS400: Fix symbols,
gnunet <=
- [GNUnet-SVN] [gnurl] 55/173: IDN: Use TR46 non-transitional, gnunet, 2017/02/24
- [GNUnet-SVN] [gnurl] 97/173: gnutls: disable TLS session tickets, gnunet, 2017/02/24
- [GNUnet-SVN] [gnurl] 48/173: docs: FAQ MAIL-ETIQUETTE language fixes, gnunet, 2017/02/24
- [GNUnet-SVN] [gnurl] 75/173: openssl: Fix random generation, gnunet, 2017/02/24
- [GNUnet-SVN] [gnurl] 74/173: TODO: share OpenSSL contexts, gnunet, 2017/02/24
- [GNUnet-SVN] [gnurl] 99/173: RELEASE-NOTES; synced with ab08d82648, gnunet, 2017/02/24
- [GNUnet-SVN] [gnurl] 79/173: docs: non-blocking SSL handshake is now supported with NSS, gnunet, 2017/02/24
- [GNUnet-SVN] [gnurl] 98/173: mbedtls: disable TLS session tickets, gnunet, 2017/02/24
- [GNUnet-SVN] [gnurl] 132/173: smb: code indent, gnunet, 2017/02/24
- [GNUnet-SVN] [gnurl] 135/173: axtls: adapt to API changes, gnunet, 2017/02/24