From f66e1c49b026a9f72cda3edd604a68b1ec9f4052 Mon Sep 17 00:00:00 2001
From: Patrick Monnerat <Patrick.Monnerat@datasphere.ch>
Date: Fri, 17 Oct 2008 13:17:41 +0000
Subject: [PATCH] Introduce new options CURLOPT_PROXY{USERNAME, PASSWORD} in
OS400 code and RPG binding.
---
packages/OS400/README.OS400 | 2 ++
packages/OS400/ccsidcurl.c | 4 +++-
packages/OS400/curl.inc.in | 4 ++++
3 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/packages/OS400/README.OS400 b/packages/OS400/README.OS400
index bdfcae169a..9e25a10a0e 100644
--- a/packages/OS400/README.OS400
+++ b/packages/OS400/README.OS400
@@ -103,6 +103,8 @@ options:
CURLOPT_ISSUERCERT
CURLOPT_USERNAME
CURLOPT_PASSWORD
+ CURLOPT_PROXYUSERNAME
+ CURLOPT_PROXYPASSWORD
Else it is the same as for curl_easy_setopt().
Note that CURLOPT_ERRORBUFFER is not in the list above, since it gives the
address of an (empty) character buffer, not the address of a string.
diff --git a/packages/OS400/ccsidcurl.c b/packages/OS400/ccsidcurl.c
index 0530b52329..88aa9c08de 100644
--- a/packages/OS400/ccsidcurl.c
+++ b/packages/OS400/ccsidcurl.c
@@ -1030,7 +1030,7 @@ curl_easy_setopt_ccsid(CURL * curl, CURLoption tag, ...)
if (testwarn) {
testwarn = 0;
- if ((int) STRING_LAST != (int) STRING_PASSWORD + 1)
+ if ((int) STRING_LAST != (int) STRING_PROXYPASSWORD + 1)
curl_mfprintf(stderr,
"*** WARNING: curl_easy_setopt_ccsid() should be reworked ***\n");
}
@@ -1077,6 +1077,8 @@ curl_easy_setopt_ccsid(CURL * curl, CURLoption tag, ...)
case CURLOPT_ISSUERCERT:
case CURLOPT_USERNAME:
case CURLOPT_PASSWORD:
+ case CURLOPT_PROXYUSERNAME:
+ case CURLOPT_PROXYPASSWORD:
s = va_arg(arg, char *);
ccsid = va_arg(arg, unsigned int);
diff --git a/packages/OS400/curl.inc.in b/packages/OS400/curl.inc.in
index 7474e06a06..0a7e5e9be2 100644
--- a/packages/OS400/curl.inc.in
+++ b/packages/OS400/curl.inc.in
@@ -786,6 +786,10 @@
d c 10173
d CURLOPT_PASSWORD...
d c 10174
+ d CURLOPT_PROXYUSERNAME...
+ d c 10175
+ d CURLOPT_PROXYPASSWORD...
+ d c 10176
*
d CURLOPT_POST301...
d c 00161 Obsolescent
--
GitLab