[gnurl] 258/411: os400: Sync libcurl API options

[gnunet]

This is an automated email from the git hooks/post-receive script.

nikita pushed a commit to branch master
in repository gnurl.

commit 3bcd81df925d47d1b877a918a3665cdd551d9248
Author: Jay Satiro <raysatiro@yahoo.com>
AuthorDate: Thu Oct 15 03:32:30 2020 -0400

    os400: Sync libcurl API options
    
    This fixes the OS400 build and also an incorrect entry for
    CURLINFO_APPCONNECT_TIME_T where it was treated as
    CURLINFO_STARTTRANSFER_TIME_T.
    
    Reported-by: Jon Rumsey
    
    Fixes https://github.com/curl/curl/issues/6083
    Closes https://github.com/curl/curl/pull/6084
---
 packages/OS400/ccsidcurl.c  |  1 +
 packages/OS400/chkstrings.c |  2 +-
 packages/OS400/curl.inc.in  | 28 +++++++++++++++++++++++++++-
 3 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/packages/OS400/ccsidcurl.c b/packages/OS400/ccsidcurl.c
index 4e04927b0..f0f7f485a 100644
--- a/packages/OS400/ccsidcurl.c
+++ b/packages/OS400/ccsidcurl.c
@@ -1208,6 +1208,7 @@ curl_easy_setopt_ccsid(CURL *curl, CURLoption tag, ...)
   case CURLOPT_SSLKEY:
   case CURLOPT_SSLKEYTYPE:
   case CURLOPT_SSL_CIPHER_LIST:
+  case CURLOPT_SSL_EC_CURVES:
   case CURLOPT_TLS13_CIPHERS:
   case CURLOPT_TLSAUTH_PASSWORD:
   case CURLOPT_TLSAUTH_TYPE:
diff --git a/packages/OS400/chkstrings.c b/packages/OS400/chkstrings.c
index 083263640..3b87fdafa 100644
--- a/packages/OS400/chkstrings.c
+++ b/packages/OS400/chkstrings.c
@@ -34,7 +34,7 @@
  * made, the EXPECTED_STRING_LASTZEROTERMINATED/EXPECTED_STRING_LAST
  * values can be updated to match the latest enum values in urldata.h.
  */
-#define EXPECTED_STRING_LASTZEROTERMINATED  (STRING_DNS_LOCAL_IP6 + 1)
+#define EXPECTED_STRING_LASTZEROTERMINATED  (STRING_SSL_EC_CURVES + 1)
 #define EXPECTED_STRING_LAST                (STRING_COPYPOSTFIELDS + 1)
 
 int main(int argc, char *argv[])
diff --git a/packages/OS400/curl.inc.in b/packages/OS400/curl.inc.in
index 33ac8b34b..52922063d 100644
--- a/packages/OS400/curl.inc.in
+++ b/packages/OS400/curl.inc.in
@@ -236,6 +236,8 @@
      d                 c                   20000
      d CURLOPTTYPE_OFF_T...
      d                 c                   30000
+     d CURLOPTTYPE_BLOB...
+     d                 c                   40000
       *
      d CURL_IPRESOLVE_WHATEVER...
      d                 c                   0
@@ -1436,6 +1438,24 @@
      d                 c                   00288
      d  CURLOPT_SASL_AUTHZID...
      d                 c                   10289
+     d  CURLOPT_MAIL_RCPT_ALLLOWFAILS...
+     d                 c                   00290
+     d  CURLOPT_SSLCERT_BLOB...
+     d                 c                   40291
+     d  CURLOPT_SSLKEY_BLOB...
+     d                 c                   40292
+     d  CURLOPT_PROXY_SSLCERT_BLOB...
+     d                 c                   40293
+     d  CURLOPT_PROXY_SSLKEY_BLOB...
+     d                 c                   40294
+     d  CURLOPT_ISSUERCERT_BLOB...
+     d                 c                   40295
+     d  CURLOPT_PROXY_ISSUERCERT...
+     d                 c                   10296
+     d  CURLOPT_PROXY_ISSUERCERT_BLOB...
+     d                 c                   40297
+     d  CURLOPT_SSL_EC_CURVES...
+     d                 c                   10298
       *
       /if not defined(CURL_NO_OLDIES)
      d  CURLOPT_FILE   c                   10001
@@ -1655,7 +1675,13 @@
      d  CURLINFO_REDIRECT_TIME_T...                                            
 CURLINFO_OFF_T  + 55
      d                 c                   X'00600037'
      d  CURLINFO_APPCONNECT_TIME_T...                                          
 CURLINFO_OFF_T  + 56
-     d                 c                   X'00600036'
+     d                 c                   X'00600038'
+     d  CURLINFO_RETRY_AFTER...                                                
 CURLINFO_OFF_T  + 57
+     d                 c                   X'00600039'
+     d  CURLINFO_EFFECTIVE_METHOD...                                           
 CURLINFO_STRING + 58
+     d                 c                   X'0010003A'
+     d  CURLINFO_PROXY_ERROR...                                                
 CURLINFO_LONG + 59
+     d                 c                   X'0020003B'
       *
      d  CURLINFO_HTTP_CODE...                                                  
 Old ...RESPONSE_CODE
      d                 c                   X'00200002'

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.