aboutsummaryrefslogtreecommitdiff
path: root/packages
diff options
context:
space:
mode:
Diffstat (limited to 'packages')
-rw-r--r--packages/OS400/.gitattributes6
-rw-r--r--packages/OS400/ccsidcurl.c2
-rw-r--r--packages/OS400/curl.inc.in18
-rw-r--r--packages/vms/config_h.com32
4 files changed, 25 insertions, 33 deletions
diff --git a/packages/OS400/.gitattributes b/packages/OS400/.gitattributes
new file mode 100644
index 000000000..e9b8201b5
--- /dev/null
+++ b/packages/OS400/.gitattributes
@@ -0,0 +1,6 @@
+# Copyright (C) Daniel Stenberg, <daniel@haxx.se>, et al.
+#
+# SPDX-License-Identifier: curl
+
+# OS400 .cmd files are not windows scripts.
+*.cmd text eol=auto
diff --git a/packages/OS400/ccsidcurl.c b/packages/OS400/ccsidcurl.c
index 48f1f5fbd..596c1f1e1 100644
--- a/packages/OS400/ccsidcurl.c
+++ b/packages/OS400/ccsidcurl.c
@@ -1282,7 +1282,7 @@ curl_easy_setopt_ccsid(CURL *easy, CURLoption tag, ...)
result = curl_easy_setopt(easy, tag, &blob);
break;
}
- /* FALLTHROUGH */
+ FALLTHROUGH();
case CURLOPT_ERRORBUFFER: /* This is an output buffer. */
result = Curl_vsetopt(easy, tag, arg);
break;
diff --git a/packages/OS400/curl.inc.in b/packages/OS400/curl.inc.in
index d1254ce49..b3a4e9efd 100644
--- a/packages/OS400/curl.inc.in
+++ b/packages/OS400/curl.inc.in
@@ -667,6 +667,8 @@
d c 98
d CURLE_UNRECOVERABLE_POLL...
d c 99
+ d CURLE_TOO_LARGE...
+ d c 100
*
/if not defined(CURL_NO_OLDIES)
d CURLE_URL_MALFORMAT_USER...
@@ -1655,6 +1657,10 @@
d c 00321
d CURLOPT_QUICK_EXIT...
d c 00322
+ d CURLOPT_HAPROXY_CLIENT_IP...
+ d c 10323
+ d CURLOPT_SERVER_RESPONSE_TIMEOUT_MS...
+ d c 00324
*
/if not defined(CURL_NO_OLDIES)
d CURLOPT_FILE c 10001
@@ -1890,6 +1896,12 @@
d c X'0010003D'
d CURLINFO_CAPATH... CURLINFO_STRING + 62
d c X'0010003E'
+ d CURLINFO_XFER_ID... CURLINFO_OFF_T + 63
+ d c X'0060003F'
+ d CURLINFO_CONN_ID... CURLINFO_OFF_T + 64
+ d c X'00600040'
+ d CURLINFO_QUEUE_TIME_T... CURLINFO_OFF_T + 65
+ d c X'00600041'
*
d CURLINFO_HTTP_CODE... Old ...RESPONSE_CODE
d c X'00200002'
@@ -2251,6 +2263,8 @@
d c 29
d CURLUE_LACKS_IDN...
d c 30
+ d CURLUE_TOO_LARGE...
+ d c 31
*
d CURLUPart s 10i 0 based(######ptr######) Enum
d CURLUPART_URL c 0
@@ -3062,6 +3076,10 @@
d sockfd value like(curl_socket_t)
d sockp * value void *
*
+ d curl_multi_get_handles...
+ d pr * extproc('curl_multi_get_handles') CURL **
+ d multi_handle * value CURLM *
+ *
d curl_url pr * extproc('curl_url') CURLU *
*
d curl_url_cleanup...
diff --git a/packages/vms/config_h.com b/packages/vms/config_h.com
index 6e4e03963..6378802ad 100644
--- a/packages/vms/config_h.com
+++ b/packages/vms/config_h.com
@@ -1386,38 +1386,6 @@ $ write tf "#define ''key2' 1"
$ write tf "#endif"
$ goto cfgh_in_loop1
$ endif
-$!
-$! This is really do we have the newer MIT Kerberos
-$!----------------------------------------------------------------------
-$ if (key2 .eqs. "HAVE_GSSMIT")
-$ then
-$ if f$search(test_mit) .nes. ""
-$ then
-$ write tf "#ifndef ''key2'"
-$ write tf "#define ''key2' 1"
-$ else
-$ write tf "#ifdef ''key2'"
-$ write tf "#undef ''key2'"
-$ endif
-$ write tf "#endif"
-$ goto cfgh_in_loop1
-$ endif
-$!
-$! Older MIT looks like Heimdal
-$!------------------------------------------------
-$ if (key2 .eqs. "HAVE_HEIMDAL")
-$ then
-$ if f$search(test_mit) .eqs. ""
-$ then
-$ write tf "#ifndef ''key2'"
-$ write tf "#define ''key2' 1"
-$ else
-$ write tf "#ifdef ''key2'"
-$ write tf "#undef ''key2'"
-$ endif
-$ write tf "#endif"
-$ goto cfgh_in_loop1
-$ endif
$ endif
$!
$ endif