Introduce new options CURLOPT_PROXY{USERNAME, PASSWORD} in OS400 code and RPG binding.

diff --git a/packages/OS400/README.OS400 b/packages/OS400/README.OS400
index bdfcae169a9cad51f555f8b0a84d561f9f7a1227..9e25a10a0e1d31d5a9dca21897dbcefb5c6bf747 100644 (file)
--- 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 0530b5232987e25be99c61c2fcd4e12c5cbc3529..88aa9c08dec8f2772e51341a4fe2ae6c5d711121 100644 (file)
--- 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 7474e06a062dd3aef9227879ea32a245f08301e9..0a7e5e9be2aec930965546eb9a1efed05c770901 100644 (file)
--- 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