summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lib/config-os400.h5
-rw-r--r--packages/OS400/README.OS4001
-rw-r--r--packages/OS400/ccsidcurl.c3
-rw-r--r--packages/OS400/curl.inc.in23
4 files changed, 29 insertions, 3 deletions
diff --git a/lib/config-os400.h b/lib/config-os400.h
index 7844444fe..d2cb1caff 100644
--- a/lib/config-os400.h
+++ b/lib/config-os400.h
@@ -7,7 +7,7 @@
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2017, 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
@@ -425,6 +425,9 @@
/* Define if you can safely include both <sys/time.h> and <time.h>. */
#define TIME_WITH_SYS_TIME
+/* to enable alt-svc */
+#define USE_ALTSVC 1
+
/* Version number of package */
#undef VERSION
diff --git a/packages/OS400/README.OS400 b/packages/OS400/README.OS400
index 967c26f68..c653ceceb 100644
--- a/packages/OS400/README.OS400
+++ b/packages/OS400/README.OS400
@@ -64,6 +64,7 @@ _ curl_easy_setopt_ccsid()
Variable arguments are a string pointer and a CCSID (unsigned int) for
options:
CURLOPT_ABSTRACT_UNIX_SOCKET
+ CURLOPT_ALTSVC
CURLOPT_CAINFO
CURLOPT_CAPATH
CURLOPT_COOKIE
diff --git a/packages/OS400/ccsidcurl.c b/packages/OS400/ccsidcurl.c
index 7ce61aa9f..eae2c5751 100644
--- a/packages/OS400/ccsidcurl.c
+++ b/packages/OS400/ccsidcurl.c
@@ -1132,7 +1132,7 @@ curl_easy_setopt_ccsid(CURL * curl, CURLoption tag, ...)
if(testwarn) {
testwarn = 0;
- if((int) STRING_LASTZEROTERMINATED != (int) STRING_DOH + 1 ||
+ if((int) STRING_LASTZEROTERMINATED != (int) STRING_ALTSVC + 1 ||
(int) STRING_LAST != (int) STRING_COPYPOSTFIELDS + 1)
curl_mfprintf(stderr,
"*** WARNING: curl_easy_setopt_ccsid() should be reworked ***\n");
@@ -1144,6 +1144,7 @@ curl_easy_setopt_ccsid(CURL * curl, CURLoption tag, ...)
switch (tag) {
case CURLOPT_ABSTRACT_UNIX_SOCKET:
+ case CURLOPT_ALTSVC:
case CURLOPT_CAINFO:
case CURLOPT_CAPATH:
case CURLOPT_COOKIE:
diff --git a/packages/OS400/curl.inc.in b/packages/OS400/curl.inc.in
index 643f480c5..72a769f1d 100644
--- a/packages/OS400/curl.inc.in
+++ b/packages/OS400/curl.inc.in
@@ -5,7 +5,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
@@ -134,6 +134,10 @@
d c X'00200000'
d CURL_VERSION_MULTI_SSL...
d c X'00400000'
+ d CURL_VERSION_BROTLI...
+ d c X'00800000'
+ d CURL_VERSION_ALTSVC...
+ d c X'01000000'
*
d CURL_HTTPPOST_FILENAME...
d c X'00000001'
@@ -814,6 +818,19 @@
d CURLHEADER_SEPARATE...
d c X'00000001'
*
+ d CURLALTSVC_IMMEDIATELY...
+ d c X'00000001'
+ d CURLALTSVC_ALTUSED...
+ d c X'00000002'
+ d CURLALTSVC_READONLYFILE...
+ d c X'00000004'
+ d CURLALTSVC_H1...
+ d c X'00000008'
+ d CURLALTSVC_H2...
+ d c X'00000010'
+ d CURLALTSVC_H3...
+ d c X'00000020'
+ *
d CURLPROTO_HTTP...
d c X'00000001'
d CURLPROTO_HTTPS...
@@ -1395,6 +1412,10 @@
d c 10284
d CURLOPT_HTTP09_ALLOWED...
d c 00285
+ d CURLOPT_ALTSVC_CTRL...
+ d c 00286
+ d CURLOPT_ALTSVC...
+ d c 10287
*
/if not defined(CURL_NO_OLDIES)
d CURLOPT_FILE c 10001