diff options
| author | ng0 <ng0@n0.is> | 2019-09-12 15:09:29 +0000 |
|---|---|---|
| committer | ng0 <ng0@n0.is> | 2019-09-12 15:09:29 +0000 |
| commit | 5d5a61dc56228532927a7786375a13d7ae749180 (patch) | |
| tree | 1b4b73a0016f005655aaa18982df8383f790527f /packages | |
| parent | bc555b4f37422efffcc9969f645f9dbf3cb444bd (diff) | |
| parent | 9cd755e1d768bbf228e7c9faf223b7459f7e0105 (diff) | |
| download | gnurl-5d5a61dc56228532927a7786375a13d7ae749180.tar.gz gnurl-5d5a61dc56228532927a7786375a13d7ae749180.tar.bz2 gnurl-5d5a61dc56228532927a7786375a13d7ae749180.zip | |
Merge tag 'curl-7_66_0'
7.66.0
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/OS400/README.OS400 | 1 | ||||
| -rw-r--r-- | packages/OS400/ccsidcurl.c | 8 | ||||
| -rw-r--r-- | packages/OS400/ccsidcurl.h | 8 | ||||
| -rw-r--r-- | packages/OS400/curl.inc.in | 4 |
4 files changed, 10 insertions, 11 deletions
diff --git a/packages/OS400/README.OS400 b/packages/OS400/README.OS400 index 132d1b92f..4ac8feca8 100644 --- a/packages/OS400/README.OS400 +++ b/packages/OS400/README.OS400 @@ -120,6 +120,7 @@ options: CURLOPT_RTSP_SESSION_UID CURLOPT_RTSP_STREAM_URI CURLOPT_RTSP_TRANSPORT + CURLOPT_SASL_AUTHZID CURLOPT_SERVICE_NAME CURLOPT_SOCKS5_GSSAPI_SERVICE CURLOPT_SSH_HOST_PUBLIC_KEY_MD5 diff --git a/packages/OS400/ccsidcurl.c b/packages/OS400/ccsidcurl.c index 4b462a273..11e4c777e 100644 --- a/packages/OS400/ccsidcurl.c +++ b/packages/OS400/ccsidcurl.c @@ -1141,12 +1141,7 @@ curl_easy_setopt_ccsid(CURL *curl, CURLoption tag, ...) if(testwarn) { testwarn = 0; - if( -#ifdef USE_ALTSVC - (int) STRING_LASTZEROTERMINATED != (int) STRING_ALTSVC + 1 || -#else - (int) STRING_LASTZEROTERMINATED != (int) STRING_DOH + 1 || -#endif + if((int) STRING_LASTZEROTERMINATED != (int) STRING_SASL_AUTHZID + 1 || (int) STRING_LAST != (int) STRING_COPYPOSTFIELDS + 1) curl_mfprintf(stderr, "*** WARNING: curl_easy_setopt_ccsid() should be reworked ***\n"); @@ -1213,6 +1208,7 @@ curl_easy_setopt_ccsid(CURL *curl, CURLoption tag, ...) case CURLOPT_RTSP_SESSION_ID: case CURLOPT_RTSP_STREAM_URI: case CURLOPT_RTSP_TRANSPORT: + case CURLOPT_SASL_AUTHZID: case CURLOPT_SERVICE_NAME: case CURLOPT_SOCKS5_GSSAPI_SERVICE: case CURLOPT_SSH_HOST_PUBLIC_KEY_MD5: diff --git a/packages/OS400/ccsidcurl.h b/packages/OS400/ccsidcurl.h index 895db7002..9594f6610 100644 --- a/packages/OS400/ccsidcurl.h +++ b/packages/OS400/ccsidcurl.h @@ -1,3 +1,5 @@ +#ifndef CURLINC_CCSIDCURL_H +#define CURLINC_CCSIDCURL_H /*************************************************************************** * _ _ ____ _ * Project ___| | | | _ \| | @@ -5,7 +7,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2018, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2019, Daniel Stenberg, <daniel@haxx.se>, et al. * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms @@ -20,10 +22,6 @@ * * ***************************************************************************/ - -#ifndef __CURL_CCSIDCURL_H -#define __CURL_CCSIDCURL_H - #include "curl.h" #include "easy.h" #include "multi.h" diff --git a/packages/OS400/curl.inc.in b/packages/OS400/curl.inc.in index 8e36bac3b..5a53b1b21 100644 --- a/packages/OS400/curl.inc.in +++ b/packages/OS400/curl.inc.in @@ -138,6 +138,8 @@ d c X'00800000' d CURL_VERSION_ALTSVC... d c X'01000000' + d CURL_VERSION_HTTP3... + d c X'02000000' * d CURL_HTTPPOST_FILENAME... d c X'00000001' @@ -1418,6 +1420,8 @@ d c 10287 d CURLOPT_MAXAGE_CONN... d c 00288 + d CURLOPT_SASL_AUTHZID... + d c 10289 * /if not defined(CURL_NO_OLDIES) d CURLOPT_FILE c 10001 |