diff options
| author | Nils Gillmann <gillmann@gnunet.org> | 2018-03-30 14:47:12 +0000 |
|---|---|---|
| committer | Nils Gillmann <gillmann@gnunet.org> | 2018-03-30 14:47:12 +0000 |
| commit | 4bdd2f26cf0ae539253feff8207e97ed4ce1d7ff (patch) | |
| tree | b8de037ad9c786b1799e33b5f38f8499ea35741b /packages | |
| parent | b7ee0651926ee8706f066232f3c5d3b8a9c554fe (diff) | |
| parent | 4d6bd91ab33328c6d27eddc32e064defc02dc4fd (diff) | |
| download | gnurl-4bdd2f26cf0ae539253feff8207e97ed4ce1d7ff.tar.gz gnurl-4bdd2f26cf0ae539253feff8207e97ed4ce1d7ff.tar.bz2 gnurl-4bdd2f26cf0ae539253feff8207e97ed4ce1d7ff.zip | |
Merge tag 'curl-7_59_0' of https://github.com/curl/curl
curl 7.59.0
Initial merge of upstream tag.
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/OS400/README.OS400 | 6 | ||||
| -rw-r--r-- | packages/OS400/curl.inc.in | 11 | ||||
| -rw-r--r-- | packages/Symbian/group/libcurl.mmp | 4 | ||||
| -rw-r--r-- | packages/vms/config_h.com | 2 |
4 files changed, 17 insertions, 6 deletions
diff --git a/packages/OS400/README.OS400 b/packages/OS400/README.OS400 index db46a4ee1..f92d11637 100644 --- a/packages/OS400/README.OS400 +++ b/packages/OS400/README.OS400 @@ -183,8 +183,8 @@ CCSID. CURLINFO_COOKIELIST Lists returned should be released with curl_slist_free_all() after use. Option CURLINFO_CERTINFO is followed by a struct curl_certinfo * * and a -CCSID. Returned structures sould be free'ed using curl_certinfo_free_all() after -use. +CCSID. Returned structures should be free'ed using curl_certinfo_free_all() +after use. Other options are processed like in curl_easy_getinfo(). _ curl_pushheader_bynum_cssid() and curl_pushheader_byname_ccsid() @@ -243,7 +243,7 @@ _ If data compression has to be supported, ZLIB development environment must _ Likewise, if SCP and SFTP protocols have to be compiled in, LIBSSH2 developent environment must be installed. _ Install the curl source directory in IFS. Do NOT install it in the - installation target directory (wich defaults to /curl). + installation target directory (which defaults to /curl). _ Enter shell (QSH) _ Change current directory to the curl installation directory _ Change current directory to ./packages/OS400 diff --git a/packages/OS400/curl.inc.in b/packages/OS400/curl.inc.in index 03603e290..a21ee9bba 100644 --- a/packages/OS400/curl.inc.in +++ b/packages/OS400/curl.inc.in @@ -1322,6 +1322,14 @@ d c 00268 d CURLOPT_MIMEPOST... d c 10269 + d CURLOPT_TIMEVALUE_LARGE... + d c 30270 + d CURLOPT_HAPPY_EYEBALLS_TIMEOUT_MS... + d c 00271 + d CURLOPT_RESOLVER_START_FUNCTION... + d c 20272 + d CURLOPT_RESOLVER_START_DATA... + d c 10273 * /if not defined(CURL_NO_OLDIES) d CURLOPT_FILE c 10001 @@ -1960,6 +1968,9 @@ d curl_closesocket_callback... d s * based(######ptr######) procptr * + d curl_resolver_start_callback... + d s * based(######ptr######) procptr + * ************************************************************************** * Prototypes ************************************************************************** diff --git a/packages/Symbian/group/libcurl.mmp b/packages/Symbian/group/libcurl.mmp index bb99ec265..6f0fb78cc 100644 --- a/packages/Symbian/group/libcurl.mmp +++ b/packages/Symbian/group/libcurl.mmp @@ -31,7 +31,7 @@ SOURCE \ http_negotiate.c inet_pton.c strtoofft.c strerror.c amigaos.c \ hostasyn.c hostip4.c hostip6.c hostsyn.c inet_ntop.c parsedate.c \ select.c vtls/gtls.c vtls/vtls.c tftp.c splay.c strdup.c socks.c \ - ssh.c vtls/nss.c strcase.c curl_addrinfo.c socks_gssapi.c \ + ssh.c vtls/nss.c strcase.c curl_addrinfo.c socks_gssapi.c \ socks_sspi.c curl_sspi.c slist.c nonblock.c curl_memrchr.c imap.c \ pop3.c smtp.c pingpong.c rtsp.c curl_threads.c warnless.c hmac.c \ vtls/polarssl.c curl_rtmp.c openldap.c curl_gethostname.c gopher.c \ @@ -39,7 +39,7 @@ SOURCE \ asyn-ares.c asyn-thread.c curl_gssapi.c http_ntlm.c curl_ntlm_wb.c \ curl_ntlm_core.c curl_sasl.c vtls/schannel.c curl_multibyte.c \ vtls/darwinssl.c conncache.c curl_sasl_sspi.c smb.c curl_endian.c \ - curl_des.c system_win32.c sha256.c \ + curl_des.c curl_range.c system_win32.c sha256.c \ vauth/vauth.c vauth/cleartext.c vauth/cram.c vauth/digest.c \ vauth/digest_sspi.c vauth/krb5_gssapi.c vauth/krb5_sspi.c \ vauth/ntlm.c vauth/ntlm_sspi.c vauth/oauth2.c vauth/spnego_gssapi.c \ diff --git a/packages/vms/config_h.com b/packages/vms/config_h.com index 2a5503f76..0f1fa0f62 100644 --- a/packages/vms/config_h.com +++ b/packages/vms/config_h.com @@ -1382,7 +1382,7 @@ $! search/out 'tfile1' "$_''keyterm'" $ severity = '$severity' $ endif $! -$! Unix compatability routines +$! Unix compatibility routines $!--------------------------------------------- $ if severity .ne. 1 $ then |