gnunet-svn
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[GNUnet-SVN] [gnurl] 216/219: Merge tag 'curl-7_65_0' of https://github.


From: gnunet
Subject: [GNUnet-SVN] [gnurl] 216/219: Merge tag 'curl-7_65_0' of https://github.com/curl/curl
Date: Wed, 22 May 2019 19:19:15 +0200

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

ng0 pushed a commit to branch master
in repository gnurl.

commit 76775eb29a045f4354ef7138deaf2e1721708dd4
Merge: a341c3159 885ce3140
Author: ng0 <address@hidden>
AuthorDate: Wed May 22 16:37:08 2019 +0000

    Merge tag 'curl-7_65_0' of https://github.com/curl/curl
    
    7.65.0

 .cirrus.yml                                        |   10 +-
 .github/ISSUE_TEMPLATE                             |    5 +-
 .travis.yml                                        |  267 +++--
 CMake/CurlTests.c                                  |    6 +
 CMake/OtherTests.cmake                             |   75 +-
 CMakeLists.txt                                     |   48 +-
 README                                             |    6 +
 README.md                                          |    6 +-
 RELEASE-NOTES                                      |  457 ++++----
 appveyor.yml                                       |    7 +-
 configure.ac                                       |   17 +-
 docs/BUG-BOUNTY.md                                 |  106 ++
 docs/BUGS                                          |   11 +-
 docs/CIPHERS.md                                    |   10 +-
 docs/CODE_STYLE.md                                 |    6 +-
 docs/DEPRECATE.md                                  |   60 -
 docs/INSTALL.md                                    |   54 +-
 docs/INTERNALS.md                                  |  422 +++----
 docs/KNOWN_BUGS                                    |   20 +-
 docs/Makefile.am                                   |    1 +
 docs/RELEASE-PROCEDURE.md                          |   11 +-
 docs/SECURITY-PROCESS.md                           |   55 +-
 docs/SSL-PROBLEMS.md                               |   10 +-
 docs/THANKS                                        |   24 +
 docs/TODO                                          |   23 +-
 docs/cmdline-opts/alt-svc.d                        |    2 +-
 docs/cmdline-opts/config.d                         |   12 +-
 docs/examples/cacertinmem.c                        |    4 +-
 docs/examples/curlgtk.c                            |    3 +-
 docs/examples/curlx.c                              |    2 +-
 docs/examples/ephiperfifo.c                        |    7 +-
 docs/examples/evhiperfifo.c                        |    1 -
 docs/examples/ftpgetinfo.c                         |    3 +-
 docs/examples/ghiper.c                             |    1 -
 docs/examples/hiperfifo.c                          |    3 +-
 docs/examples/multithread.c                        |   11 +-
 docs/examples/sampleconv.c                         |    3 +-
 docs/examples/smooth-gtk-thread.c                  |   14 +-
 docs/examples/threaded-shared-conn.c               |    4 +-
 docs/examples/threaded-ssl.c                       |   11 +-
 docs/libcurl/gnurl_easy_getinfo.3                  |    4 +-
 docs/libcurl/gnurl_easy_setopt.3                   |    2 +
 docs/libcurl/gnurl_url_get.3                       |    8 +-
 docs/libcurl/gnurl_url_set.3                       |   10 +-
 .../opts/GNURLMOPT_CHUNK_LENGTH_PENALTY_SIZE.3     |    4 +-
 .../opts/GNURLMOPT_CONTENT_LENGTH_PENALTY_SIZE.3   |    4 +-
 docs/libcurl/opts/GNURLMOPT_MAX_PIPELINE_LENGTH.3  |    4 +-
 docs/libcurl/opts/GNURLMOPT_PIPELINING.3           |   10 +-
 docs/libcurl/opts/GNURLMOPT_PIPELINING_SERVER_BL.3 |    4 +-
 docs/libcurl/opts/GNURLMOPT_PIPELINING_SITE_BL.3   |    4 +-
 docs/libcurl/opts/GNURLMOPT_TIMERFUNCTION.3        |    5 +
 docs/libcurl/opts/GNURLOPT_ADDRESS_SCOPE.3         |   16 +-
 docs/libcurl/opts/GNURLOPT_ALTSVC.3                |    2 +-
 docs/libcurl/opts/GNURLOPT_ALTSVC_CTRL.3           |    2 +-
 docs/libcurl/opts/GNURLOPT_CAINFO.3                |   11 +-
 docs/libcurl/opts/GNURLOPT_CHUNK_BGN_FUNCTION.3    |   29 +-
 docs/libcurl/opts/GNURLOPT_DNS_USE_GLOBAL_CACHE.3  |    6 +-
 docs/libcurl/opts/GNURLOPT_MAXAGE_CONN.3           |   65 ++
 docs/libcurl/opts/GNURLOPT_READFUNCTION.3          |    3 +-
 docs/libcurl/opts/Makefile.inc                     |    1 +
 docs/libcurl/symbols-in-versions                   |    2 +
 include/gnurl/curl.h                               |    7 +-
 include/gnurl/curlver.h                            |   10 +-
 include/gnurl/typecheck-gcc.h                      |   10 +-
 include/gnurl/urlapi.h                             |    3 +-
 lib/Makefile.inc                                   |    8 +-
 lib/altsvc.c                                       |   12 +-
 lib/asyn-ares.c                                    |  105 +-
 lib/base64.c                                       |    9 +-
 lib/config-win32.h                                 |    5 +-
 lib/conncache.c                                    |    5 +-
 lib/conncache.h                                    |    3 +-
 lib/connect.c                                      |   34 +-
 lib/cookie.c                                       |   50 +-
 lib/cookie.h                                       |    1 -
 lib/curl_config.h.cmake                            |   10 +-
 lib/curl_fnmatch.c                                 |    9 -
 lib/{fileinfo.c => curl_get_line.c}                |   40 +-
 lib/{fileinfo.c => curl_get_line.h}                |   28 +-
 lib/curl_md4.h                                     |    4 +-
 lib/curl_md5.h                                     |   10 +-
 lib/curl_memory.h                                  |    4 +-
 lib/curl_ntlm_core.c                               |    6 +
 lib/curl_ntlm_core.h                               |    4 +-
 lib/curl_ntlm_wb.c                                 |   71 +-
 lib/curl_ntlm_wb.h                                 |   11 +-
 lib/curl_path.c                                    |    2 +-
 lib/curl_sasl.c                                    |   33 +-
 lib/curl_setup.h                                   |    4 +
 lib/doh.c                                          |   11 +-
 lib/doh.h                                          |   10 +-
 lib/easy.c                                         |   16 +-
 lib/fileinfo.c                                     |    5 +-
 lib/formdata.c                                     |   14 +-
 lib/formdata.h                                     |   11 +-
 lib/ftp.c                                          |    9 +-
 lib/ftplistparser.c                                |    5 +-
 lib/hostcheck.c                                    |    6 +-
 lib/hostip.c                                       |   46 +-
 lib/hostip.h                                       |    7 +-
 lib/hostip6.c                                      |    5 +-
 lib/http.c                                         |  134 ++-
 lib/http2.c                                        |   12 +-
 lib/http_digest.c                                  |    5 +-
 lib/http_digest.h                                  |   12 +-
 lib/http_negotiate.c                               |   50 +-
 lib/http_negotiate.h                               |    6 +-
 lib/http_ntlm.c                                    |   37 +-
 lib/http_ntlm.h                                    |   10 +-
 lib/if2ip.c                                        |   23 +-
 lib/if2ip.h                                        |    4 +-
 lib/imap.c                                         |   14 +-
 lib/inet_pton.c                                    |    3 +-
 lib/ldap.c                                         |    3 +-
 lib/md4.c                                          |  113 +-
 lib/md5.c                                          |  163 +--
 lib/memdebug.c                                     |    7 +-
 lib/mime.c                                         |   80 +-
 lib/mime.h                                         |   20 +-
 lib/multi.c                                        |  318 ++----
 lib/multihandle.h                                  |   48 +-
 lib/multiif.h                                      |   17 +-
 lib/netrc.c                                        |    5 +-
 lib/netrc.h                                        |    9 +-
 lib/openldap.c                                     |    5 -
 lib/parsedate.c                                    |   41 +-
 lib/pipeline.c                                     |  404 -------
 lib/pipeline.h                                     |   56 -
 lib/pop3.c                                         |    1 +
 lib/progress.c                                     |  114 +-
 lib/rtsp.c                                         |   13 -
 lib/security.c                                     |   13 +-
 lib/sendf.c                                        |   40 +-
 lib/setopt.c                                       |  261 +++--
 lib/smtp.c                                         |   10 +-
 lib/socks.c                                        |   22 +-
 lib/splay.c                                        |    4 +-
 lib/ssh-libssh.c                                   |   19 +-
 lib/ssh.c                                          |   26 +-
 lib/tftp.c                                         |    2 +-
 lib/timeval.c                                      |    2 +
 lib/transfer.c                                     |  104 +-
 lib/url.c                                          |  664 ++++-------
 lib/url.h                                          |    9 +-
 lib/urlapi-int.h                                   |    7 +-
 lib/urlapi.c                                       |  106 +-
 lib/urldata.h                                      |   87 +-
 lib/vauth/cleartext.c                              |   40 +-
 lib/vauth/digest.c                                 |    5 +-
 lib/vauth/krb5_gssapi.c                            |    6 +-
 lib/vauth/krb5_sspi.c                              |    6 +-
 lib/vauth/ntlm.c                                   |   24 +-
 lib/vauth/ntlm_sspi.c                              |    8 +-
 lib/vauth/oauth2.c                                 |   56 +-
 lib/vauth/spnego_gssapi.c                          |    9 +-
 lib/vauth/spnego_sspi.c                            |    7 +-
 lib/vauth/vauth.c                                  |   42 +-
 lib/vauth/vauth.h                                  |   20 +-
 lib/version.c                                      |   10 +-
 lib/vtls/cyassl.c                                  |    5 +-
 lib/vtls/gskit.c                                   |   18 +-
 lib/vtls/gtls.c                                    |   49 +-
 lib/vtls/mbedtls.c                                 |   17 +-
 lib/vtls/mesalink.c                                |    2 +-
 lib/vtls/nss.c                                     |   18 +-
 lib/vtls/openssl.c                                 |   20 +-
 lib/vtls/polarssl.c                                |    9 +-
 lib/vtls/polarssl_threadlock.c                     |   59 +-
 lib/vtls/polarssl_threadlock.h                     |    9 +-
 lib/vtls/schannel.c                                |   20 +-
 lib/vtls/sectransp.c                               |    7 +-
 lib/vtls/vtls.c                                    |   31 +-
 lib/wildcard.c                                     |    6 +-
 lib/wildcard.h                                     |   10 +-
 lib/x509asn1.c                                     |   17 +-
 m4/curl-functions.m4                               |  195 ++++
 packages/OS400/ccsidcurl.c                         |  156 +--
 packages/OS400/curl.inc.in                         |    2 +
 packages/OS400/os400sys.c                          |    1 -
 packages/vms/curl_crtl_init.c                      |    1 -
 packages/vms/generate_config_vms_h_curl.com        |    9 -
 projects/README                                    |   12 +-
 projects/Windows/VC10/lib/libcurl.tmpl             |  112 +-
 projects/Windows/VC10/src/curl.tmpl                |  112 +-
 projects/Windows/VC11/lib/libcurl.tmpl             |  112 +-
 projects/Windows/VC11/src/curl.tmpl                |  112 +-
 projects/Windows/VC12/lib/libcurl.tmpl             |  112 +-
 projects/Windows/VC12/src/curl.tmpl                |  112 +-
 projects/Windows/VC14/lib/libcurl.tmpl             |  112 +-
 projects/Windows/VC14/src/curl.tmpl                |  112 +-
 projects/Windows/VC15/lib/libcurl.tmpl             |  112 +-
 projects/Windows/VC15/src/curl.tmpl                |  140 +--
 projects/build-openssl.bat                         |  619 +++++++----
 projects/checksrc.bat                              |    2 +-
 scripts/delta                                      |    6 +-
 scripts/singleuse.pl                               |    2 +-
 src/tool_cb_prg.c                                  |    2 +-
 src/tool_cb_wrt.c                                  |   10 +-
 src/tool_cfgable.c                                 |    6 +-
 src/tool_doswin.c                                  |    1 -
 src/tool_formparse.c                               |    6 +-
 src/tool_getparam.c                                |    5 +
 src/tool_getparam.h                                |    3 +-
 src/tool_help.c                                    |    7 +
 src/tool_helpers.c                                 |    4 +-
 src/tool_main.c                                    |    4 +-
 src/tool_metalink.c                                |    4 +-
 src/tool_operate.c                                 |   34 +-
 src/tool_urlglob.c                                 |    3 +-
 tests/FILEFORMAT                                   |    4 -
 tests/data/Makefile.inc                            |   12 +-
 tests/data/test1002                                |    2 +-
 tests/data/test1400                                |    3 +-
 tests/data/test1401                                |    2 +-
 tests/data/test1402                                |    2 +-
 tests/data/test1403                                |    2 +-
 tests/data/test1404                                |    2 +-
 tests/data/test1405                                |    3 +-
 tests/data/test1407                                |    3 +-
 tests/data/test1506                                |    4 -
 tests/data/test1559                                |   44 +
 tests/data/test1560                                |   12 +
 tests/data/{test709 => test1906}                   |   36 +-
 tests/data/test196                                 |    1 +
 tests/data/test197                                 |    1 +
 tests/data/test198                                 |    1 +
 tests/data/test2100                                |  Bin 1642 -> 1642 bytes
 tests/data/test332                                 |   45 +
 tests/data/{test702 => test333}                    |   24 +-
 tests/data/test536                                 |   74 --
 tests/data/test660                                 |   34 +
 tests/data/test702                                 |    4 +
 tests/data/test703                                 |    4 +
 tests/data/test709                                 |    2 +-
 tests/data/test711                                 |    4 +-
 tests/data/test716                                 |   44 +
 tests/data/{test709 => test717}                    |   29 +-
 tests/data/test819                                 |    4 +-
 tests/data/test825                                 |    2 +-
 tests/data/test833                                 |    4 +-
 tests/data/test834                                 |    4 +-
 tests/data/test835                                 |    4 +-
 tests/data/test842                                 |    4 +-
 tests/data/test843                                 |    2 +-
 tests/data/test844                                 |    5 +-
 tests/data/test845                                 |    2 +-
 tests/data/test865                                 |    4 +-
 tests/data/test871                                 |    2 +-
 tests/data/test879                                 |    4 +-
 tests/data/test880                                 |    4 +-
 tests/data/test881                                 |    4 +-
 tests/data/test887                                 |    4 +-
 tests/data/test888                                 |    2 +-
 tests/data/test889                                 |    4 +-
 tests/data/test890                                 |    2 +-
 tests/data/test903                                 |    4 +-
 tests/data/test919                                 |    2 +-
 tests/data/test935                                 |    4 +-
 tests/data/test936                                 |    4 +-
 tests/data/test937                                 |    4 +-
 tests/data/test946                                 |    4 +-
 tests/data/test947                                 |    2 +-
 tests/data/test948                                 |    4 +-
 tests/data/test949                                 |    2 +-
 tests/getpart.pm                                   |    2 +-
 tests/libtest/Makefile.inc                         |   18 +-
 tests/libtest/lib1156.c                            |    4 +-
 tests/libtest/lib1522.c                            |    5 +-
 tests/libtest/lib1559.c                            |   78 ++
 tests/libtest/lib1560.c                            |  278 ++++-
 tests/libtest/lib1905.c                            |    1 +
 tests/libtest/lib1906.c                            |   72 ++
 tests/libtest/lib509.c                             |    2 +
 tests/libtest/lib536.c                             |  142 ---
 tests/libtest/lib557.c                             |   14 +-
 tests/python_dependencies/impacket/nmb.py          |   46 +-
 tests/python_dependencies/impacket/ntlm.py         |   78 +-
 tests/python_dependencies/impacket/smb.py          |   22 +-
 tests/python_dependencies/impacket/smb3.py         |   69 +-
 tests/python_dependencies/impacket/smbserver.py    |  228 ++--
 tests/python_dependencies/impacket/spnego.py       |  154 +--
 tests/python_dependencies/impacket/structure.py    |   69 +-
 tests/python_dependencies/impacket/uuid.py         |   21 +-
 tests/runtests.pl                                  |  142 +--
 tests/server/Makefile.inc                          |    8 +-
 tests/server/socksd.c                              | 1164 ++++++++++++++++++++
 tests/server/sws.c                                 |   64 +-
 tests/server/util.c                                |    4 +-
 tests/sshserver.pl                                 |   25 +-
 tests/unit/unit1304.c                              |    6 +-
 tests/unit/unit1398.c                              |    3 +-
 tests/unit/unit1607.c                              |   34 +-
 tests/unit/unit1608.c                              |    1 +
 tests/unit/unit1609.c                              |   39 +-
 tests/unit/unit1621.c                              |    4 +-
 tests/unit/unit1653.c                              |    4 +-
 winbuild/Makefile.vc                               |    6 -
 winbuild/MakefileBuild.vc                          |    6 +
 winbuild/gen_resp_file.bat                         |   34 +-
 winbuild/makedebug.cmd                             |   23 +-
 winbuild/rundebug.cmd                              |   22 +
 301 files changed, 6743 insertions(+), 5150 deletions(-)

diff --cc docs/libcurl/gnurl_easy_getinfo.3
index 2746ea5cc,000000000..3133c4f90
mode 100644,000000..100644
--- a/docs/libcurl/gnurl_easy_getinfo.3
+++ b/docs/libcurl/gnurl_easy_getinfo.3
@@@ -1,277 -1,0 +1,277 @@@
 +.\" **************************************************************************
 +.\" *                                  _   _ ____  _
 +.\" *  Project                     ___| | | |  _ \| |
 +.\" *                             / __| | | | |_) | |
 +.\" *                            | (__| |_| |  _ <| |___
 +.\" *                             \___|\___/|_| \_\_____|
 +.\" *
- .\" * Copyright (C) 1998 - 2018, Daniel Stenberg, <address@hidden>, et al.
++.\" * Copyright (C) 1998 - 2019, Daniel Stenberg, <address@hidden>, et al.
 +.\" *
 +.\" * This software is licensed as described in the file COPYING, which
 +.\" * you should have received as part of this distribution. The terms
 +.\" * are also available at https://curl.haxx.se/docs/copyright.html.
 +.\" *
 +.\" * You may opt to use, copy, modify, merge, publish, distribute and/or sell
 +.\" * copies of the Software, and permit persons to whom the Software is
 +.\" * furnished to do so, under the terms of the COPYING file.
 +.\" *
 +.\" * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF 
ANY
 +.\" * KIND, either express or implied.
 +.\" *
 +.\" **************************************************************************
 +.\"
 +.TH gnurl_easy_getinfo 3 "11 Feb 2009" "libcurl 7.19.4" "libgnurl Manual"
 +.SH NAME
 +curl_easy_getinfo - extract information from a curl handle
 +.SH SYNOPSIS
 +.B #include <gnurl/curl.h>
 +
 +.B "CURLcode curl_easy_getinfo(CURL *curl, CURLINFO info, ... );"
 +
 +.SH DESCRIPTION
 +Request internal information from the curl session with this function.  The
 +third argument \fBMUST\fP be a pointer to a long, a pointer to a char *, a
 +pointer to a struct curl_slist * or a pointer to a double (as this
 +documentation describes further down).  The data pointed-to will be filled in
 +accordingly and can be relied upon only if the function returns CURLE_OK.  Use
 +this function AFTER a performed transfer if you want to get transfer related
 +data.
 +
 +You should not free the memory returned by this function unless it is
 +explicitly mentioned below.
 +.SH AVAILABLE INFORMATION
 +The following information can be extracted:
 +.IP CURLINFO_EFFECTIVE_URL
 +Last used URL.
 +See \fICURLINFO_EFFECTIVE_URL(3)\fP
 +.IP CURLINFO_RESPONSE_CODE
 +Last received response code.
 +See \fICURLINFO_RESPONSE_CODE(3)\fP
 +.IP CURLINFO_HTTP_CONNECTCODE
 +Last proxy CONNECT response code.
 +See \fICURLINFO_HTTP_CONNECTCODE(3)\fP
 +.IP CURLINFO_HTTP_VERSION
 +The http version used in the connection.
 +See \fICURLINFO_HTTP_VERSION(3)\fP
 +.IP CURLINFO_FILETIME
 +Remote time of the retrieved document. See \fICURLINFO_FILETIME(3)\fP
 +.IP CURLINFO_FILETIME_T
 +Remote time of the retrieved document. See \fICURLINFO_FILETIME_T(3)\fP
 +.IP CURLINFO_TOTAL_TIME
 +Total time of previous transfer.
 +See \fICURLINFO_TOTAL_TIME(3)\fP
 +.IP CURLINFO_TOTAL_TIME_T
 +Total time of previous transfer.
 +See \fICURLINFO_TOTAL_TIME_T(3)\fP
 +.IP CURLINFO_NAMELOOKUP_TIME
 +Time from start until name resolving completed.
 +See \fICURLINFO_NAMELOOKUP_TIME(3)\fP
 +.IP CURLINFO_NAMELOOKUP_TIME_T
 +Time from start until name resolving completed.
 +See \fICURLINFO_NAMELOOKUP_TIME_T(3)\fP
 +.IP CURLINFO_CONNECT_TIME
 +Time from start until remote host or proxy completed.
 +See \fICURLINFO_CONNECT_TIME(3)\fP
 +.IP CURLINFO_CONNECT_TIME_T
 +Time from start until remote host or proxy completed.
 +See \fICURLINFO_CONNECT_TIME_T(3)\fP
 +.IP CURLINFO_APPCONNECT_TIME
 +Time from start until SSL/SSH handshake completed.
 +See \fICURLINFO_APPCONNECT_TIME(3)\fP
 +.IP CURLINFO_APPCONNECT_TIME_T
 +Time from start until SSL/SSH handshake completed.
 +See \fICURLINFO_APPCONNECT_TIME_T(3)\fP
 +.IP CURLINFO_PRETRANSFER_TIME
 +Time from start until just before the transfer begins.
 +See \fICURLINFO_PRETRANSFER_TIME(3)\fP
 +.IP CURLINFO_PRETRANSFER_TIME_T
 +Time from start until just before the transfer begins.
 +See \fICURLINFO_PRETRANSFER_TIME_T(3)\fP
 +.IP CURLINFO_STARTTRANSFER_TIME
 +Time from start until just when the first byte is received.
 +See \fICURLINFO_STARTTRANSFER_TIME(3)\fP
 +.IP CURLINFO_STARTTRANSFER_TIME_T
 +Time from start until just when the first byte is received.
 +See \fICURLINFO_STARTTRANSFER_TIME_T(3)\fP
 +.IP CURLINFO_REDIRECT_TIME
 +Time taken for all redirect steps before the final transfer.
 +See \fICURLINFO_REDIRECT_TIME(3)\fP
 +.IP CURLINFO_REDIRECT_TIME_T
 +Time taken for all redirect steps before the final transfer.
 +See \fICURLINFO_REDIRECT_TIME_T(3)\fP
 +.IP CURLINFO_REDIRECT_COUNT
 +Total number of redirects that were followed.
 +See \fICURLINFO_REDIRECT_COUNT(3)\fP
 +.IP CURLINFO_REDIRECT_URL
 +URL a redirect would take you to, had you enabled redirects.
 +See \fICURLINFO_REDIRECT_URL(3)\fP
 +.IP CURLINFO_SIZE_UPLOAD
 +(Deprecated) Number of bytes uploaded.
 +See \fICURLINFO_SIZE_UPLOAD(3)\fP
 +.IP CURLINFO_SIZE_UPLOAD_T
 +Number of bytes uploaded.
 +See \fICURLINFO_SIZE_UPLOAD_T(3)\fP
 +.IP CURLINFO_SIZE_DOWNLOAD
 +(Deprecated) Number of bytes downloaded.
 +See \fICURLINFO_SIZE_DOWNLOAD(3)\fP
 +.IP CURLINFO_SIZE_DOWNLOAD_T
 +Number of bytes downloaded.
 +See \fICURLINFO_SIZE_DOWNLOAD_T(3)\fP
 +.IP CURLINFO_SPEED_DOWNLOAD
 +(Deprecated) Average download speed.
 +See \fICURLINFO_SPEED_DOWNLOAD(3)\fP
 +.IP CURLINFO_SPEED_DOWNLOAD_T
 +Average download speed.
 +See \fICURLINFO_SPEED_DOWNLOAD_T(3)\fP
 +.IP CURLINFO_SPEED_UPLOAD
 +(Deprecated) Average upload speed.
 +See \fICURLINFO_SPEED_UPLOAD(3)\fP
 +.IP CURLINFO_SPEED_UPLOAD_T
 +Average upload speed.
 +See \fICURLINFO_SPEED_UPLOAD_T(3)\fP
 +.IP CURLINFO_HEADER_SIZE
 +Number of bytes of all headers received.
 +See \fICURLINFO_HEADER_SIZE(3)\fP
 +.IP CURLINFO_REQUEST_SIZE
 +Number of bytes sent in the issued HTTP requests.
 +See \fICURLINFO_REQUEST_SIZE(3)\fP
 +.IP CURLINFO_SSL_VERIFYRESULT
 +Certificate verification result.
 +See \fICURLINFO_SSL_VERIFYRESULT(3)\fP
 +.IP CURLINFO_PROXY_SSL_VERIFYRESULT
 +Proxy certificate verification result.
 +See \fICURLINFO_PROXY_SSL_VERIFYRESULT(3)\fP
 +.IP CURLINFO_SSL_ENGINES
 +A list of OpenSSL crypto engines.
 +See \fICURLINFO_SSL_ENGINES(3)\fP
 +.IP CURLINFO_CONTENT_LENGTH_DOWNLOAD
 +(Deprecated) Content length from the Content-Length header.
 +See \fICURLINFO_CONTENT_LENGTH_DOWNLOAD(3)\fP
 +.IP CURLINFO_CONTENT_LENGTH_DOWNLOAD_T
 +Content length from the Content-Length header.
 +See \fICURLINFO_CONTENT_LENGTH_DOWNLOAD_T(3)\fP
 +.IP CURLINFO_CONTENT_LENGTH_UPLOAD
 +(Deprecated) Upload size. See \fICURLINFO_CONTENT_LENGTH_UPLOAD(3)\fP
 +.IP CURLINFO_CONTENT_LENGTH_UPLOAD_T
 +Upload size.  See \fICURLINFO_CONTENT_LENGTH_UPLOAD_T(3)\fP
 +.IP CURLINFO_CONTENT_TYPE
 +Content type from the Content-Type header.
 +See \fICURLINFO_CONTENT_TYPE(3)\fP
 +.IP CURLINFO_PRIVATE
 +User's private data pointer.
 +See \fICURLINFO_PRIVATE(3)\fP
 +.IP CURLINFO_HTTPAUTH_AVAIL
 +Available HTTP authentication methods.
 +See \fICURLINFO_HTTPAUTH_AVAIL(3)\fP
 +.IP CURLINFO_PROXYAUTH_AVAIL
 +Available HTTP proxy authentication methods.
 +See \fICURLINFO_PROXYAUTH_AVAIL(3)\fP
 +.IP CURLINFO_OS_ERRNO
 +The errno from the last failure to connect.
 +See \fICURLINFO_OS_ERRNO(3)\fP
 +.IP CURLINFO_NUM_CONNECTS
 +Number of new successful connections used for previous transfer.
 +See \fICURLINFO_NUM_CONNECTS(3)\fP
 +.IP CURLINFO_PRIMARY_IP
 +IP address of the last connection.
 +See \fICURLINFO_PRIMARY_IP(3)\fP
 +.IP CURLINFO_PRIMARY_PORT
 +Port of the last connection.
 +See \fICURLINFO_PRIMARY_PORT(3)\fP
 +.IP CURLINFO_LOCAL_IP
 +Local-end IP address of last connection.
 +See \fICURLINFO_LOCAL_IP(3)\fP
 +.IP CURLINFO_LOCAL_PORT
 +Local-end port of last connection.
 +See \fICURLINFO_LOCAL_PORT(3)\fP
 +.IP CURLINFO_COOKIELIST
 +List of all known cookies.
 +See \fICURLINFO_COOKIELIST(3)\fP
 +.IP CURLINFO_LASTSOCKET
 +Last socket used.
 +See \fICURLINFO_LASTSOCKET(3)\fP
 +.IP CURLINFO_ACTIVESOCKET
 +The session's active socket.
 +See \fICURLINFO_ACTIVESOCKET(3)\fP
 +.IP CURLINFO_FTP_ENTRY_PATH
 +The entry path after logging in to an FTP server.
 +See \fICURLINFO_FTP_ENTRY_PATH(3)\fP
 +.IP CURLINFO_CERTINFO
 +Certificate chain.
 +See \fICURLINFO_CERTINFO(3)\fP
 +.IP CURLINFO_TLS_SSL_PTR
 +TLS session info that can be used for further processing.
 +See \fICURLINFO_TLS_SSL_PTR(3)\fP
 +.IP CURLINFO_TLS_SESSION
 +TLS session info that can be used for further processing.  See
 +\fICURLINFO_TLS_SESSION(3)\fP. Deprecated option, use
 +\fICURLINFO_TLS_SSL_PTR(3)\fP instead!
 +.IP CURLINFO_CONDITION_UNMET
 +Whether or not a time conditional was met.
 +See \fICURLINFO_CONDITION_UNMET(3)\fP
 +.IP CURLINFO_RTSP_SESSION_ID
 +RTSP session ID.
 +See \fICURLINFO_RTSP_SESSION_ID(3)\fP
 +.IP CURLINFO_RTSP_CLIENT_CSEQ
 +RTSP CSeq that will next be used.
 +See \fICURLINFO_RTSP_CLIENT_CSEQ(3)\fP
 +.IP CURLINFO_RTSP_SERVER_CSEQ
 +RTSP CSeq that will next be expected.
 +See \fICURLINFO_RTSP_SERVER_CSEQ(3)\fP
 +.IP CURLINFO_RTSP_CSEQ_RECV
 +RTSP CSeq last received.
 +See \fICURLINFO_RTSP_CSEQ_RECV(3)\fP
 +.IP CURLINFO_PROTOCOL
 +The protocol used for the connection. (Added in 7.52.0)
 +See \fICURLINFO_PROTOCOL(3)\fP
 +.IP CURLINFO_SCHEME
 +The scheme used for the connection. (Added in 7.52.0)
 +See \fICURLINFO_SCHEME(3)\fP
 +.SH TIMES
 +.nf
 +An overview of the six time values available from curl_easy_getinfo()
 +
 +curl_easy_perform()
 +    |
 +    |--NAMELOOKUP
 +    |--|--CONNECT
 +    |--|--|--APPCONNECT
 +    |--|--|--|--PRETRANSFER
 +    |--|--|--|--|--STARTTRANSFER
 +    |--|--|--|--|--|--TOTAL
 +    |--|--|--|--|--|--REDIRECT
 +.fi
 +.IP NAMELOOKUP
- \fICURLINFO_NAMELOOKUP_TIME\fP and \fIfICURLINFO_NAMELOOKUP_TIME_T\fP.
++\fICURLINFO_NAMELOOKUP_TIME\fP and \fICURLINFO_NAMELOOKUP_TIME_T\fP.
 +The time it took from the start until the name resolving was completed.
 +.IP CONNECT
 +\fICURLINFO_CONNECT_TIME\fP and \fICURLINFO_CONNECT_TIME_T\fP.
 +The time it took from the start until the connect
 +to the remote host (or proxy) was completed.
 +.IP APPCONNECT
 +\fICURLINFO_APPCONNECT_TIME\fP and \fICURLINFO_APPCONNECT_TIME_T\fP.
 +The time it took from the start until the SSL
 +connect/handshake with the remote host was completed. (Added in 7.19.0)
 +The latter is the integer version (measuring microseconds).  (Added in 7.60.0)
 +.IP PRETRANSFER
 +\fICURLINFO_PRETRANSFER_TIME\fP and \fICURLINFO_PRETRANSFER_TIME_T\fP.
 +The time it took from the start until the
 +file transfer is just about to begin. This includes all pre-transfer commands
 +and negotiations that are specific to the particular protocol(s) involved.
 +.IP STARTTRANSFER
 +\fICURLINFO_STARTTRANSFER_TIME\fP and \fICURLINFO_STARTTRANSFER_TIME_T\fP.
 +The time it took from the start until the
 +first byte is received by libcurl.
 +.IP TOTAL
 +\fICURLINFO_TOTAL_TIME\fP and \fICURLINFO_TOTAL_TIME_T\fP.
 +Total time of the previous request.
 +.IP REDIRECT
 +\fICURLINFO_REDIRECT_TIME\fP and \fICURLINFO_REDIRECT_TIME_T\fP.
 +The time it took for all redirection steps
 +include name lookup, connect, pretransfer and transfer before final
 +transaction was started. So, this is zero if no redirection took place.
 +.SH RETURN VALUE
 +If the operation was successful, CURLE_OK is returned. Otherwise an
 +appropriate error code will be returned.
 +.SH "SEE ALSO"
 +.BR curl_easy_setopt "(3)"
diff --cc docs/libcurl/gnurl_easy_setopt.3
index 17ed4369d,000000000..e8250b0e5
mode 100644,000000..100644
--- a/docs/libcurl/gnurl_easy_setopt.3
+++ b/docs/libcurl/gnurl_easy_setopt.3
@@@ -1,639 -1,0 +1,641 @@@
 +.\" **************************************************************************
 +.\" *                                  _   _ ____  _
 +.\" *  Project                     ___| | | |  _ \| |
 +.\" *                             / __| | | | |_) | |
 +.\" *                            | (__| |_| |  _ <| |___
 +.\" *                             \___|\___/|_| \_\_____|
 +.\" *
 +.\" * Copyright (C) 1998 - 2019, Daniel Stenberg, <address@hidden>, et al.
 +.\" *
 +.\" * This software is licensed as described in the file COPYING, which
 +.\" * you should have received as part of this distribution. The terms
 +.\" * are also available at https://curl.haxx.se/docs/copyright.html.
 +.\" *
 +.\" * You may opt to use, copy, modify, merge, publish, distribute and/or sell
 +.\" * copies of the Software, and permit persons to whom the Software is
 +.\" * furnished to do so, under the terms of the COPYING file.
 +.\" *
 +.\" * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF 
ANY
 +.\" * KIND, either express or implied.
 +.\" *
 +.\" **************************************************************************
 +.\"
 +.TH gnurl_easy_setopt 3 "25 Jun 2014" "libcurl 7.38.0" "libgnurl Manual"
 +.SH NAME
 +curl_easy_setopt \- set options for a curl easy handle
 +.SH SYNOPSIS
 +#include <gnurl/curl.h>
 +
 +CURLcode curl_easy_setopt(CURL *handle, CURLoption option, parameter);
 +.SH DESCRIPTION
 +\fIcurl_easy_setopt(3)\fP is used to tell libcurl how to behave. By setting
 +the appropriate options, the application can change libcurl's behavior.  All
 +options are set with an \fIoption\fP followed by a \fIparameter\fP. That
 +parameter can be a \fBlong\fP, a \fBfunction pointer\fP, an \fBobject
 +pointer\fP or a \fBcurl_off_t\fP, depending on what the specific option
 +expects. Read this manual carefully as bad input values may cause libcurl to
 +behave badly!  You can only set one option in each function call. A typical
 +application uses many \fIcurl_easy_setopt(3)\fP calls in the setup phase.
 +
 +Options set with this function call are valid for all forthcoming transfers
 +performed using this \fIhandle\fP.  The options are not in any way reset
 +between transfers, so if you want subsequent transfers with different options,
 +you must change them between the transfers. You can optionally reset all
 +options back to internal default with \fIcurl_easy_reset(3)\fP.
 +
 +Strings passed to libcurl as 'char *' arguments, are copied by the library;
 +thus the string storage associated to the pointer argument may be overwritten
 +after \fIcurl_easy_setopt(3)\fP returns. The only exception to this rule is
 +really \fICURLOPT_POSTFIELDS(3)\fP, but the alternative that copies the string
 +\fICURLOPT_COPYPOSTFIELDS(3)\fP has some usage characteristics you need to
 +read up on.
 +
 +The order in which the options are set does not matter.
 +
 +Before version 7.17.0, strings were not copied. Instead the user was forced
 +keep them available until libcurl no longer needed them.
 +
 +The \fIhandle\fP is the return code from a \fIcurl_easy_init(3)\fP or
 +\fIcurl_easy_duphandle(3)\fP call.
 +.SH BEHAVIOR OPTIONS
 +.IP CURLOPT_VERBOSE
 +Display verbose information. See \fICURLOPT_VERBOSE(3)\fP
 +.IP CURLOPT_HEADER
 +Include the header in the body output. See \fICURLOPT_HEADER(3)\fP
 +.IP CURLOPT_NOPROGRESS
 +Shut off the progress meter. See \fICURLOPT_NOPROGRESS(3)\fP
 +.IP CURLOPT_NOSIGNAL
 +Do not install signal handlers. See \fICURLOPT_NOSIGNAL(3)\fP
 +.IP CURLOPT_WILDCARDMATCH
 +Transfer multiple files according to a file name pattern. See 
\fICURLOPT_WILDCARDMATCH(3)\fP
 +.SH CALLBACK OPTIONS
 +.IP CURLOPT_WRITEFUNCTION
 +Callback for writing data. See \fICURLOPT_WRITEFUNCTION(3)\fP
 +.IP CURLOPT_WRITEDATA
 +Data pointer to pass to the write callback. See \fICURLOPT_WRITEDATA(3)\fP
 +.IP CURLOPT_READFUNCTION
 +Callback for reading data. See \fICURLOPT_READFUNCTION(3)\fP
 +.IP CURLOPT_READDATA
 +Data pointer to pass to the read callback. See \fICURLOPT_READDATA(3)\fP
 +.IP CURLOPT_IOCTLFUNCTION
 +Callback for I/O operations. See \fICURLOPT_IOCTLFUNCTION(3)\fP
 +.IP CURLOPT_IOCTLDATA
 +Data pointer to pass to the I/O callback. See \fICURLOPT_IOCTLDATA(3)\fP
 +.IP CURLOPT_SEEKFUNCTION
 +Callback for seek operations. See \fICURLOPT_SEEKFUNCTION(3)\fP
 +.IP CURLOPT_SEEKDATA
 +Data pointer to pass to the seek callback. See \fICURLOPT_SEEKDATA(3)\fP
 +.IP CURLOPT_SOCKOPTFUNCTION
 +Callback for sockopt operations. See \fICURLOPT_SOCKOPTFUNCTION(3)\fP
 +.IP CURLOPT_SOCKOPTDATA
 +Data pointer to pass to the sockopt callback. See \fICURLOPT_SOCKOPTDATA(3)\fP
 +.IP CURLOPT_OPENSOCKETFUNCTION
 +Callback for socket creation. See \fICURLOPT_OPENSOCKETFUNCTION(3)\fP
 +.IP CURLOPT_OPENSOCKETDATA
 +Data pointer to pass to the open socket callback. See 
\fICURLOPT_OPENSOCKETDATA(3)\fP
 +.IP CURLOPT_CLOSESOCKETFUNCTION
 +Callback for closing socket. See \fICURLOPT_CLOSESOCKETFUNCTION(3)\fP
 +.IP CURLOPT_CLOSESOCKETDATA
 +Data pointer to pass to the close socket callback. See 
\fICURLOPT_CLOSESOCKETDATA(3)\fP
 +.IP CURLOPT_PROGRESSFUNCTION
 +OBSOLETE callback for progress meter. See \fICURLOPT_PROGRESSFUNCTION(3)\fP
 +.IP CURLOPT_PROGRESSDATA
 +Data pointer to pass to the progress meter callback. See 
\fICURLOPT_PROGRESSDATA(3)\fP
 +.IP CURLOPT_XFERINFOFUNCTION
 +Callback for progress meter. See \fICURLOPT_XFERINFOFUNCTION(3)\fP
 +.IP CURLOPT_XFERINFODATA
 +Data pointer to pass to the progress meter callback. See 
\fICURLOPT_XFERINFODATA(3)\fP
 +.IP CURLOPT_HEADERFUNCTION
 +Callback for writing received headers. See \fICURLOPT_HEADERFUNCTION(3)\fP
 +.IP CURLOPT_HEADERDATA
 +Data pointer to pass to the header callback. See \fICURLOPT_HEADERDATA(3)\fP
 +.IP CURLOPT_DEBUGFUNCTION
 +Callback for debug information. See \fICURLOPT_DEBUGFUNCTION(3)\fP
 +.IP CURLOPT_DEBUGDATA
 +Data pointer to pass to the debug callback. See \fICURLOPT_DEBUGDATA(3)\fP
 +.IP CURLOPT_SSL_CTX_FUNCTION
 +Callback for SSL context logic. See \fICURLOPT_SSL_CTX_FUNCTION(3)\fP
 +.IP CURLOPT_SSL_CTX_DATA
 +Data pointer to pass to the SSL context callback. See 
\fICURLOPT_SSL_CTX_DATA(3)\fP
 +.IP CURLOPT_CONV_TO_NETWORK_FUNCTION
 +Callback for code base conversion. See 
\fICURLOPT_CONV_TO_NETWORK_FUNCTION(3)\fP
 +.IP CURLOPT_CONV_FROM_NETWORK_FUNCTION
 +Callback for code base conversion. See 
\fICURLOPT_CONV_FROM_NETWORK_FUNCTION(3)\fP
 +.IP CURLOPT_CONV_FROM_UTF8_FUNCTION
 +Callback for code base conversion. See 
\fICURLOPT_CONV_FROM_UTF8_FUNCTION(3)\fP
 +.IP CURLOPT_INTERLEAVEFUNCTION
 +Callback for RTSP interleaved data. See \fICURLOPT_INTERLEAVEFUNCTION(3)\fP
 +.IP CURLOPT_INTERLEAVEDATA
 +Data pointer to pass to the RTSP interleave callback. See 
\fICURLOPT_INTERLEAVEDATA(3)\fP
 +.IP CURLOPT_CHUNK_BGN_FUNCTION
 +Callback for wildcard download start of chunk. See 
\fICURLOPT_CHUNK_BGN_FUNCTION(3)\fP
 +.IP CURLOPT_CHUNK_END_FUNCTION
 +Callback for wildcard download end of chunk. See 
\fICURLOPT_CHUNK_END_FUNCTION(3)\fP
 +.IP CURLOPT_CHUNK_DATA
 +Data pointer to pass to the chunk callbacks. See \fICURLOPT_CHUNK_DATA(3)\fP
 +.IP CURLOPT_FNMATCH_FUNCTION
 +Callback for wildcard matching. See \fICURLOPT_FNMATCH_FUNCTION(3)\fP
 +.IP CURLOPT_FNMATCH_DATA
 +Data pointer to pass to the wildcard matching callback. See 
\fICURLOPT_FNMATCH_DATA(3)\fP
 +.IP CURLOPT_SUPPRESS_CONNECT_HEADERS
 +Suppress proxy CONNECT response headers from user callbacks. See 
\fICURLOPT_SUPPRESS_CONNECT_HEADERS(3)\fP
 +.IP CURLOPT_RESOLVER_START_FUNCTION
 +Callback to be called before a new resolve request is started. See 
\fICURLOPT_RESOLVER_START_FUNCTION(3)\fP
 +.IP CURLOPT_RESOLVER_START_DATA
 +Data pointer to pass to resolver start callback. See 
\fICURLOPT_RESOLVER_START_DATA(3)\fP
 +.SH ERROR OPTIONS
 +.IP CURLOPT_ERRORBUFFER
 +Error message buffer. See \fICURLOPT_ERRORBUFFER(3)\fP
 +.IP CURLOPT_STDERR
 +stderr replacement stream. See \fICURLOPT_STDERR(3)\fP
 +.IP CURLOPT_FAILONERROR
 +Fail on HTTP 4xx errors. \fICURLOPT_FAILONERROR(3)\fP
 +.IP CURLOPT_KEEP_SENDING_ON_ERROR
 +Keep sending on HTTP >= 300 errors. \fICURLOPT_KEEP_SENDING_ON_ERROR(3)\fP
 +.SH NETWORK OPTIONS
 +.IP CURLOPT_URL
 +URL to work on. See \fICURLOPT_URL(3)\fP
 +.IP CURLOPT_PATH_AS_IS
 +Disable squashing /../ and /./ sequences in the path. See 
\fICURLOPT_PATH_AS_IS(3)\fP
 +.IP CURLOPT_PROTOCOLS
 +Allowed protocols. See \fICURLOPT_PROTOCOLS(3)\fP
 +.IP CURLOPT_REDIR_PROTOCOLS
 +Protocols to allow redirects to. See \fICURLOPT_REDIR_PROTOCOLS(3)\fP
 +.IP CURLOPT_DEFAULT_PROTOCOL
 +Default protocol. See \fICURLOPT_DEFAULT_PROTOCOL(3)\fP
 +.IP CURLOPT_PROXY
 +Proxy to use. See \fICURLOPT_PROXY(3)\fP
 +.IP CURLOPT_PRE_PROXY
 +Socks proxy to use. See \fICURLOPT_PRE_PROXY(3)\fP
 +.IP CURLOPT_PROXYPORT
 +Proxy port to use. See \fICURLOPT_PROXYPORT(3)\fP
 +.IP CURLOPT_PROXYTYPE
 +Proxy type. See \fICURLOPT_PROXYTYPE(3)\fP
 +.IP CURLOPT_NOPROXY
 +Filter out hosts from proxy use. \fICURLOPT_NOPROXY(3)\fP
 +.IP CURLOPT_HTTPPROXYTUNNEL
 +Tunnel through the HTTP proxy. \fICURLOPT_HTTPPROXYTUNNEL(3)\fP
 +.IP CURLOPT_CONNECT_TO
 +Connect to a specific host and port. See \fICURLOPT_CONNECT_TO(3)\fP
 +.IP CURLOPT_SOCKS5_AUTH
 +Socks5 authentication methods. See \fICURLOPT_SOCKS5_AUTH(3)\fP
 +.IP CURLOPT_SOCKS5_GSSAPI_SERVICE
 +Socks5 GSSAPI service name. \fICURLOPT_SOCKS5_GSSAPI_SERVICE(3)\fP
 +.IP CURLOPT_SOCKS5_GSSAPI_NEC
 +Socks5 GSSAPI NEC mode. See \fICURLOPT_SOCKS5_GSSAPI_NEC(3)\fP
 +.IP CURLOPT_PROXY_SERVICE_NAME
 +Proxy authentication service name. \fICURLOPT_PROXY_SERVICE_NAME(3)\fP
 +.IP CURLOPT_HAPROXYPROTOCOL
 +Send an HAProxy PROXY protocol v1 header. See \fICURLOPT_HAPROXYPROTOCOL(3)\fP
 +.IP CURLOPT_SERVICE_NAME
 +Authentication service name. \fICURLOPT_SERVICE_NAME(3)\fP
 +.IP CURLOPT_INTERFACE
 +Bind connection locally to this. See \fICURLOPT_INTERFACE(3)\fP
 +.IP CURLOPT_LOCALPORT
 +Bind connection locally to this port. See \fICURLOPT_LOCALPORT(3)\fP
 +.IP CURLOPT_LOCALPORTRANGE
 +Bind connection locally to port range. See \fICURLOPT_LOCALPORTRANGE(3)\fP
 +.IP CURLOPT_DNS_CACHE_TIMEOUT
 +Timeout for DNS cache. See \fICURLOPT_DNS_CACHE_TIMEOUT(3)\fP
 +.IP CURLOPT_DNS_USE_GLOBAL_CACHE
 +OBSOLETE Enable global DNS cache. See \fICURLOPT_DNS_USE_GLOBAL_CACHE(3)\fP
 +.IP CURLOPT_DOH_URL
 +Use this DOH server for name resolves. See \fICURLOPT_DOH_URL(3)\fP
 +.IP CURLOPT_BUFFERSIZE
 +Ask for alternate buffer size. See \fICURLOPT_BUFFERSIZE(3)\fP
 +.IP CURLOPT_PORT
 +Port number to connect to. See \fICURLOPT_PORT(3)\fP
 +.IP CURLOPT_TCP_FASTOPEN
 +Enable TFO, TCP Fast Open. See \fICURLOPT_TCP_FASTOPEN(3)\fP
 +.IP CURLOPT_TCP_NODELAY
 +Disable the Nagle algorithm. See \fICURLOPT_TCP_NODELAY(3)\fP
 +.IP CURLOPT_ADDRESS_SCOPE
 +IPv6 scope for local addresses. See \fICURLOPT_ADDRESS_SCOPE(3)\fP
 +.IP CURLOPT_TCP_KEEPALIVE
 +Enable TCP keep-alive. See \fICURLOPT_TCP_KEEPALIVE(3)\fP
 +.IP CURLOPT_TCP_KEEPIDLE
 +Idle time before sending keep-alive. See \fICURLOPT_TCP_KEEPIDLE(3)\fP
 +.IP CURLOPT_TCP_KEEPINTVL
 +Interval between keep-alive probes. See \fICURLOPT_TCP_KEEPINTVL(3)\fP
 +.IP CURLOPT_UNIX_SOCKET_PATH
 +Path to a Unix domain socket. See \fICURLOPT_UNIX_SOCKET_PATH(3)\fP
 +.IP CURLOPT_ABSTRACT_UNIX_SOCKET
 +Path to an abstract Unix domain socket. See 
\fICURLOPT_ABSTRACT_UNIX_SOCKET(3)\fP
 +.SH NAMES and PASSWORDS OPTIONS (Authentication)
 +.IP CURLOPT_NETRC
 +Enable .netrc parsing. See \fICURLOPT_NETRC(3)\fP
 +.IP CURLOPT_NETRC_FILE
 +\&.netrc file name. See \fICURLOPT_NETRC_FILE(3)\fP
 +.IP CURLOPT_USERPWD
 +User name and password. See \fICURLOPT_USERPWD(3)\fP
 +.IP CURLOPT_PROXYUSERPWD
 +Proxy user name and password. See \fICURLOPT_PROXYUSERPWD(3)\fP
 +.IP CURLOPT_USERNAME
 +User name. See \fICURLOPT_USERNAME(3)\fP
 +.IP CURLOPT_PASSWORD
 +Password. See \fICURLOPT_PASSWORD(3)\fP
 +.IP CURLOPT_LOGIN_OPTIONS
 +Login options. See \fICURLOPT_LOGIN_OPTIONS(3)\fP
 +.IP CURLOPT_PROXYUSERNAME
 +Proxy user name. See \fICURLOPT_PROXYUSERNAME(3)\fP
 +.IP CURLOPT_PROXYPASSWORD
 +Proxy password. See \fICURLOPT_PROXYPASSWORD(3)\fP
 +.IP CURLOPT_HTTPAUTH
 +HTTP server authentication methods. See \fICURLOPT_HTTPAUTH(3)\fP
 +.IP CURLOPT_TLSAUTH_USERNAME
 +TLS authentication user name. See \fICURLOPT_TLSAUTH_USERNAME(3)\fP
 +.IP CURLOPT_PROXY_TLSAUTH_USERNAME
 +Proxy TLS authentication user name. See 
\fICURLOPT_PROXY_TLSAUTH_USERNAME(3)\fP
 +.IP CURLOPT_TLSAUTH_PASSWORD
 +TLS authentication password. See \fICURLOPT_TLSAUTH_PASSWORD(3)\fP
 +.IP CURLOPT_PROXY_TLSAUTH_PASSWORD
 +Proxy TLS authentication password. See \fICURLOPT_PROXY_TLSAUTH_PASSWORD(3)\fP
 +.IP CURLOPT_TLSAUTH_TYPE
 +TLS authentication methods. See \fICURLOPT_TLSAUTH_TYPE(3)\fP
 +.IP CURLOPT_PROXY_TLSAUTH_TYPE
 +Proxy TLS authentication methods. See \fICURLOPT_PROXY_TLSAUTH_TYPE(3)\fP
 +.IP CURLOPT_PROXYAUTH
 +HTTP proxy authentication methods. See \fICURLOPT_PROXYAUTH(3)\fP
 +.IP CURLOPT_SASL_IR
 +Enable SASL initial response. See \fICURLOPT_SASL_IR(3)\fP
 +.IP CURLOPT_XOAUTH2_BEARER
 +OAuth2 bearer token. See \fICURLOPT_XOAUTH2_BEARER(3)\fP
 +.IP CURLOPT_DISALLOW_USERNAME_IN_URL
 +Don't allow username in URL. See \fICURLOPT_DISALLOW_USERNAME_IN_URL(3)\fP
 +.SH HTTP OPTIONS
 +.IP CURLOPT_AUTOREFERER
 +Automatically set Referer: header. See \fICURLOPT_AUTOREFERER(3)\fP
 +.IP CURLOPT_ACCEPT_ENCODING
 +Accept-Encoding and automatic decompressing data. See 
\fICURLOPT_ACCEPT_ENCODING(3)\fP
 +.IP CURLOPT_TRANSFER_ENCODING
 +Request Transfer-Encoding. See \fICURLOPT_TRANSFER_ENCODING(3)\fP
 +.IP CURLOPT_FOLLOWLOCATION
 +Follow HTTP redirects. See \fICURLOPT_FOLLOWLOCATION(3)\fP
 +.IP CURLOPT_UNRESTRICTED_AUTH
 +Do not restrict authentication to original host. 
\fICURLOPT_UNRESTRICTED_AUTH(3)\fP
 +.IP CURLOPT_MAXREDIRS
 +Maximum number of redirects to follow. See \fICURLOPT_MAXREDIRS(3)\fP
 +.IP CURLOPT_POSTREDIR
 +How to act on redirects after POST. See \fICURLOPT_POSTREDIR(3)\fP
 +.IP CURLOPT_PUT
 +Issue an HTTP PUT request. See \fICURLOPT_PUT(3)\fP
 +.IP CURLOPT_POST
 +Issue an HTTP POST request. See \fICURLOPT_POST(3)\fP
 +.IP CURLOPT_POSTFIELDS
 +Send a POST with this data. See \fICURLOPT_POSTFIELDS(3)\fP
 +.IP CURLOPT_POSTFIELDSIZE
 +The POST data is this big. See \fICURLOPT_POSTFIELDSIZE(3)\fP
 +.IP CURLOPT_POSTFIELDSIZE_LARGE
 +The POST data is this big. See \fICURLOPT_POSTFIELDSIZE_LARGE(3)\fP
 +.IP CURLOPT_COPYPOSTFIELDS
 +Send a POST with this data - and copy it. See \fICURLOPT_COPYPOSTFIELDS(3)\fP
 +.IP CURLOPT_HTTPPOST
 +Multipart formpost HTTP POST. See \fICURLOPT_HTTPPOST(3)\fP
 +.IP CURLOPT_REFERER
 +Referer: header. See \fICURLOPT_REFERER(3)\fP
 +.IP CURLOPT_USERAGENT
 +User-Agent: header. See \fICURLOPT_USERAGENT(3)\fP
 +.IP CURLOPT_HTTPHEADER
 +Custom HTTP headers. See \fICURLOPT_HTTPHEADER(3)\fP
 +.IP CURLOPT_HEADEROPT
 +Control custom headers. See \fICURLOPT_HEADEROPT(3)\fP
 +.IP CURLOPT_PROXYHEADER
 +Custom HTTP headers sent to proxy. See \fICURLOPT_PROXYHEADER(3)\fP
 +.IP CURLOPT_HTTP200ALIASES
 +Alternative versions of 200 OK. See \fICURLOPT_HTTP200ALIASES(3)\fP
 +.IP CURLOPT_COOKIE
 +Cookie(s) to send. See \fICURLOPT_COOKIE(3)\fP
 +.IP CURLOPT_COOKIEFILE
 +File to read cookies from. See \fICURLOPT_COOKIEFILE(3)\fP
 +.IP CURLOPT_COOKIEJAR
 +File to write cookies to. See \fICURLOPT_COOKIEJAR(3)\fP
 +.IP CURLOPT_COOKIESESSION
 +Start a new cookie session. See \fICURLOPT_COOKIESESSION(3)\fP
 +.IP CURLOPT_COOKIELIST
 +Add or control cookies. See \fICURLOPT_COOKIELIST(3)\fP
 +.IP CURLOPT_ALTSVC
 +Specify the Alt-Svc: cache file name. See \fICURLOPT_ALTSVC(3)\fP
 +.IP CURLOPT_ALTSVC_CTRL
 +Enable and configure Alt-Svc: treatment. See \fICURLOPT_ALTSVC_CTRL(3)\fP
 +.IP CURLOPT_HTTPGET
 +Do an HTTP GET request. See \fICURLOPT_HTTPGET(3)\fP
 +.IP CURLOPT_REQUEST_TARGET
 +Set the request target. \fICURLOPT_REQUEST_TARGET(3)\fP
 +.IP CURLOPT_HTTP_VERSION
 +HTTP version to use. \fICURLOPT_HTTP_VERSION(3)\fP
 +.IP CURLOPT_HTTP09_ALLOWED
 +Allow HTTP/0.9 responses. \fICURLOPT_HTTP09_ALLOWED(3)\fP
 +.IP CURLOPT_IGNORE_CONTENT_LENGTH
 +Ignore Content-Length. See \fICURLOPT_IGNORE_CONTENT_LENGTH(3)\fP
 +.IP CURLOPT_HTTP_CONTENT_DECODING
 +Disable Content decoding. See \fICURLOPT_HTTP_CONTENT_DECODING(3)\fP
 +.IP CURLOPT_HTTP_TRANSFER_DECODING
 +Disable Transfer decoding. See \fICURLOPT_HTTP_TRANSFER_DECODING(3)\fP
 +.IP CURLOPT_EXPECT_100_TIMEOUT_MS
 +100-continue timeout. See \fICURLOPT_EXPECT_100_TIMEOUT_MS(3)\fP
 +.IP CURLOPT_TRAILERFUNCTION
 +Set callback for sending trailing headers. See
 +\fICURLOPT_TRAILERFUNCTION(3)\fP
 +.IP CURLOPT_TRAILERDATA
 +Custom pointer passed to the trailing headers callback. See
 +\fICURLOPT_TRAILERDATA(3)\fP
 +.IP CURLOPT_PIPEWAIT
 +Wait on connection to pipeline on it. See \fICURLOPT_PIPEWAIT(3)\fP
 +.IP CURLOPT_STREAM_DEPENDS
 +This HTTP/2 stream depends on another. See \fICURLOPT_STREAM_DEPENDS(3)\fP
 +.IP CURLOPT_STREAM_DEPENDS_E
 +This HTTP/2 stream depends on another exclusively. See
 +\fICURLOPT_STREAM_DEPENDS_E(3)\fP
 +.IP CURLOPT_STREAM_WEIGHT
 +Set this HTTP/2 stream's weight. See \fICURLOPT_STREAM_WEIGHT(3)\fP
 +.SH SMTP OPTIONS
 +.IP CURLOPT_MAIL_FROM
 +Address of the sender. See \fICURLOPT_MAIL_FROM(3)\fP
 +.IP CURLOPT_MAIL_RCPT
 +Address of the recipients. See \fICURLOPT_MAIL_RCPT(3)\fP
 +.IP CURLOPT_MAIL_AUTH
 +Authentication address. See \fICURLOPT_MAIL_AUTH(3)\fP
 +.SH TFTP OPTIONS
 +.IP CURLOPT_TFTP_BLKSIZE
 +TFTP block size. See \fICURLOPT_TFTP_BLKSIZE(3)\fP
 +.IP CURLOPT_TFTP_NO_OPTIONS
 +Do not send TFTP options requests. See \fICURLOPT_TFTP_NO_OPTIONS(3)\fP
 +.SH FTP OPTIONS
 +.IP CURLOPT_FTPPORT
 +Use active FTP. See \fICURLOPT_FTPPORT(3)\fP
 +.IP CURLOPT_QUOTE
 +Commands to run before transfer. See \fICURLOPT_QUOTE(3)\fP
 +.IP CURLOPT_POSTQUOTE
 +Commands to run after transfer. See \fICURLOPT_POSTQUOTE(3)\fP
 +.IP CURLOPT_PREQUOTE
 +Commands to run just before transfer. See \fICURLOPT_PREQUOTE(3)\fP
 +.IP CURLOPT_APPEND
 +Append to remote file. See \fICURLOPT_APPEND(3)\fP
 +.IP CURLOPT_FTP_USE_EPRT
 +Use EPTR. See \fICURLOPT_FTP_USE_EPRT(3)\fP
 +.IP CURLOPT_FTP_USE_EPSV
 +Use EPSV. See \fICURLOPT_FTP_USE_EPSV(3)\fP
 +.IP CURLOPT_FTP_USE_PRET
 +Use PRET. See \fICURLOPT_FTP_USE_PRET(3)\fP
 +.IP CURLOPT_FTP_CREATE_MISSING_DIRS
 +Create missing directories on the remote server. See 
\fICURLOPT_FTP_CREATE_MISSING_DIRS(3)\fP
 +.IP CURLOPT_FTP_RESPONSE_TIMEOUT
 +Timeout for FTP responses. See \fICURLOPT_FTP_RESPONSE_TIMEOUT(3)\fP
 +.IP CURLOPT_FTP_ALTERNATIVE_TO_USER
 +Alternative to USER. See \fICURLOPT_FTP_ALTERNATIVE_TO_USER(3)\fP
 +.IP CURLOPT_FTP_SKIP_PASV_IP
 +Ignore the IP address in the PASV response. See 
\fICURLOPT_FTP_SKIP_PASV_IP(3)\fP
 +.IP CURLOPT_FTPSSLAUTH
 +Control how to do TLS. See \fICURLOPT_FTPSSLAUTH(3)\fP
 +.IP CURLOPT_FTP_SSL_CCC
 +Back to non-TLS again after authentication. See \fICURLOPT_FTP_SSL_CCC(3)\fP
 +.IP CURLOPT_FTP_ACCOUNT
 +Send ACCT command. See \fICURLOPT_FTP_ACCOUNT(3)\fP
 +.IP CURLOPT_FTP_FILEMETHOD
 +Specify how to reach files. See \fICURLOPT_FTP_FILEMETHOD(3)\fP
 +.SH RTSP OPTIONS
 +.IP CURLOPT_RTSP_REQUEST
 +RTSP request. See \fICURLOPT_RTSP_REQUEST(3)\fP
 +.IP CURLOPT_RTSP_SESSION_ID
 +RTSP session-id. See \fICURLOPT_RTSP_SESSION_ID(3)\fP
 +.IP CURLOPT_RTSP_STREAM_URI
 +RTSP stream URI. See \fICURLOPT_RTSP_STREAM_URI(3)\fP
 +.IP CURLOPT_RTSP_TRANSPORT
 +RTSP Transport: header. See \fICURLOPT_RTSP_TRANSPORT(3)\fP
 +.IP CURLOPT_RTSP_CLIENT_CSEQ
 +Client CSEQ number. See \fICURLOPT_RTSP_CLIENT_CSEQ(3)\fP
 +.IP CURLOPT_RTSP_SERVER_CSEQ
 +CSEQ number for RTSP Server->Client request. See 
\fICURLOPT_RTSP_SERVER_CSEQ(3)\fP
 +.SH PROTOCOL OPTIONS
 +.IP CURLOPT_TRANSFERTEXT
 +Use text transfer. See \fICURLOPT_TRANSFERTEXT(3)\fP
 +.IP CURLOPT_PROXY_TRANSFER_MODE
 +Add transfer mode to URL over proxy. See \fICURLOPT_PROXY_TRANSFER_MODE(3)\fP
 +.IP CURLOPT_CRLF
 +Convert newlines. See \fICURLOPT_CRLF(3)\fP
 +.IP CURLOPT_RANGE
 +Range requests. See \fICURLOPT_RANGE(3)\fP
 +.IP CURLOPT_RESUME_FROM
 +Resume a transfer. See \fICURLOPT_RESUME_FROM(3)\fP
 +.IP CURLOPT_RESUME_FROM_LARGE
 +Resume a transfer. See \fICURLOPT_RESUME_FROM_LARGE(3)\fP
 +.IP CURLOPT_CURLU
 +Set URL to work on with CURLU *. See \fICURLOPT_CURLU(3)\fP
 +.IP CURLOPT_CUSTOMREQUEST
 +Custom request/method. See \fICURLOPT_CUSTOMREQUEST(3)\fP
 +.IP CURLOPT_FILETIME
 +Request file modification date and time. See \fICURLOPT_FILETIME(3)\fP
 +.IP CURLOPT_DIRLISTONLY
 +List only. See \fICURLOPT_DIRLISTONLY(3)\fP
 +.IP CURLOPT_NOBODY
 +Do not get the body contents. See \fICURLOPT_NOBODY(3)\fP
 +.IP CURLOPT_INFILESIZE
 +Size of file to send. \fICURLOPT_INFILESIZE(3)\fP
 +.IP CURLOPT_INFILESIZE_LARGE
 +Size of file to send. \fICURLOPT_INFILESIZE_LARGE(3)\fP
 +.IP CURLOPT_UPLOAD
 +Upload data. See \fICURLOPT_UPLOAD(3)\fP
 +.IP CURLOPT_UPLOAD_BUFFERSIZE
 +Set upload buffer size. See \fICURLOPT_UPLOAD_BUFFERSIZE(3)\fP
 +.IP CURLOPT_MIMEPOST
 +Post/send MIME data. See \fICURLOPT_MIMEPOST(3)\fP
 +.IP CURLOPT_MAXFILESIZE
 +Maximum file size to get. See \fICURLOPT_MAXFILESIZE(3)\fP
 +.IP CURLOPT_MAXFILESIZE_LARGE
 +Maximum file size to get. See \fICURLOPT_MAXFILESIZE_LARGE(3)\fP
 +.IP CURLOPT_TIMECONDITION
 +Make a time conditional request. See \fICURLOPT_TIMECONDITION(3)\fP
 +.IP CURLOPT_TIMEVALUE
 +Time value for the time conditional request. See \fICURLOPT_TIMEVALUE(3)\fP
 +.IP CURLOPT_TIMEVALUE_LARGE
 +Time value for the time conditional request. See 
\fICURLOPT_TIMEVALUE_LARGE(3)\fP
 +.SH CONNECTION OPTIONS
 +.IP CURLOPT_TIMEOUT
 +Timeout for the entire request. See \fICURLOPT_TIMEOUT(3)\fP
 +.IP CURLOPT_TIMEOUT_MS
 +Millisecond timeout for the entire request. See \fICURLOPT_TIMEOUT_MS(3)\fP
 +.IP CURLOPT_LOW_SPEED_LIMIT
 +Low speed limit to abort transfer. See \fICURLOPT_LOW_SPEED_LIMIT(3)\fP
 +.IP CURLOPT_LOW_SPEED_TIME
 +Time to be below the speed to trigger low speed abort. See 
\fICURLOPT_LOW_SPEED_TIME(3)\fP
 +.IP CURLOPT_MAX_SEND_SPEED_LARGE
 +Cap the upload speed to this. See \fICURLOPT_MAX_SEND_SPEED_LARGE(3)\fP
 +.IP CURLOPT_MAX_RECV_SPEED_LARGE
 +Cap the download speed to this. See \fICURLOPT_MAX_RECV_SPEED_LARGE(3)\fP
 +.IP CURLOPT_MAXCONNECTS
 +Maximum number of connections in the connection pool. See 
\fICURLOPT_MAXCONNECTS(3)\fP
 +.IP CURLOPT_FRESH_CONNECT
 +Use a new connection. \fICURLOPT_FRESH_CONNECT(3)\fP
 +.IP CURLOPT_FORBID_REUSE
 +Prevent subsequent connections from re-using this. See 
\fICURLOPT_FORBID_REUSE(3)\fP
++.IP CURLOPT_MAXAGE_CONN
++Limit the age of connections for reuse. See \fICURLOPT_MAXAGE_CONN(3)\fP
 +.IP CURLOPT_CONNECTTIMEOUT
 +Timeout for the connection phase. See \fICURLOPT_CONNECTTIMEOUT(3)\fP
 +.IP CURLOPT_CONNECTTIMEOUT_MS
 +Millisecond timeout for the connection phase. See 
\fICURLOPT_CONNECTTIMEOUT_MS(3)\fP
 +.IP CURLOPT_IPRESOLVE
 +IP version to resolve to. See \fICURLOPT_IPRESOLVE(3)\fP
 +.IP CURLOPT_CONNECT_ONLY
 +Only connect, nothing else. See \fICURLOPT_CONNECT_ONLY(3)\fP
 +.IP CURLOPT_USE_SSL
 +Use TLS/SSL. See \fICURLOPT_USE_SSL(3)\fP
 +.IP CURLOPT_RESOLVE
 +Provide fixed/fake name resolves. See \fICURLOPT_RESOLVE(3)\fP
 +.IP CURLOPT_DNS_INTERFACE
 +Bind name resolves to this interface. See \fICURLOPT_DNS_INTERFACE(3)\fP
 +.IP CURLOPT_DNS_LOCAL_IP4
 +Bind name resolves to this IP4 address. See \fICURLOPT_DNS_LOCAL_IP4(3)\fP
 +.IP CURLOPT_DNS_LOCAL_IP6
 +Bind name resolves to this IP6 address. See \fICURLOPT_DNS_LOCAL_IP6(3)\fP
 +.IP CURLOPT_DNS_SERVERS
 +Preferred DNS servers. See \fICURLOPT_DNS_SERVERS(3)\fP
 +.IP CURLOPT_DNS_SHUFFLE_ADDRESSES
 +Shuffle addresses before use. See \fICURLOPT_DNS_SHUFFLE_ADDRESSES(3)\fP
 +.IP CURLOPT_ACCEPTTIMEOUT_MS
 +Timeout for waiting for the server's connect back to be accepted. See 
\fICURLOPT_ACCEPTTIMEOUT_MS(3)\fP
 +.IP CURLOPT_HAPPY_EYEBALLS_TIMEOUT_MS
 +Timeout for happy eyeballs. See \fICURLOPT_HAPPY_EYEBALLS_TIMEOUT_MS(3)\fP
 +.IP CURLOPT_UPKEEP_INTERVAL_MS
 +Sets the interval at which connection upkeep are performed. See
 +\fICURLOPT_UPKEEP_INTERVAL_MS(3)\fP
 +.SH SSL and SECURITY OPTIONS
 +.IP CURLOPT_SSLCERT
 +Client cert. See \fICURLOPT_SSLCERT(3)\fP
 +.IP CURLOPT_PROXY_SSLCERT
 +Proxy client cert. See \fICURLOPT_PROXY_SSLCERT(3)\fP
 +.IP CURLOPT_SSLCERTTYPE
 +Client cert type.  See \fICURLOPT_SSLCERTTYPE(3)\fP
 +.IP CURLOPT_PROXY_SSLCERTTYPE
 +Proxy client cert type.  See \fICURLOPT_PROXY_SSLCERTTYPE(3)\fP
 +.IP CURLOPT_SSLKEY
 +Client key. See \fICURLOPT_SSLKEY(3)\fP
 +.IP CURLOPT_PROXY_SSLKEY
 +Proxy client key. See \fICURLOPT_PROXY_SSLKEY(3)\fP
 +.IP CURLOPT_SSLKEYTYPE
 +Client key type. See \fICURLOPT_SSLKEYTYPE(3)\fP
 +.IP CURLOPT_PROXY_SSLKEYTYPE
 +Proxy client key type. See \fICURLOPT_PROXY_SSLKEYTYPE(3)\fP
 +.IP CURLOPT_KEYPASSWD
 +Client key password. See \fICURLOPT_KEYPASSWD(3)\fP
 +.IP CURLOPT_PROXY_KEYPASSWD
 +Proxy client key password. See \fICURLOPT_PROXY_KEYPASSWD(3)\fP
 +.IP CURLOPT_SSL_ENABLE_ALPN
 +Enable use of ALPN. See \fICURLOPT_SSL_ENABLE_ALPN(3)\fP
 +.IP CURLOPT_SSL_ENABLE_NPN
 +Enable use of NPN. See \fICURLOPT_SSL_ENABLE_NPN(3)\fP
 +.IP CURLOPT_SSLENGINE
 +Use identifier with SSL engine. See \fICURLOPT_SSLENGINE(3)\fP
 +.IP CURLOPT_SSLENGINE_DEFAULT
 +Default SSL engine. See \fICURLOPT_SSLENGINE_DEFAULT(3)\fP
 +.IP CURLOPT_SSL_FALSESTART
 +Enable TLS False Start. See \fICURLOPT_SSL_FALSESTART(3)\fP
 +.IP CURLOPT_SSLVERSION
 +SSL version to use. See \fICURLOPT_SSLVERSION(3)\fP
 +.IP CURLOPT_PROXY_SSLVERSION
 +Proxy SSL version to use. See \fICURLOPT_PROXY_SSLVERSION(3)\fP
 +.IP CURLOPT_SSL_VERIFYHOST
 +Verify the host name in the SSL certificate. See 
\fICURLOPT_SSL_VERIFYHOST(3)\fP
 +.IP CURLOPT_PROXY_SSL_VERIFYHOST
 +Verify the host name in the proxy SSL certificate. See 
\fICURLOPT_PROXY_SSL_VERIFYHOST(3)\fP
 +.IP CURLOPT_SSL_VERIFYPEER
 +Verify the SSL certificate. See \fICURLOPT_SSL_VERIFYPEER(3)\fP
 +.IP CURLOPT_PROXY_SSL_VERIFYPEER
 +Verify the proxy SSL certificate. See \fICURLOPT_PROXY_SSL_VERIFYPEER(3)\fP
 +.IP CURLOPT_SSL_VERIFYSTATUS
 +Verify the SSL certificate's status. See \fICURLOPT_SSL_VERIFYSTATUS(3)\fP
 +.IP CURLOPT_CAINFO
 +CA cert bundle. See \fICURLOPT_CAINFO(3)\fP
 +.IP CURLOPT_PROXY_CAINFO
 +Proxy CA cert bundle. See \fICURLOPT_PROXY_CAINFO(3)\fP
 +.IP CURLOPT_ISSUERCERT
 +Issuer certificate. See \fICURLOPT_ISSUERCERT(3)\fP
 +.IP CURLOPT_CAPATH
 +Path to CA cert bundle. See \fICURLOPT_CAPATH(3)\fP
 +.IP CURLOPT_PROXY_CAPATH
 +Path to proxy CA cert bundle. See \fICURLOPT_PROXY_CAPATH(3)\fP
 +.IP CURLOPT_CRLFILE
 +Certificate Revocation List. See \fICURLOPT_CRLFILE(3)\fP
 +.IP CURLOPT_PROXY_CRLFILE
 +Proxy Certificate Revocation List. See \fICURLOPT_PROXY_CRLFILE(3)\fP
 +.IP CURLOPT_CERTINFO
 +Extract certificate info. See \fICURLOPT_CERTINFO(3)\fP
 +.IP CURLOPT_PINNEDPUBLICKEY
 +Set pinned SSL public key . See \fICURLOPT_PINNEDPUBLICKEY(3)\fP
 +.IP CURLOPT_PROXY_PINNEDPUBLICKEY
 +Set the proxy's pinned SSL public key. See
 +\fICURLOPT_PROXY_PINNEDPUBLICKEY(3)\fP
 +.IP CURLOPT_RANDOM_FILE
 +Provide source for entropy random data. See \fICURLOPT_RANDOM_FILE(3)\fP
 +.IP CURLOPT_EGDSOCKET
 +Identify EGD socket for entropy. See \fICURLOPT_EGDSOCKET(3)\fP
 +.IP CURLOPT_SSL_CIPHER_LIST
 +Ciphers to use. See \fICURLOPT_SSL_CIPHER_LIST(3)\fP
 +.IP CURLOPT_PROXY_SSL_CIPHER_LIST
 +Proxy ciphers to use. See \fICURLOPT_PROXY_SSL_CIPHER_LIST(3)\fP
 +.IP CURLOPT_TLS13_CIPHERS
 +TLS 1.3 cipher suites to use. See \fICURLOPT_TLS13_CIPHERS(3)\fP
 +.IP CURLOPT_PROXY_TLS13_CIPHERS
 +Proxy TLS 1.3 cipher suites to use. See \fICURLOPT_PROXY_TLS13_CIPHERS(3)\fP
 +.IP CURLOPT_SSL_SESSIONID_CACHE
 +Disable SSL session-id cache. See \fICURLOPT_SSL_SESSIONID_CACHE(3)\fP
 +.IP CURLOPT_SSL_OPTIONS
 +Control SSL behavior. See \fICURLOPT_SSL_OPTIONS(3)\fP
 +.IP CURLOPT_PROXY_SSL_OPTIONS
 +Control proxy SSL behavior. See \fICURLOPT_PROXY_SSL_OPTIONS(3)\fP
 +.IP CURLOPT_KRBLEVEL
 +Kerberos security level. See \fICURLOPT_KRBLEVEL(3)\fP
 +.IP CURLOPT_GSSAPI_DELEGATION
 +Disable GSS-API delegation. See \fICURLOPT_GSSAPI_DELEGATION(3)\fP
 +.SH SSH OPTIONS
 +.IP CURLOPT_SSH_AUTH_TYPES
 +SSH authentication types. See \fICURLOPT_SSH_AUTH_TYPES(3)\fP
 +.IP CURLOPT_SSH_COMPRESSION
 +Enable SSH compression. See \fICURLOPT_SSH_COMPRESSION(3)\fP
 +.IP CURLOPT_SSH_HOST_PUBLIC_KEY_MD5
 +MD5 of host's public key. See \fICURLOPT_SSH_HOST_PUBLIC_KEY_MD5(3)\fP
 +.IP CURLOPT_SSH_PUBLIC_KEYFILE
 +File name of public key. See \fICURLOPT_SSH_PUBLIC_KEYFILE(3)\fP
 +.IP CURLOPT_SSH_PRIVATE_KEYFILE
 +File name of private key. See \fICURLOPT_SSH_PRIVATE_KEYFILE(3)\fP
 +.IP CURLOPT_SSH_KNOWNHOSTS
 +File name with known hosts. See \fICURLOPT_SSH_KNOWNHOSTS(3)\fP
 +.IP CURLOPT_SSH_KEYFUNCTION
 +Callback for known hosts handling. See \fICURLOPT_SSH_KEYFUNCTION(3)\fP
 +.IP CURLOPT_SSH_KEYDATA
 +Custom pointer to pass to ssh key callback. See \fICURLOPT_SSH_KEYDATA(3)\fP
 +.SH OTHER OPTIONS
 +.IP CURLOPT_PRIVATE
 +Private pointer to store. See \fICURLOPT_PRIVATE(3)\fP
 +.IP CURLOPT_SHARE
 +Share object to use. See \fICURLOPT_SHARE(3)\fP
 +.IP CURLOPT_NEW_FILE_PERMS
 +Mode for creating new remote files. See \fICURLOPT_NEW_FILE_PERMS(3)\fP
 +.IP CURLOPT_NEW_DIRECTORY_PERMS
 +Mode for creating new remote directories. See 
\fICURLOPT_NEW_DIRECTORY_PERMS(3)\fP
 +.SH TELNET OPTIONS
 +.IP CURLOPT_TELNETOPTIONS
 +TELNET options. See \fICURLOPT_TELNETOPTIONS(3)\fP
 +.SH RETURN VALUE
 +\fICURLE_OK\fP (zero) means that the option was set properly, non-zero means 
an
 +error occurred as \fI<gnurl/curl.h>\fP defines. See the 
\fIlibcurl-errors(3)\fP
 +man page for the full list with descriptions.
 +
 +If you try to set an option that libcurl doesn't know about, perhaps because
 +the library is too old to support it or the option was removed in a recent
 +version, this function will return \fICURLE_UNKNOWN_OPTION\fP. If support for
 +the option was disabled at compile-time, it will return
 +\fICURLE_NOT_BUILT_IN\fP.
 +.SH EXAMPLE
 +.nf
 +CURL *curl = curl_easy_init();
 +if(curl) {
 +  CURLcode res;
 +  curl_easy_setopt(curl, CURLOPT_URL, "http://example.com";);
 +  res = curl_easy_perform(curl);
 +  curl_easy_cleanup(curl);
 +}
 +.fi
 +.SH "SEE ALSO"
 +.BR curl_easy_init "(3), " curl_easy_cleanup "(3), " curl_easy_reset "(3), "
 +.BR curl_easy_getinfo "(3), " curl_multi_setopt "(3), "
diff --cc docs/libcurl/gnurl_url_get.3
index 2813a0aaa,000000000..7bbc0a09b
mode 100644,000000..100644
--- a/docs/libcurl/gnurl_url_get.3
+++ b/docs/libcurl/gnurl_url_get.3
@@@ -1,110 -1,0 +1,114 @@@
 +.\" **************************************************************************
 +.\" *                                  _   _ ____  _
 +.\" *  Project                     ___| | | |  _ \| |
 +.\" *                             / __| | | | |_) | |
 +.\" *                            | (__| |_| |  _ <| |___
 +.\" *                             \___|\___/|_| \_\_____|
 +.\" *
- .\" * Copyright (C) 1998 - 2018, Daniel Stenberg, <address@hidden>, et al.
++.\" * Copyright (C) 1998 - 2019, Daniel Stenberg, <address@hidden>, et al.
 +.\" *
 +.\" * This software is licensed as described in the file COPYING, which
 +.\" * you should have received as part of this distribution. The terms
 +.\" * are also available at https://curl.haxx.se/docs/copyright.html.
 +.\" *
 +.\" * You may opt to use, copy, modify, merge, publish, distribute and/or sell
 +.\" * copies of the Software, and permit persons to whom the Software is
 +.\" * furnished to do so, under the terms of the COPYING file.
 +.\" *
 +.\" * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF 
ANY
 +.\" * KIND, either express or implied.
 +.\" *
 +.\" **************************************************************************
 +.TH gnurl_url_get 3 "6 Aug 2018" "libcurl" "libgnurl Manual"
 +.SH NAME
 +curl_url_get - extract a part from a URL
 +.SH SYNOPSIS
 +.B #include <gnurl/curl.h>
 +
 +.nf
 +CURLUcode curl_url_get(CURLU *url,
 +                       CURLUPart what,
 +                       char **part,
 +                       unsigned int flags)
 +.fi
 +.SH DESCRIPTION
 +Given the \fIurl\fP handle of an already parsed URL, this function lets the
 +user extract individual pieces from it.
 +
 +The \fIwhat\fP argument should be the particular part to extract (see list
 +below) and \fIpart\fP points to a 'char *' to get updated to point to a newly
 +allocated string with the contents.
 +
 +The \fIflags\fP argument is a bitmask with individual features.
 +
 +The returned part pointer must be freed with \fIcurl_free(3)\fP after use.
 +.SH FLAGS
 +The flags argument is zero, one or more bits set in a bitmask.
 +.IP CURLU_DEFAULT_PORT
 +If the handle has no port stored, this option will make \fIcurl_url_get(3)\fP
 +return the default port for the used scheme.
 +.IP CURLU_DEFAULT_SCHEME
 +If the handle has no scheme stored, this option will make
 +\fIcurl_url_get(3)\fP return the default scheme instead of error.
 +.IP CURLU_NO_DEFAULT_PORT
 +Instructs \fIcurl_url_get(3)\fP to not return a port number if it matches the
 +default port for the scheme.
 +.IP CURLU_URLDECODE
 +Asks \fIcurl_url_get(3)\fP to URL decode the contents before returning it. It
 +will not attempt to decode the scheme, the port number or the full URL.
 +
 +The query component will also get plus-to-space conversion as a bonus when
 +this bit is set.
 +
 +Note that this URL decoding is charset unaware and you will get a zero
 +terminated string back with data that could be intended for a particular
 +encoding.
 +
 +If there's any byte values lower than 32 in the decoded string, the get
 +operation will return an error instead.
 +.SH PARTS
 +.IP CURLUPART_URL
 +When asked to return the full URL, \fIcurl_url_get(3)\fP will return a
 +normalized and possibly cleaned up version of what was previously parsed.
 +.IP CURLUPART_SCHEME
 +Scheme cannot be URL decoded on get.
 +.IP CURLUPART_USER
 +.IP CURLUPART_PASSWORD
 +.IP CURLUPART_OPTIONS
 +.IP CURLUPART_HOST
++If the host part is an IPv6 numeric address, the zoneid will not be part of
++the extracted host but is provided separately in \fICURLUPART_ZONEID\fP.
++.IP CURLUPART_ZONEID
++If the host name is a numeric IPv6 address, this field might also be set.
 +.IP CURLUPART_PORT
 +Port cannot be URL decoded on get.
 +.IP CURLUPART_PATH
 +.IP CURLUPART_QUERY
 +The query part will also get pluses converted to space when asked to URL
 +decode on get with the CURLU_URLDECODE bit.
 +.IP CURLUPART_FRAGMENT
 +.SH RETURN VALUE
 +Returns a CURLUcode error value, which is CURLUE_OK (0) if everything went
 +fine.
 +
 +If this function returns an error, no URL part is returned.
 +.SH EXAMPLE
 +.nf
 +  CURLUcode rc;
 +  CURLU *url = curl_url();
 +  rc = curl_url_set(url, CURLUPART_URL, "https://example.com";, 0);
 +  if(!rc) {
 +    char *scheme;
 +    rc = curl_url_get(url, CURLUPART_SCHEME, &scheme, 0);
 +    if(!rc) {
 +      printf("the scheme is %s\\n", scheme);
 +      curl_free(scheme);
 +    }
 +    curl_url_cleanup(url);
 +  }
 +.fi
 +.SH AVAILABILITY
- Added in curl 7.62.0
++Added in curl 7.62.0. CURLUPART_ZONEID was added in 7.65.0.
 +.SH "SEE ALSO"
 +.BR curl_url_cleanup "(3), " curl_url "(3), " curl_url_set "(3), "
 +.BR curl_url_dup "(3), "
diff --cc docs/libcurl/gnurl_url_set.3
index c512ec3f4,000000000..cbeff1b2c
mode 100644,000000..100644
--- a/docs/libcurl/gnurl_url_set.3
+++ b/docs/libcurl/gnurl_url_set.3
@@@ -1,131 -1,0 +1,135 @@@
 +.\" **************************************************************************
 +.\" *                                  _   _ ____  _
 +.\" *  Project                     ___| | | |  _ \| |
 +.\" *                             / __| | | | |_) | |
 +.\" *                            | (__| |_| |  _ <| |___
 +.\" *                             \___|\___/|_| \_\_____|
 +.\" *
- .\" * Copyright (C) 1998 - 2018, Daniel Stenberg, <address@hidden>, et al.
++.\" * Copyright (C) 1998 - 2019, Daniel Stenberg, <address@hidden>, et al.
 +.\" *
 +.\" * This software is licensed as described in the file COPYING, which
 +.\" * you should have received as part of this distribution. The terms
 +.\" * are also available at https://curl.haxx.se/docs/copyright.html.
 +.\" *
 +.\" * You may opt to use, copy, modify, merge, publish, distribute and/or sell
 +.\" * copies of the Software, and permit persons to whom the Software is
 +.\" * furnished to do so, under the terms of the COPYING file.
 +.\" *
 +.\" * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF 
ANY
 +.\" * KIND, either express or implied.
 +.\" *
 +.\" **************************************************************************
 +.TH gnurl_url_set 3 "6 Aug 2018" "libcurl" "libgnurl Manual"
 +.SH NAME
 +curl_url_set - set a URL part
 +.SH SYNOPSIS
 +.B #include <gnurl/curl.h>
 +
 +CURLUcode curl_url_set(CURLU *url,
 +                       CURLUPart part,
 +                       const char *content,
 +                       unsigned int flags)
 +.fi
 +.SH DESCRIPTION
 +Given the \fIurl\fP handle of an already parsed URL, this function lets the
 +user set/update individual pieces of it.
 +
 +The \fIpart\fP argument should identify the particular URL part (see list
 +below) to set or change, with \fIcontent\fP pointing to a zero terminated
 +string with the new contents for that URL part. The contents should be in the
 +form and encoding they'd use in a URL: URL encoded.
 +
 +Setting a part to a NULL pointer will effectively remove that part's contents
 +from the CURLU handle.
 +
 +The \fIflags\fP argument is a bitmask with independent features.
 +.SH PARTS
 +.IP CURLUPART_URL
 +Allows the full URL of the handle to be replaced. If the handle already is
 +populated with a URL, the new URL can be relative to the previous.
 +
 +When successfully setting a new URL, relative or absolute, the handle contents
 +will be replaced with the information of the newly set URL.
 +
 +Pass a pointer to a zero terminated string to the \fIurl\fP parameter. The
 +string must point to a correctly formatted "RFC 3986+" URL or be a NULL
 +pointer.
 +.IP CURLUPART_SCHEME
 +Scheme cannot be URL decoded on set.
 +.IP CURLUPART_USER
 +.IP CURLUPART_PASSWORD
 +.IP CURLUPART_OPTIONS
 +.IP CURLUPART_HOST
 +The host name can use IDNA. The string must then be encoded as your locale
 +says or UTF-8 (when winidn is used).
++.IP CURLUPART_ZONEID
++If the host name is a numeric IPv6 address, this field can also be set.
 +.IP CURLUPART_PORT
- Port cannot be URL encoded on set.
++Port cannot be URL encoded on set. The given port number is provided as a
++string and the decimal number must be between 1 and 65535. Anything else will
++return an error.
 +.IP CURLUPART_PATH
 +If a path is set in the URL without a leading slash, a slash will be inserted
 +automatically when this URL is read from the handle.
 +.IP CURLUPART_QUERY
 +The query part will also get spaces converted to pluses when asked to URL
 +encode on set with the CURLU_URLENCODE bit.
 +
 +If used together with the \fICURLU_APPENDQUERY\fP bit, the provided part will
 +be appended on the end of the existing query - and if the previous part didn't
 +end with an ampersand (&), an ampersand will be inserted before the new
 +appended part.
 +
 +When \fICURLU_APPENDQUERY\fP is used together with \fICURLU_URLENCODE\fP, the
 +first '=' symbol will not be URL encoded.
 +
 +The question mark in the URL is not part of the actual query contents.
 +.IP CURLUPART_FRAGMENT
 +The hash sign in the URL is not part of the actual fragment contents.
 +.SH FLAGS
 +The flags argument is zero, one or more bits set in a bitmask.
 +.IP CURLU_NON_SUPPORT_SCHEME
 +If set, allows \fIcurl_url_set(3)\fP to set a non-supported scheme.
 +.IP CURLU_URLENCODE
 +When set, \fIcurl_url_set(3)\fP URL encodes the part on entry, except for
 +scheme, port and URL.
 +
 +When setting the path component with URL encoding enabled, the slash character
 +will be skipped.
 +
 +The query part gets space-to-plus conversion before the URL conversion.
 +
 +This URL encoding is charset unaware and will convert the input on a
 +byte-by-byte manner.
 +.IP CURLU_DEFAULT_SCHEME
 +If set, will make libcurl allow the URL to be set without a scheme and then
 +sets that to the default scheme: HTTPS. Overrides the \fICURLU_GUESS_SCHEME\fP
 +option if both are set.
 +.IP CURLU_GUESS_SCHEME
 +If set, will make libcurl allow the URL to be set without a scheme and it
 +instead "guesses" which scheme that was intended based on the host name.  If
 +the outermost sub-domain name matches DICT, FTP, IMAP, LDAP, POP3 or SMTP then
 +that scheme will be used, otherwise it picks HTTP. Conflicts with the
 +\fICURLU_DEFAULT_SCHEME\fP option which takes precedence if both are set.
 +.SH RETURN VALUE
 +Returns a CURLUcode error value, which is CURLUE_OK (0) if everything went
 +fine.
 +
 +If this function returns an error, no URL part is returned.
 +.SH EXAMPLE
 +.nf
 +  CURLUcode rc;
 +  CURLU *url = curl_url();
 +  rc = curl_url_set(url, CURLUPART_URL, "https://example.com";, 0);
 +  if(!rc) {
 +    char *scheme;
 +    /* change it to an FTP URL */
 +    rc = curl_url_set(url, CURLUPART_SCHEME, "ftp", 0);
 +  }
 +  curl_url_cleanup(url);
 +.fi
 +.SH AVAILABILITY
- Added in curl 7.62.0
++Added in curl 7.62.0. CURLUPART_ZONEID was added in 7.65.0.
 +.SH "SEE ALSO"
 +.BR curl_url_cleanup "(3), " curl_url "(3), " curl_url_get "(3), "
 +.BR curl_url_dup "(3), "
diff --cc docs/libcurl/opts/GNURLMOPT_CHUNK_LENGTH_PENALTY_SIZE.3
index 2d7a1f11d,000000000..4da4fed01
mode 100644,000000..100644
--- a/docs/libcurl/opts/GNURLMOPT_CHUNK_LENGTH_PENALTY_SIZE.3
+++ b/docs/libcurl/opts/GNURLMOPT_CHUNK_LENGTH_PENALTY_SIZE.3
@@@ -1,52 -1,0 +1,54 @@@
 +.\" **************************************************************************
 +.\" *                                  _   _ ____  _
 +.\" *  Project                     ___| | | |  _ \| |
 +.\" *                             / __| | | | |_) | |
 +.\" *                            | (__| |_| |  _ <| |___
 +.\" *                             \___|\___/|_| \_\_____|
 +.\" *
- .\" * Copyright (C) 1998 - 2017, Daniel Stenberg, <address@hidden>, et al.
++.\" * Copyright (C) 1998 - 2019, Daniel Stenberg, <address@hidden>, et al.
 +.\" *
 +.\" * This software is licensed as described in the file COPYING, which
 +.\" * you should have received as part of this distribution. The terms
 +.\" * are also available at https://curl.haxx.se/docs/copyright.html.
 +.\" *
 +.\" * You may opt to use, copy, modify, merge, publish, distribute and/or sell
 +.\" * copies of the Software, and permit persons to whom the Software is
 +.\" * furnished to do so, under the terms of the COPYING file.
 +.\" *
 +.\" * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF 
ANY
 +.\" * KIND, either express or implied.
 +.\" *
 +.\" **************************************************************************
 +.\"
 +.TH GNURLMOPT_CHUNK_LENGTH_PENALTY_SIZE 3 "4 Nov 2014" "libcurl 7.39.0" 
"curl_multi_setopt options"
 +.SH NAME
 +CURLMOPT_CHUNK_LENGTH_PENALTY_SIZE \- chunk length threshold for pipelining
 +.SH SYNOPSIS
 +#include <gnurl/curl.h>
 +
 +CURLMcode curl_multi_setopt(CURLM *handle, 
CURLMOPT_CHUNK_LENGTH_PENALTY_SIZE, long size);
 +.SH DESCRIPTION
++No function since pipelining was removed in 7.62.0.
++
 +Pass a long with a \fBsize\fP in bytes. If a pipelined connection is currently
 +processing a chunked (Transfer-encoding: chunked) request with a current chunk
 +length larger than \fICURLMOPT_CHUNK_LENGTH_PENALTY_SIZE(3)\fP, that pipeline
 +will not be considered for additional requests, even if it is shorter than
 +\fICURLMOPT_MAX_PIPELINE_LENGTH(3)\fP.
 +.SH DEFAULT
 +The default value is 0, which means that the penalization is inactive.
 +.SH PROTOCOLS
 +HTTP(S)
 +.SH EXAMPLE
 +.nf
 +CURLM *m = curl_multi_init();
 +long maxchunk = 10000;
 +curl_multi_setopt(m, CURLMOPT_CHUNK_LENGTH_PENALTY_SIZE, maxchunk);
 +.fi
 +.SH AVAILABILITY
 +Added in 7.30.0
 +.SH RETURN VALUE
 +Returns CURLM_OK if the option is supported, and CURLM_UNKNOWN_OPTION if not.
 +.SH "SEE ALSO"
 +.BR CURLMOPT_PIPELINING "(3), " CURLMOPT_CONTENT_LENGTH_PENALTY_SIZE "(3), "
 +.BR CURLMOPT_MAX_PIPELINE_LENGTH "(3), "
diff --cc docs/libcurl/opts/GNURLMOPT_CONTENT_LENGTH_PENALTY_SIZE.3
index 7038dac1e,000000000..884cb1d72
mode 100644,000000..100644
--- a/docs/libcurl/opts/GNURLMOPT_CONTENT_LENGTH_PENALTY_SIZE.3
+++ b/docs/libcurl/opts/GNURLMOPT_CONTENT_LENGTH_PENALTY_SIZE.3
@@@ -1,51 -1,0 +1,53 @@@
 +.\" **************************************************************************
 +.\" *                                  _   _ ____  _
 +.\" *  Project                     ___| | | |  _ \| |
 +.\" *                             / __| | | | |_) | |
 +.\" *                            | (__| |_| |  _ <| |___
 +.\" *                             \___|\___/|_| \_\_____|
 +.\" *
- .\" * Copyright (C) 1998 - 2017, Daniel Stenberg, <address@hidden>, et al.
++.\" * Copyright (C) 1998 - 2019, Daniel Stenberg, <address@hidden>, et al.
 +.\" *
 +.\" * This software is licensed as described in the file COPYING, which
 +.\" * you should have received as part of this distribution. The terms
 +.\" * are also available at https://curl.haxx.se/docs/copyright.html.
 +.\" *
 +.\" * You may opt to use, copy, modify, merge, publish, distribute and/or sell
 +.\" * copies of the Software, and permit persons to whom the Software is
 +.\" * furnished to do so, under the terms of the COPYING file.
 +.\" *
 +.\" * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF 
ANY
 +.\" * KIND, either express or implied.
 +.\" *
 +.\" **************************************************************************
 +.\"
 +.TH GNURLMOPT_CONTENT_LENGTH_PENALTY_SIZE 3 "4 Nov 2014" "libcurl 7.39.0" 
"curl_multi_setopt options"
 +.SH NAME
 +CURLMOPT_CONTENT_LENGTH_PENALTY_SIZE \- size threshold for pipelining penalty
 +.SH SYNOPSIS
 +#include <gnurl/curl.h>
 +
 +CURLMcode curl_multi_setopt(CURLM *handle, 
CURLMOPT_CONTENT_LENGTH_PENALTY_SIZE, long size);
 +.SH DESCRIPTION
++No function since pipelining was removed in 7.62.0.
++
 +Pass a long with a \fBsize\fP in bytes. If a pipelined connection is currently
 +processing a request with a Content-Length larger than this
 +\fICURLMOPT_CONTENT_LENGTH_PENALTY_SIZE(3)\fP, that pipeline will then not be
 +considered for additional requests, even if it is shorter than
 +\fICURLMOPT_MAX_PIPELINE_LENGTH(3)\fP.
 +.SH DEFAULT
 +The default value is 0, which means that the size penalization is inactive.
 +.SH PROTOCOLS
 +HTTP(S)
 +.SH EXAMPLE
 +.nf
 +CURLM *m = curl_multi_init();
 +long maxlength = 10000;
 +curl_multi_setopt(m, CURLMOPT_CONTENT_LENGTH_PENALTY_SIZE, maxlength);
 +.fi
 +.SH AVAILABILITY
 +Added in 7.30.0
 +.SH RETURN VALUE
 +Returns CURLM_OK if the option is supported, and CURLM_UNKNOWN_OPTION if not.
 +.SH "SEE ALSO"
 +.BR CURLMOPT_PIPELINING "(3), " CURLMOPT_CHUNK_LENGTH_PENALTY_SIZE "(3), "
diff --cc docs/libcurl/opts/GNURLMOPT_MAX_PIPELINE_LENGTH.3
index 8be4b0a82,000000000..63a856a3b
mode 100644,000000..100644
--- a/docs/libcurl/opts/GNURLMOPT_MAX_PIPELINE_LENGTH.3
+++ b/docs/libcurl/opts/GNURLMOPT_MAX_PIPELINE_LENGTH.3
@@@ -1,55 -1,0 +1,57 @@@
 +.\" **************************************************************************
 +.\" *                                  _   _ ____  _
 +.\" *  Project                     ___| | | |  _ \| |
 +.\" *                             / __| | | | |_) | |
 +.\" *                            | (__| |_| |  _ <| |___
 +.\" *                             \___|\___/|_| \_\_____|
 +.\" *
- .\" * Copyright (C) 1998 - 2017, Daniel Stenberg, <address@hidden>, et al.
++.\" * Copyright (C) 1998 - 2019, Daniel Stenberg, <address@hidden>, et al.
 +.\" *
 +.\" * This software is licensed as described in the file COPYING, which
 +.\" * you should have received as part of this distribution. The terms
 +.\" * are also available at https://curl.haxx.se/docs/copyright.html.
 +.\" *
 +.\" * You may opt to use, copy, modify, merge, publish, distribute and/or sell
 +.\" * copies of the Software, and permit persons to whom the Software is
 +.\" * furnished to do so, under the terms of the COPYING file.
 +.\" *
 +.\" * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF 
ANY
 +.\" * KIND, either express or implied.
 +.\" *
 +.\" **************************************************************************
 +.\"
 +.TH GNURLMOPT_MAX_PIPELINE_LENGTH 3 "4 Nov 2014" "libcurl 7.39.0" 
"curl_multi_setopt options"
 +.SH NAME
 +CURLMOPT_MAX_PIPELINE_LENGTH \- maximum number of requests in a pipeline
 +.SH SYNOPSIS
 +#include <gnurl/curl.h>
 +
 +CURLMcode curl_multi_setopt(CURLM *handle, CURLMOPT_MAX_PIPELINE_LENGTH, long 
max);
 +.SH DESCRIPTION
++No function since pipelining was removed in 7.62.0.
++
 +Pass a long. The set \fBmax\fP number will be used as the maximum amount of
 +outstanding requests in an HTTP/1.1 pipelined connection. This option is only
 +used for HTTP/1.1 pipelining, not for HTTP/2 multiplexing.
 +
 +When this limit is reached, libcurl will use another connection to the same
 +host (see \fICURLMOPT_MAX_HOST_CONNECTIONS(3)\fP), or queue the request until
 +one of the pipelines to the host is ready to accept a request.  Thus, the
 +total number of requests in-flight is \fICURLMOPT_MAX_HOST_CONNECTIONS(3)\fP *
 +\fICURLMOPT_MAX_PIPELINE_LENGTH(3)\fP.
 +.SH DEFAULT
 +5
 +.SH PROTOCOLS
 +HTTP(S)
 +.SH EXAMPLE
 +.nf
 +CURLM *m = curl_multi_init();
 +/* set a more conservative pipe length */
 +curl_multi_setopt(m, CURLMOPT_MAX_PIPELINE_LENGTH, 3L);
 +.fi
 +.SH AVAILABILITY
 +Added in 7.30.0
 +.SH RETURN VALUE
 +Returns CURLM_OK if the option is supported, and CURLM_UNKNOWN_OPTION if not.
 +.SH "SEE ALSO"
 +.BR CURLMOPT_PIPELINING "(3), " CURLMOPT_MAX_HOST_CONNECTIONS "(3), "
diff --cc docs/libcurl/opts/GNURLMOPT_PIPELINING.3
index a6120769c,000000000..95d0aad05
mode 100644,000000..100644
--- a/docs/libcurl/opts/GNURLMOPT_PIPELINING.3
+++ b/docs/libcurl/opts/GNURLMOPT_PIPELINING.3
@@@ -1,89 -1,0 +1,89 @@@
 +.\" **************************************************************************
 +.\" *                                  _   _ ____  _
 +.\" *  Project                     ___| | | |  _ \| |
 +.\" *                             / __| | | | |_) | |
 +.\" *                            | (__| |_| |  _ <| |___
 +.\" *                             \___|\___/|_| \_\_____|
 +.\" *
- .\" * Copyright (C) 1998 - 2018, Daniel Stenberg, <address@hidden>, et al.
++.\" * Copyright (C) 1998 - 2019, Daniel Stenberg, <address@hidden>, et al.
 +.\" *
 +.\" * This software is licensed as described in the file COPYING, which
 +.\" * you should have received as part of this distribution. The terms
 +.\" * are also available at https://curl.haxx.se/docs/copyright.html.
 +.\" *
 +.\" * You may opt to use, copy, modify, merge, publish, distribute and/or sell
 +.\" * copies of the Software, and permit persons to whom the Software is
 +.\" * furnished to do so, under the terms of the COPYING file.
 +.\" *
 +.\" * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF 
ANY
 +.\" * KIND, either express or implied.
 +.\" *
 +.\" **************************************************************************
 +.\"
 +.TH GNURLMOPT_PIPELINING 3 "17 Jun 2014" "libcurl 7.37.0" "curl_multi_setopt 
options"
 +.SH NAME
 +CURLMOPT_PIPELINING \- enable HTTP pipelining and multiplexing
 +.SH SYNOPSIS
 +#include <gnurl/curl.h>
 +
 +CURLMcode curl_multi_setopt(CURLM *handle, CURLMOPT_PIPELINING, long bitmask);
 +.SH DESCRIPTION
 +Pass in the \fBbitmask\fP parameter to instruct libcurl to enable HTTP
 +pipelining and/or HTTP/2 multiplexing for this multi handle.
 +
 +When enabled, libcurl will attempt to use those protocol features when doing
 +parallel requests to the same hosts.
 +
 +For pipelining, this means that if you add a second request that can use an
 +already existing connection, the second request will be \&"piped" on the same
 +connection rather than being executed in parallel.
 +
 +For multiplexing, this means that follow-up requests can re-use an existing
 +connection and send the new request multiplexed over that at the same time as
 +other transfers are already using that single connection.
 +
 +There are several other related options that are interesting to tweak and
 +adjust to alter how libcurl spreads out requests on different connections or
 +not etc.
 +
 +Before 7.43.0, this option was set to 1 and 0 to enable and disable HTTP/1.1
 +pipelining.
 +
 +Starting in 7.43.0, \fBbitmask\fP's second bit also has a meaning, and you can
 +ask for pipelining and multiplexing independently of each other by toggling
 +the correct bits.
 +.IP CURLPIPE_NOTHING (0)
 +Default, which means doing no attempts at pipelining or multiplexing.
 +.IP CURLPIPE_HTTP1 (1)
 +If this bit is set, libcurl will try to pipeline HTTP/1.1 requests on
 +connections that are already established and in use to hosts.
 +
 +This bit is deprecated and has no effect since version 7.62.0.
 +.IP CURLPIPE_MULTIPLEX (2)
 +If this bit is set, libcurl will try to multiplex the new transfer over an
 +existing connection if possible. This requires HTTP/2.
 +.SH DEFAULT
 +Since 7.62.0, \fBCURLPIPE_MULTIPLEX\fP is enabled by default.
 +
 +Before that, default was \fBCURLPIPE_NOTHING\fP.
 +.SH PROTOCOLS
 +HTTP(S)
 +.SH EXAMPLE
 +.nf
 +CURLM *m = curl_multi_init();
- /* try HTTP/1 pipelining and HTTP/2 multiplexing */
- curl_multi_setopt(m, CURLMOPT_PIPELINING, CURLPIPE_HTTP1 |
-                                           CURLPIPE_MULTIPLEX);
++/* try HTTP/2 multiplexing */
++curl_multi_setopt(m, CURLMOPT_PIPELINING, CURLPIPE_MULTIPLEX);
 +.fi
 +.SH AVAILABILITY
- Added in 7.16.0. Multiplex support bit added in 7.43.0.
++Added in 7.16.0. Multiplex support bit added in 7.43.0. HTTP/1 Pipelining
++support was disabled in 7.62.0.
 +.SH RETURN VALUE
 +Returns CURLM_OK if the option is supported, and CURLM_UNKNOWN_OPTION if not.
 +.SH "SEE ALSO"
 +.BR CURLMOPT_MAX_PIPELINE_LENGTH "(3), "
 +.BR CURLMOPT_PIPELINING_SITE_BL "(3), "
 +.BR CURLMOPT_CONTENT_LENGTH_PENALTY_SIZE "(3), "
 +.BR CURLMOPT_CHUNK_LENGTH_PENALTY_SIZE "(3), "
 +.BR CURLMOPT_MAX_HOST_CONNECTIONS "(3), "
 +.BR CURLMOPT_MAXCONNECTS "(3), "
 +.BR CURLMOPT_MAX_HOST_CONNECTIONS "(3), "
diff --cc docs/libcurl/opts/GNURLMOPT_PIPELINING_SERVER_BL.3
index 9c9b25132,000000000..70a1826c5
mode 100644,000000..100644
--- a/docs/libcurl/opts/GNURLMOPT_PIPELINING_SERVER_BL.3
+++ b/docs/libcurl/opts/GNURLMOPT_PIPELINING_SERVER_BL.3
@@@ -1,60 -1,0 +1,62 @@@
 +.\" **************************************************************************
 +.\" *                                  _   _ ____  _
 +.\" *  Project                     ___| | | |  _ \| |
 +.\" *                             / __| | | | |_) | |
 +.\" *                            | (__| |_| |  _ <| |___
 +.\" *                             \___|\___/|_| \_\_____|
 +.\" *
- .\" * Copyright (C) 1998 - 2014, Daniel Stenberg, <address@hidden>, et al.
++.\" * Copyright (C) 1998 - 2019, Daniel Stenberg, <address@hidden>, et al.
 +.\" *
 +.\" * This software is licensed as described in the file COPYING, which
 +.\" * you should have received as part of this distribution. The terms
 +.\" * are also available at https://curl.haxx.se/docs/copyright.html.
 +.\" *
 +.\" * You may opt to use, copy, modify, merge, publish, distribute and/or sell
 +.\" * copies of the Software, and permit persons to whom the Software is
 +.\" * furnished to do so, under the terms of the COPYING file.
 +.\" *
 +.\" * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF 
ANY
 +.\" * KIND, either express or implied.
 +.\" *
 +.\" **************************************************************************
 +.\"
 +.TH GNURLMOPT_PIPELINING_SERVER_BL 3 "4 Nov 2014" "libcurl 7.39.0" 
"curl_multi_setopt options"
 +.SH NAME
 +CURLMOPT_PIPELINING_SERVER_BL \- pipelining server blacklist
 +.SH SYNOPSIS
 +#include <gnurl/curl.h>
 +
 +CURLMcode curl_multi_setopt(CURLM *handle, CURLMOPT_PIPELINING_SERVER_BL, 
char **servers);
 +.SH DESCRIPTION
++No function since pipelining was removed in 7.62.0.
++
 +Pass a \fBservers\fP array of char *, ending with a NULL entry. This is a list
 +of server types prefixes (in the Server: HTTP header) that are blacklisted
 +from pipelining, i.e server types that are known to not support HTTP
 +pipelining. The array is copied by libcurl.
 +
 +Note that the comparison matches if the Server: header begins with the string
 +in the blacklist, i.e "Server: Ninja 1.2.3" and "Server: Ninja 1.4.0" can
 +both be blacklisted by having "Ninja" in the backlist.
 +
 +Pass a NULL pointer to clear the blacklist.
 +.SH DEFAULT
 +The default value is NULL, which means that there is no blacklist.
 +.SH PROTOCOLS
 +.SH EXAMPLE
 +.nf
 +  server_blacklist[] =
 +  {
 +    "Microsoft-IIS/6.0",
 +    "nginx/0.8.54",
 +    NULL
 +  };
 +
 +  curl_multi_setopt(m, CURLMOPT_PIPELINING_SERVER_BL, server_blacklist);
 +.fi
 +.SH AVAILABILITY
 +Added in 7.30.0
 +.SH RETURN VALUE
 +Returns CURLM_OK if the option is supported, and CURLM_UNKNOWN_OPTION if not.
 +.SH "SEE ALSO"
 +.BR CURLMOPT_PIPELINING "(3), " CURLMOPT_PIPELINING_SITE_BL "(3), "
diff --cc docs/libcurl/opts/GNURLMOPT_PIPELINING_SITE_BL.3
index 110e8b37a,000000000..89cb1b0ed
mode 100644,000000..100644
--- a/docs/libcurl/opts/GNURLMOPT_PIPELINING_SITE_BL.3
+++ b/docs/libcurl/opts/GNURLMOPT_PIPELINING_SITE_BL.3
@@@ -1,56 -1,0 +1,58 @@@
 +.\" **************************************************************************
 +.\" *                                  _   _ ____  _
 +.\" *  Project                     ___| | | |  _ \| |
 +.\" *                             / __| | | | |_) | |
 +.\" *                            | (__| |_| |  _ <| |___
 +.\" *                             \___|\___/|_| \_\_____|
 +.\" *
- .\" * Copyright (C) 1998 - 2014, Daniel Stenberg, <address@hidden>, et al.
++.\" * Copyright (C) 1998 - 2019, Daniel Stenberg, <address@hidden>, et al.
 +.\" *
 +.\" * This software is licensed as described in the file COPYING, which
 +.\" * you should have received as part of this distribution. The terms
 +.\" * are also available at https://curl.haxx.se/docs/copyright.html.
 +.\" *
 +.\" * You may opt to use, copy, modify, merge, publish, distribute and/or sell
 +.\" * copies of the Software, and permit persons to whom the Software is
 +.\" * furnished to do so, under the terms of the COPYING file.
 +.\" *
 +.\" * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF 
ANY
 +.\" * KIND, either express or implied.
 +.\" *
 +.\" **************************************************************************
 +.\"
 +.TH GNURLMOPT_PIPELINING_SITE_BL 3 "4 Nov 2014" "libcurl 7.39.0" 
"curl_multi_setopt options"
 +.SH NAME
 +CURLMOPT_PIPELINING_SITE_BL \- pipelining host blacklist
 +.SH SYNOPSIS
 +#include <gnurl/curl.h>
 +
 +CURLMcode curl_multi_setopt(CURLM *handle, CURLMOPT_PIPELINING_SITE_BL, char 
**hosts);
 +.SH DESCRIPTION
++No function since pipelining was removed in 7.62.0.
++
 +Pass a \fBhosts\fP array of char *, ending with a NULL entry. This is a list
 +of sites that are blacklisted from pipelining, i.e sites that are known to not
 +support HTTP pipelining. The array is copied by libcurl.
 +
 +Pass a NULL pointer to clear the blacklist.
 +.SH DEFAULT
 +The default value is NULL, which means that there is no blacklist.
 +.SH PROTOCOLS
 +HTTP(S)
 +.SH EXAMPLE
 +.nf
 +  site_blacklist[] =
 +  {
 +    "www.haxx.se",
 +    "www.example.com:1234",
 +    NULL
 +  };
 +
 +  curl_multi_setopt(m, CURLMOPT_PIPELINING_SITE_BL, site_blacklist);
 +.fi
 +.SH AVAILABILITY
 +Added in 7.30.0
 +.SH RETURN VALUE
 +Returns CURLM_OK if the option is supported, and CURLM_UNKNOWN_OPTION if not.
 +.SH "SEE ALSO"
 +.BR CURLMOPT_PIPELINING "(3), " CURLMOPT_PIPELINING_SERVER_BL "(3), "
diff --cc docs/libcurl/opts/GNURLMOPT_TIMERFUNCTION.3
index 656002c54,000000000..1e2d64862
mode 100644,000000..100644
--- a/docs/libcurl/opts/GNURLMOPT_TIMERFUNCTION.3
+++ b/docs/libcurl/opts/GNURLMOPT_TIMERFUNCTION.3
@@@ -1,102 -1,0 +1,107 @@@
 +.\" **************************************************************************
 +.\" *                                  _   _ ____  _
 +.\" *  Project                     ___| | | |  _ \| |
 +.\" *                             / __| | | | |_) | |
 +.\" *                            | (__| |_| |  _ <| |___
 +.\" *                             \___|\___/|_| \_\_____|
 +.\" *
 +.\" * Copyright (C) 1998 - 2019, Daniel Stenberg, <address@hidden>, et al.
 +.\" *
 +.\" * This software is licensed as described in the file COPYING, which
 +.\" * you should have received as part of this distribution. The terms
 +.\" * are also available at https://curl.haxx.se/docs/copyright.html.
 +.\" *
 +.\" * You may opt to use, copy, modify, merge, publish, distribute and/or sell
 +.\" * copies of the Software, and permit persons to whom the Software is
 +.\" * furnished to do so, under the terms of the COPYING file.
 +.\" *
 +.\" * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF 
ANY
 +.\" * KIND, either express or implied.
 +.\" *
 +.\" **************************************************************************
 +.\"
 +.TH GNURLMOPT_TIMERFUNCTION 3 "17 Jun 2014" "libcurl 7.37.0" 
"curl_multi_setopt options"
 +.SH NAME
 +CURLMOPT_TIMERFUNCTION \- set callback to receive timeout values
 +.SH SYNOPSIS
 +.nf
 +#include <gnurl/curl.h>
 +
 +int timer_callback(CURLM *multi,    /* multi handle */
 +                   long timeout_ms, /* timeout in number of ms */
 +                   void *userp);    /* private callback pointer */
 +
 +CURLMcode curl_multi_setopt(CURLM *handle, CURLMOPT_TIMERFUNCTION, 
timer_callback);
 +.SH DESCRIPTION
 +Pass a pointer to your callback function, which should match the prototype
 +shown above.
 +
 +Certain features, such as timeouts and retries, require you to call libcurl
 +even when there is no activity on the file descriptors.
 +
 +Your callback function \fBtimer_callback\fP should install a non-repeating
 +timer with an interval of \fBtimeout_ms\fP. When time that timer fires, call
 +either \fIcurl_multi_socket_action(3)\fP or \fIcurl_multi_perform(3)\fP,
 +depending on which interface you use.
 +
 +A \fBtimeout_ms\fP value of -1 passed to this callback means you should delete
 +the timer. All other values are valid expire times in number of milliseconds.
 +
 +The \fBtimer_callback\fP will only be called when the timeout expire time is
 +changed.
 +
 +The \fBuserp\fP pointer is set with \fICURLMOPT_TIMERDATA(3)\fP.
 +
 +The timer callback should return 0 on success, and -1 on error. This callback
 +can be used instead of, or in addition to, \fIcurl_multi_timeout(3)\fP.
++
++\fBWARNING:\fP even if it feels tempting, avoid calling libcurl directly from
++within the callback itself when the \fBtimeout_ms\fP value is zero, since it
++risks triggering an unpleasant recursive behavior that immediately calls
++another call to the callback with a zero timeout...
 +.SH DEFAULT
 +NULL
 +.SH PROTOCOLS
 +All
 +.SH EXAMPLE
 +.nf
 +static gboolean timeout_cb(gpointer user_data)
 +{
 +  int running;
 +  if(user_data) {
 +    g_free(user_data);
 +    curl_multi_setopt(curl_handle, CURLMOPT_TIMERDATA, NULL);
 +  }
 +  curl_multi_socket_action(multi, CURL_SOCKET_TIMEOUT, 0, &running);
 +  return G_SOURCE_REMOVE;
 +}
 +
 +static int timerfunc(CURLM *multi, long timeout_ms, void *userp)
 +{
 +  guint *id = userp;
 +
 +  if(id)
 +    g_source_remove(*id);
 +
 +  /* -1 means we should just delete our timer. */
 +  if(timeout_ms == -1) {
 +    g_free(id);
 +    id = NULL;
 +  }
 +  else {
 +    if(!id)
 +      id = g_new(guint, 1);
 +    *id = g_timeout_add(timeout_ms, timeout_cb, id);
 +  }
 +  curl_multi_setopt(multi, CURLMOPT_TIMERDATA, id);
 +  return 0;
 +}
 +
 +curl_multi_setopt(multi, CURLMOPT_TIMERFUNCTION, timerfunc);
 +.fi
 +.SH AVAILABILITY
 +Added in 7.16.0
 +.SH RETURN VALUE
 +Returns CURLM_OK if the option is supported, and CURLM_UNKNOWN_OPTION if not.
 +.SH "SEE ALSO"
 +.BR CURLMOPT_TIMERDATA "(3), " CURLMOPT_SOCKETFUNCTION "(3), "
diff --cc docs/libcurl/opts/GNURLOPT_ADDRESS_SCOPE.3
index a8fc64c99,000000000..75467fe20
mode 100644,000000..100644
--- a/docs/libcurl/opts/GNURLOPT_ADDRESS_SCOPE.3
+++ b/docs/libcurl/opts/GNURLOPT_ADDRESS_SCOPE.3
@@@ -1,57 -1,0 +1,55 @@@
 +.\" **************************************************************************
 +.\" *                                  _   _ ____  _
 +.\" *  Project                     ___| | | |  _ \| |
 +.\" *                             / __| | | | |_) | |
 +.\" *                            | (__| |_| |  _ <| |___
 +.\" *                             \___|\___/|_| \_\_____|
 +.\" *
- .\" * Copyright (C) 1998 - 2014, 2017, Daniel Stenberg, <address@hidden>, et 
al.
++.\" * Copyright (C) 1998 - 2019, Daniel Stenberg, <address@hidden>, et al.
 +.\" *
 +.\" * This software is licensed as described in the file COPYING, which
 +.\" * you should have received as part of this distribution. The terms
 +.\" * are also available at https://curl.haxx.se/docs/copyright.html.
 +.\" *
 +.\" * You may opt to use, copy, modify, merge, publish, distribute and/or sell
 +.\" * copies of the Software, and permit persons to whom the Software is
 +.\" * furnished to do so, under the terms of the COPYING file.
 +.\" *
 +.\" * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF 
ANY
 +.\" * KIND, either express or implied.
 +.\" *
 +.\" **************************************************************************
 +.\"
 +.TH GNURLOPT_ADDRESS_SCOPE 3 "19 Jun 2014" "libcurl 7.37.0" "curl_easy_setopt 
options"
 +.SH NAME
- CURLOPT_ADDRESS_SCOPE \- set scope for local IPv6 addresses
++CURLOPT_ADDRESS_SCOPE \- set scope id for IPv6 addresses
 +.SH SYNOPSIS
 +#include <gnurl/curl.h>
 +
 +CURLcode curl_easy_setopt(CURL *handle, CURLOPT_ADDRESS_SCOPE, long scope);
 +.SH DESCRIPTION
- Pass a long specifying the scope_id value to use when connecting to IPv6
- link-local or site-local addresses.
++Pass a long specifying the scope id value to use when connecting to IPv6 
addresses.
 +.SH DEFAULT
 +0
 +.SH PROTOCOLS
 +All, when using IPv6
 +.SH EXAMPLE
 +.nf
 +CURL *curl = curl_easy_init();
 +if(curl) {
 +  CURLcode ret;
++  long my_scope_id;
 +  curl_easy_setopt(curl, CURLOPT_URL, "https://example.com/";);
-   /* 0x2 link-local
-      0x5 site-local
-      0x8 organization-local
-      0xe global ... */
-   curl_easy_setopt(curl, CURLOPT_ADDRESS_SCOPE, 0xEL);
++  my_scope_id = if_nametoindex("eth0");
++  curl_easy_setopt(curl, CURLOPT_ADDRESS_SCOPE, my_scope_id);
 +  ret = curl_easy_perform(curl);
 +  curl_easy_cleanup(curl);
 +}
 +.fi
 +.SH AVAILABILITY
 +Added in 7.19.0
 +.SH RETURN VALUE
 +Returns CURLE_OK if the option is supported, and CURLE_UNKNOWN_OPTION if not.
++Returns CURLE_BAD_FUNCTION_ARGUMENT if set to a negative value.
 +.SH "SEE ALSO"
 +.BR CURLOPT_STDERR "(3), " CURLOPT_DEBUGFUNCTION "(3), "
diff --cc docs/libcurl/opts/GNURLOPT_ALTSVC.3
index ff08774cd,000000000..156f4e979
mode 100644,000000..100644
--- a/docs/libcurl/opts/GNURLOPT_ALTSVC.3
+++ b/docs/libcurl/opts/GNURLOPT_ALTSVC.3
@@@ -1,61 -1,0 +1,61 @@@
 +.\" **************************************************************************
 +.\" *                                  _   _ ____  _
 +.\" *  Project                     ___| | | |  _ \| |
 +.\" *                             / __| | | | |_) | |
 +.\" *                            | (__| |_| |  _ <| |___
 +.\" *                             \___|\___/|_| \_\_____|
 +.\" *
 +.\" * Copyright (C) 1998 - 2019, Daniel Stenberg, <address@hidden>, et al.
 +.\" *
 +.\" * This software is licensed as described in the file COPYING, which
 +.\" * you should have received as part of this distribution. The terms
 +.\" * are also available at https://curl.haxx.se/docs/copyright.html.
 +.\" *
 +.\" * You may opt to use, copy, modify, merge, publish, distribute and/or sell
 +.\" * copies of the Software, and permit persons to whom the Software is
 +.\" * furnished to do so, under the terms of the COPYING file.
 +.\" *
 +.\" * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF 
ANY
 +.\" * KIND, either express or implied.
 +.\" *
 +.\" **************************************************************************
 +.\"
 +.TH GNURLOPT_ALTSVC 3 "5 Feb 2019" "libcurl 7.64.1" "curl_easy_setopt options"
 +.SH NAME
 +CURLOPT_ALTSVC \- set alt-svc cache file name
 +.SH SYNOPSIS
 +.nf
 +#include <gnurl/curl.h>
 +
 +CURLcode curl_easy_setopt(CURL *handle, CURLOPT_ALTSVC, char *filename);
 +.fi
 +.SH EXPERIMENTAL
 +Warning: this feature is early code and is marked as experimental. It can only
- be enabled by explictly telling configure with \fB--enable-alt-svc\fP. You are
++be enabled by explicitly telling configure with \fB--enable-alt-svc\fP. You 
are
 +advised to not ship this in production before the experimental label is
 +removed.
 +.SH DESCRIPTION
 +Pass in a pointer to a \fIfilename\fP to instruct libcurl to use that file as
 +the Alt-Svc cache to read existing cache contents from and possibly also write
 +it back to a after a transfer, unless \fBCURLALTSVC_READONLYFILE\fP is set in
 +\fICURLOPT_ALTSVC_CTRL(3)\fP.
 +.SH DEFAULT
 +NULL. The alt-svc cache is not read nor written to file.
 +.SH PROTOCOLS
 +HTTPS
 +.SH EXAMPLE
 +.nf
 +CURL *curl = curl_easy_init();
 +if(curl) {
 +  curl_easy_setopt(curl, CURLOPT_ALTSVC_CTRL, CURLALTSVC_H1);
 +  curl_easy_setopt(curl, CURLOPT_ALTSVC, "altsvc-cache.txt");
 +  curl_easy_perform(curl);
 +}
 +.fi
 +.SH AVAILABILITY
 +Added in 7.64.1
 +.SH RETURN VALUE
 +Returns CURLE_OK if the option is supported, and CURLE_UNKNOWN_OPTION if not.
 +.SH "SEE ALSO"
 +.BR CURLOPT_ALTSVC_CTRL "(3), " CURLOPT_CONNECT_TO "(3), " CURLOPT_RESOLVE 
"(3), "
 +.BR CURLOPT_COOKIEFILE "(3), "
diff --cc docs/libcurl/opts/GNURLOPT_ALTSVC_CTRL.3
index 276e02c83,000000000..aed1253dd
mode 100644,000000..100644
--- a/docs/libcurl/opts/GNURLOPT_ALTSVC_CTRL.3
+++ b/docs/libcurl/opts/GNURLOPT_ALTSVC_CTRL.3
@@@ -1,92 -1,0 +1,92 @@@
 +.\" **************************************************************************
 +.\" *                                  _   _ ____  _
 +.\" *  Project                     ___| | | |  _ \| |
 +.\" *                             / __| | | | |_) | |
 +.\" *                            | (__| |_| |  _ <| |___
 +.\" *                             \___|\___/|_| \_\_____|
 +.\" *
 +.\" * Copyright (C) 1998 - 2019, Daniel Stenberg, <address@hidden>, et al.
 +.\" *
 +.\" * This software is licensed as described in the file COPYING, which
 +.\" * you should have received as part of this distribution. The terms
 +.\" * are also available at https://curl.haxx.se/docs/copyright.html.
 +.\" *
 +.\" * You may opt to use, copy, modify, merge, publish, distribute and/or sell
 +.\" * copies of the Software, and permit persons to whom the Software is
 +.\" * furnished to do so, under the terms of the COPYING file.
 +.\" *
 +.\" * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF 
ANY
 +.\" * KIND, either express or implied.
 +.\" *
 +.\" **************************************************************************
 +.\"
 +.TH GNURLOPT_ALTSVC_CTRL 3 "5 Feb 2019" "libcurl 7.64.1" "curl_easy_setopt 
options"
 +.SH NAME
 +CURLOPT_ALTSVC_CTRL \- control alt-svc behavior
 +.SH SYNOPSIS
 +.nf
 +#include <gnurl/curl.h>
 +
 +#define CURLALTSVC_IMMEDIATELY  (1<<0)
 +#define CURLALTSVC_ALTUSED      (1<<1)
 +#define CURLALTSVC_READONLYFILE (1<<2)
 +#define CURLALTSVC_H1           (1<<3)
 +#define CURLALTSVC_H2           (1<<4)
 +#define CURLALTSVC_H3           (1<<5)
 +
 +CURLcode curl_easy_setopt(CURL *handle, CURLOPT_ALTSVC_CTRL, long bitmask);
 +.fi
 +.SH EXPERIMENTAL
 +Warning: this feature is early code and is marked as experimental. It can only
- be enabled by explictly telling configure with \fB--enable-alt-svc\fP. You are
++be enabled by explicitly telling configure with \fB--enable-alt-svc\fP. You 
are
 +advised to not ship this in production before the experimental label is
 +removed.
 +.SH DESCRIPTION
 +Populate the long \fIbitmask\fP with the correct set of features to instruct
 +libcurl how to handle Alt-Svc for the transfers using this handle.
 +
 +libcurl will only accept Alt-Svc headers over a secure transport, meaning
 +HTTPS. It will also only complete a request to an alternative origin if that
 +origin is properly hosted over HTTPS. These requirements are there to make
 +sure both the source and the destination are legitimate.
 +
 +Setting any bit will enable the alt-svc engine.
 +.IP "CURLALTSVC_IMMEDIATELY"
 +If an Alt-Svc: header is received, this instructs libcurl to switch to one of
 +those alternatives asap rather than to save it and use for the next request.
 +.IP "CURLALTSVC_ALTUSED"
 +Issue the Alt-Used: header in all requests that have been redirected by
 +alt-svc.
 +.IP "CURLALTSVC_READONLYFILE"
 +Do not write the alt-svc cache back to the file specified with
 +\fICURLOPT_ALTSVC(3)\fP even if it gets updated. By default a file specified
 +with that option will be read and written to as deemed necessary.
 +.IP "CURLALTSVC_H1"
 +Accept alternative services offered over HTTP/1.1.
 +.IP "CURLALTSVC_H2"
 +Accept alternative services offered over HTTP/2. This will only be used if
 +libcurl was also built to actually support HTTP/2, otherwise this bit will be
 +ignored.
 +.IP "CURLALTSVC_H3"
 +Accept alternative services offered over HTTP/3. This will only be used if
 +libcurl was also built to actually support HTTP/3, otherwise this bit will be
 +ignored.
 +.SH DEFAULT
 +0. No Alt-Svc treatment.
 +.SH PROTOCOLS
 +HTTPS
 +.SH EXAMPLE
 +.nf
 +CURL *curl = curl_easy_init();
 +if(curl) {
 +  curl_easy_setopt(curl, CURLOPT_ALTSVC_CTRL, CURLALTSVC_H1);
 +  curl_easy_setopt(curl, CURLOPT_ALTSVC, "altsvc-cache.txt");
 +  curl_easy_perform(curl);
 +}
 +.fi
 +.SH AVAILABILITY
 +Added in 7.64.1
 +.SH RETURN VALUE
 +Returns CURLE_OK if the option is supported, and CURLE_UNKNOWN_OPTION if not.
 +.SH "SEE ALSO"
 +.BR CURLOPT_ALTSVC "(3), " CURLOPT_CONNECT_TO "(3), " CURLOPT_RESOLVE "(3), "
diff --cc docs/libcurl/opts/GNURLOPT_CAINFO.3
index beace13d2,000000000..175660ef6
mode 100644,000000..100644
--- a/docs/libcurl/opts/GNURLOPT_CAINFO.3
+++ b/docs/libcurl/opts/GNURLOPT_CAINFO.3
@@@ -1,84 -1,0 +1,85 @@@
 +.\" **************************************************************************
 +.\" *                                  _   _ ____  _
 +.\" *  Project                     ___| | | |  _ \| |
 +.\" *                             / __| | | | |_) | |
 +.\" *                            | (__| |_| |  _ <| |___
 +.\" *                             \___|\___/|_| \_\_____|
 +.\" *
 +.\" * Copyright (C) 1998 - 2019, Daniel Stenberg, <address@hidden>, et al.
 +.\" *
 +.\" * This software is licensed as described in the file COPYING, which
 +.\" * you should have received as part of this distribution. The terms
 +.\" * are also available at https://curl.haxx.se/docs/copyright.html.
 +.\" *
 +.\" * You may opt to use, copy, modify, merge, publish, distribute and/or sell
 +.\" * copies of the Software, and permit persons to whom the Software is
 +.\" * furnished to do so, under the terms of the COPYING file.
 +.\" *
 +.\" * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF 
ANY
 +.\" * KIND, either express or implied.
 +.\" *
 +.\" **************************************************************************
 +.\"
 +.TH GNURLOPT_CAINFO 3 "17 Jun 2014" "libcurl 7.37.0" "curl_easy_setopt 
options"
 +.SH NAME
 +CURLOPT_CAINFO \- path to Certificate Authority (CA) bundle
 +.SH SYNOPSIS
 +#include <gnurl/curl.h>
 +
 +CURLcode curl_easy_setopt(CURL *handle, CURLOPT_CAINFO, char *path);
 +.SH DESCRIPTION
 +Pass a char * to a zero terminated string naming a file holding one or more
 +certificates to verify the peer with.
 +
 +If \fICURLOPT_SSL_VERIFYPEER(3)\fP is zero and you avoid verifying the
 +server's certificate, \fICURLOPT_CAINFO(3)\fP need not even indicate an
 +accessible file.
 +
 +This option is by default set to the system path where libcurl's cacert bundle
 +is assumed to be stored, as established at build time.
 +
 +If curl is built against the NSS SSL library, the NSS PEM PKCS#11 module
 +(libnsspem.so) needs to be available for this option to work properly.
 +Starting with curl-7.55.0, if both \fICURLOPT_CAINFO(3)\fP and
 +\fICURLOPT_CAPATH(3)\fP are unset, NSS-linked libcurl tries to load
 +libnssckbi.so, which contains a more comprehensive set of trust information
 +than supported by nss-pem, because libnssckbi.so also includes information
 +about distrusted certificates.
 +
- (iOS and macOS only) If curl is built against Secure Transport, then this
++(iOS and macOS) If curl is built against Secure Transport, then this
 +option is supported for backward compatibility with other SSL engines, but it
 +should not be set. If the option is not set, then curl will use the
 +certificates in the system and user Keychain to verify the peer, which is the
 +preferred method of verifying the peer's certificate chain.
 +
- (Schannel only) This option is supported for Schannel in Windows 7 or later
- with libcurl 7.60 or later. This option is supported for backward
- compatibility with other SSL engines; instead it is recommended to use
- Windows' store of root certificates (the default for Schannel).
++(Schannel) This option is supported for Schannel in Windows 7 or later but we
++recommend not using it until Windows 8 since it works better starting then.
++Added in libcurl 7.60. This option is supported for backward compatibility
++with other SSL engines; instead it is recommended to use Windows' store of
++root certificates (the default for Schannel).
 +
 +The application does not have to keep the string around after setting this
 +option.
 +.SH DEFAULT
 +Built-in system specific
 +.SH PROTOCOLS
 +All TLS based protocols: HTTPS, FTPS, IMAPS, POP3S, SMTPS etc.
 +.SH EXAMPLE
 +.nf
 +CURL *curl = curl_easy_init();
 +if(curl) {
 +  curl_easy_setopt(curl, CURLOPT_URL, "https://example.com/";);
 +  curl_easy_setopt(curl, CURLOPT_CAINFO, "/etc/certs/cabundle.pem");
 +  ret = curl_easy_perform(curl);
 +  curl_easy_cleanup(curl);
 +}
 +.fi
 +.SH AVAILABILITY
 +For SSL engines that don't support certificate files the CURLOPT_CAINFO option
 +is ignored. Refer to https://curl.haxx.se/docs/ssl-compared.html
 +.SH RETURN VALUE
 +Returns CURLE_OK if the option is supported, CURLE_UNKNOWN_OPTION if not, or
 +CURLE_OUT_OF_MEMORY if there was insufficient heap space.
 +.SH "SEE ALSO"
 +.BR CURLOPT_CAPATH "(3), "
 +.BR CURLOPT_SSL_VERIFYPEER "(3), " CURLOPT_SSL_VERIFYHOST "(3), "
diff --cc docs/libcurl/opts/GNURLOPT_CHUNK_BGN_FUNCTION.3
index 8e7eb5204,000000000..a4ca84936
mode 100644,000000..100644
--- a/docs/libcurl/opts/GNURLOPT_CHUNK_BGN_FUNCTION.3
+++ b/docs/libcurl/opts/GNURLOPT_CHUNK_BGN_FUNCTION.3
@@@ -1,114 -1,0 +1,141 @@@
 +.\" **************************************************************************
 +.\" *                                  _   _ ____  _
 +.\" *  Project                     ___| | | |  _ \| |
 +.\" *                             / __| | | | |_) | |
 +.\" *                            | (__| |_| |  _ <| |___
 +.\" *                             \___|\___/|_| \_\_____|
 +.\" *
- .\" * Copyright (C) 1998 - 2017, Daniel Stenberg, <address@hidden>, et al.
++.\" * Copyright (C) 1998 - 2019, Daniel Stenberg, <address@hidden>, et al.
 +.\" *
 +.\" * This software is licensed as described in the file COPYING, which
 +.\" * you should have received as part of this distribution. The terms
 +.\" * are also available at https://curl.haxx.se/docs/copyright.html.
 +.\" *
 +.\" * You may opt to use, copy, modify, merge, publish, distribute and/or sell
 +.\" * copies of the Software, and permit persons to whom the Software is
 +.\" * furnished to do so, under the terms of the COPYING file.
 +.\" *
 +.\" * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF 
ANY
 +.\" * KIND, either express or implied.
 +.\" *
 +.\" **************************************************************************
 +.\"
 +.TH GNURLOPT_CHUNK_BGN_FUNCTION 3 "19 Jun 2014" "libcurl 7.37.0" 
"curl_easy_setopt options"
 +.SH NAME
 +CURLOPT_CHUNK_BGN_FUNCTION \- callback before a transfer with FTP 
wildcardmatch
 +.SH SYNOPSIS
 +.nf
 +#include <gnurl/curl.h>
 +
++struct curl_fileinfo {
++  char *filename;
++  curlfiletype filetype;
++  time_t time;   /* always zero! */
++  unsigned int perm;
++  int uid;
++  int gid;
++  curl_off_t size;
++  long int hardlinks;
++
++  struct {
++    /* If some of these fields is not NULL, it is a pointer to b_data. */
++    char *time;
++    char *perm;
++    char *user;
++    char *group;
++    char *target; /* pointer to the target filename of a symlink */
++  } strings;
++
++  unsigned int flags;
++
++  /* used internally */
++  char *b_data;
++  size_t b_size;
++  size_t b_used;
++};
++
 +long chunk_bgn_callback(const void *transfer_info, void *ptr,
 +                        int remains);
 +
 +CURLcode curl_easy_setopt(CURL *handle, CURLOPT_CHUNK_BGN_FUNCTION,
 +                          chunk_bgn_callback);
 +.SH DESCRIPTION
 +Pass a pointer to your callback function, which should match the prototype
 +shown above.
 +
 +This callback function gets called by libcurl before a part of the stream is
 +going to be transferred (if the transfer supports chunks).
 +
 +The \fItransfer_info\fP pointer will point to a struct curl_fileinfo with
 +details about the file that is about to get transferred.
 +
 +This callback makes sense only when using the \fICURLOPT_WILDCARDMATCH(3)\fP
 +option for now.
 +
 +The target of transfer_info parameter is a "feature depended" structure. For
 +the FTP wildcard download, the target is curl_fileinfo structure (see
 +\fIgnurl/curl.h\fP).  The parameter \fIptr\fP is a pointer given by
 +\fICURLOPT_CHUNK_DATA(3)\fP. The parameter remains contains number of chunks
 +remaining per the transfer. If the feature is not available, the parameter has
 +zero value.
 +
 +Return \fICURL_CHUNK_BGN_FUNC_OK\fP if everything is fine,
 +\fICURL_CHUNK_BGN_FUNC_SKIP\fP if you want to skip the concrete chunk or
 +\fICURL_CHUNK_BGN_FUNC_FAIL\fP to tell libcurl to stop if some error occurred.
 +.SH DEFAULT
 +NULL
 +.SH PROTOCOLS
 +FTP
 +.SH EXAMPLE
 +.nf
 +static long file_is_coming(struct curl_fileinfo *finfo,
 +                           struct callback_data *data,
 +                           int remains)
 +{
 +  printf("%3d %40s %10luB ", remains, finfo->filename,
 +         (unsigned long)finfo->size);
 +
 +  switch(finfo->filetype) {
 +  case CURLFILETYPE_DIRECTORY:
 +    printf(" DIR\\n");
 +    break;
 +  case CURLFILETYPE_FILE:
 +    printf("FILE ");
 +    break;
 +  default:
 +    printf("OTHER\\n");
 +    break;
 +  }
 +
 +  if(finfo->filetype == CURLFILETYPE_FILE) {
 +    /* do not transfer files >= 50B */
 +    if(finfo->size > 50) {
 +      printf("SKIPPED\\n");
 +      return CURL_CHUNK_BGN_FUNC_SKIP;
 +    }
 +
 +    data->output = fopen(finfo->filename, "wb");
 +    if(!data->output) {
 +      return CURL_CHUNK_BGN_FUNC_FAIL;
 +    }
 +  }
 +
 +  return CURL_CHUNK_BGN_FUNC_OK;
 +}
 +
 +int main()
 +{
 +  /* data for callback */
 +  struct callback_data callback_info;
 +
 +  /* callback is called before download of concrete file started */
 +  curl_easy_setopt(curl, CURLOPT_CHUNK_BGN_FUNCTION, file_is_coming);
 +  curl_easy_setopt(curl, CURLOPT_CHUNK_DATA, &callback_info);
 +}
 +.fi
 +.SH AVAILABILITY
 +This was added in 7.21.0
 +.SH RETURN VALUE
 +Returns CURLE_OK if the option is supported, and CURLE_UNKNOWN_OPTION if not.
 +.SH "SEE ALSO"
 +.BR CURLOPT_CHUNK_END_FUNCTION "(3), " CURLOPT_WILDCARDMATCH "(3), "
diff --cc docs/libcurl/opts/GNURLOPT_DNS_USE_GLOBAL_CACHE.3
index 989e41c9c,000000000..6b81d42cd
mode 100644,000000..100644
--- a/docs/libcurl/opts/GNURLOPT_DNS_USE_GLOBAL_CACHE.3
+++ b/docs/libcurl/opts/GNURLOPT_DNS_USE_GLOBAL_CACHE.3
@@@ -1,60 -1,0 +1,62 @@@
 +.\" **************************************************************************
 +.\" *                                  _   _ ____  _
 +.\" *  Project                     ___| | | |  _ \| |
 +.\" *                             / __| | | | |_) | |
 +.\" *                            | (__| |_| |  _ <| |___
 +.\" *                             \___|\___/|_| \_\_____|
 +.\" *
- .\" * Copyright (C) 1998 - 2017, Daniel Stenberg, <address@hidden>, et al.
++.\" * Copyright (C) 1998 - 2019, Daniel Stenberg, <address@hidden>, et al.
 +.\" *
 +.\" * This software is licensed as described in the file COPYING, which
 +.\" * you should have received as part of this distribution. The terms
 +.\" * are also available at https://curl.haxx.se/docs/copyright.html.
 +.\" *
 +.\" * You may opt to use, copy, modify, merge, publish, distribute and/or sell
 +.\" * copies of the Software, and permit persons to whom the Software is
 +.\" * furnished to do so, under the terms of the COPYING file.
 +.\" *
 +.\" * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF 
ANY
 +.\" * KIND, either express or implied.
 +.\" *
 +.\" **************************************************************************
 +.\"
 +.TH GNURLOPT_DNS_USE_GLOBAL_CACHE 3 "17 Jun 2014" "libcurl 7.37.0" 
"curl_easy_setopt options"
 +.SH NAME
 +CURLOPT_DNS_USE_GLOBAL_CACHE \- enable/disable global DNS cache
 +.SH SYNOPSIS
 +#include <gnurl/curl.h>
 +
 +CURLcode curl_easy_setopt(CURL *handle, CURLOPT_DNS_USE_GLOBAL_CACHE,
 +                          long enable);
 +.SH DESCRIPTION
++Has no function since 7.62.0. Do note use!
++
 +Pass a long. If the \fIenable\fP value is 1, it tells curl to use a global DNS
 +cache that will survive between easy handle creations and deletions. This is
 +not thread-safe and this will use a global variable.
 +
 +\fBWARNING:\fP this option is considered obsolete. Stop using it. Switch over
 +to using the share interface instead! See \fICURLOPT_SHARE(3)\fP and
 +\fIcurl_share_init(3)\fP.
 +.SH DEFAULT
 +0
 +.SH PROTOCOLS
 +All
 +.SH EXAMPLE
 +.nf
 +CURL *curl = curl_easy_init();
 +if(curl) {
 +  CURLcode ret;
 +  curl_easy_setopt(curl, CURLOPT_URL, "https://example.com/";);
 +  /* switch off the use of a global, thread unsafe, cache */
 +  curl_easy_setopt(curl, CURLOPT_DNS_USE_GLOBAL_CACHE, 0L);
 +  ret = curl_easy_perform(curl);
 +  curl_easy_cleanup(curl);
 +}
 +.fi
 +.SH AVAILABILITY
- Subject for removal in the future. Do not use!
++Deprecated since 7.62.0. Has no function.
 +.SH RETURN VALUE
 +Returns CURLE_OK if the option is supported, and CURLE_UNKNOWN_OPTION if not.
 +.SH "SEE ALSO"
 +.BR CURLOPT_SHARE "(3), " CURLOPT_DNS_CACHE_TIMEOUT "(3), "
diff --cc docs/libcurl/opts/GNURLOPT_MAXAGE_CONN.3
index 000000000,f91bf7a8d..f91bf7a8d
mode 000000,100644..100644
--- a/docs/libcurl/opts/GNURLOPT_MAXAGE_CONN.3
+++ b/docs/libcurl/opts/GNURLOPT_MAXAGE_CONN.3
diff --cc docs/libcurl/opts/GNURLOPT_READFUNCTION.3
index 16a669687,000000000..412a9cd70
mode 100644,000000..100644
--- a/docs/libcurl/opts/GNURLOPT_READFUNCTION.3
+++ b/docs/libcurl/opts/GNURLOPT_READFUNCTION.3
@@@ -1,81 -1,0 +1,82 @@@
 +.\" **************************************************************************
 +.\" *                                  _   _ ____  _
 +.\" *  Project                     ___| | | |  _ \| |
 +.\" *                             / __| | | | |_) | |
 +.\" *                            | (__| |_| |  _ <| |___
 +.\" *                             \___|\___/|_| \_\_____|
 +.\" *
- .\" * Copyright (C) 1998 - 2017, Daniel Stenberg, <address@hidden>, et al.
++.\" * Copyright (C) 1998 - 2019, Daniel Stenberg, <address@hidden>, et al.
 +.\" *
 +.\" * This software is licensed as described in the file COPYING, which
 +.\" * you should have received as part of this distribution. The terms
 +.\" * are also available at https://curl.haxx.se/docs/copyright.html.
 +.\" *
 +.\" * You may opt to use, copy, modify, merge, publish, distribute and/or sell
 +.\" * copies of the Software, and permit persons to whom the Software is
 +.\" * furnished to do so, under the terms of the COPYING file.
 +.\" *
 +.\" * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF 
ANY
 +.\" * KIND, either express or implied.
 +.\" *
 +.\" **************************************************************************
 +.\"
 +.TH GNURLOPT_READFUNCTION 3 "16 Jun 2014" "libcurl 7.37.0" "curl_easy_setopt 
options"
 +.SH NAME
 +CURLOPT_READFUNCTION \- read callback for data uploads
 +.SH SYNOPSIS
 +#include <gnurl/curl.h>
 +
 +size_t read_callback(char *buffer, size_t size, size_t nitems, void 
*userdata);
 +
 +CURLcode curl_easy_setopt(CURL *handle, CURLOPT_READFUNCTION, read_callback);
 +
 +.SH DESCRIPTION
 +Pass a pointer to your callback function, as the prototype shows above.
 +
 +This callback function gets called by libcurl as soon as it needs to read data
 +in order to send it to the peer - like if you ask it to upload or post data to
 +the server. The data area pointed at by the pointer \fIbuffer\fP should be
 +filled up with at most \fIsize\fP multiplied with \fInitems\fP number of bytes
 +by your function.
 +
 +Set the \fIuserdata\fP argument with the \fICURLOPT_READDATA(3)\fP option.
 +
 +Your function must return the actual number of bytes that it stored in the 
data
 +area pointed at by the pointer \fIbuffer\fP. Returning 0 will signal
 +end-of-file to the library and cause it to stop the current transfer.
 +
 +If you stop the current transfer by returning 0 "pre-maturely" (i.e before the
 +server expected it, like when you've said you will upload N bytes and you
 +upload less than N bytes), you may experience that the server "hangs" waiting
 +for the rest of the data that won't come.
 +
 +The read callback may return \fICURL_READFUNC_ABORT\fP to stop the current
 +operation immediately, resulting in a \fICURLE_ABORTED_BY_CALLBACK\fP error
 +code from the transfer.
 +
 +The callback can return \fICURL_READFUNC_PAUSE\fP to cause reading from this
 +connection to pause. See \fIcurl_easy_pause(3)\fP for further details.
 +
 +\fBBugs\fP: when doing TFTP uploads, you must return the exact amount of data
 +that the callback wants, or it will be considered the final packet by the
 +server end and the transfer will end there.
 +
 +If you set this callback pointer to NULL, or don't set it at all, the default
 +internal read function will be used. It is doing an fread() on the FILE *
 +userdata set with \fICURLOPT_READDATA(3)\fP.
 +.SH DEFAULT
 +The default internal read callback is fread().
 +.SH PROTOCOLS
 +This is used for all protocols when doing uploads.
 +.SH EXAMPLE
 +Here's an example setting a read callback for reading that to upload to an FTP
 +site: https://curl.haxx.se/libcurl/c/ftpupload.html
 +.SH AVAILABILITY
 +CURL_READFUNC_PAUSE return code was added in 7.18.0 and CURL_READFUNC_ABORT
 +was added in 7.12.1.
 +.SH RETURN VALUE
 +This will return CURLE_OK.
 +.SH "SEE ALSO"
 +.BR CURLOPT_READDATA "(3), " CURLOPT_WRITEFUNCTION "(3), "
 +.BR CURLOPT_SEEKFUNCTION "(3), " CURLOPT_UPLOAD "(3), " CURLOPT_POST "(3), "
++.BR CURLOPT_UPLOAD_BUFFERSIZE "(3), "
diff --cc docs/libcurl/opts/Makefile.inc
index c6c2abdc4,c8e15a5ed..a0b8bd95e
--- a/docs/libcurl/opts/Makefile.inc
+++ b/docs/libcurl/opts/Makefile.inc
@@@ -1,349 -1,350 +1,350 @@@
  # Shared between Makefile.am and CMakeLists.txt
  
  man_MANS =                                      \
 -  CURLINFO_ACTIVESOCKET.3                       \
 -  CURLINFO_APPCONNECT_TIME.3                    \
 -  CURLINFO_APPCONNECT_TIME_T.3                  \
 -  CURLINFO_CERTINFO.3                           \
 -  CURLINFO_CONDITION_UNMET.3                    \
 -  CURLINFO_CONNECT_TIME.3                       \
 -  CURLINFO_CONNECT_TIME_T.3                     \
 -  CURLINFO_CONTENT_LENGTH_DOWNLOAD.3            \
 -  CURLINFO_CONTENT_LENGTH_DOWNLOAD_T.3          \
 -  CURLINFO_CONTENT_LENGTH_UPLOAD.3              \
 -  CURLINFO_CONTENT_LENGTH_UPLOAD_T.3            \
 -  CURLINFO_CONTENT_TYPE.3                       \
 -  CURLINFO_COOKIELIST.3                         \
 -  CURLINFO_EFFECTIVE_URL.3                      \
 -  CURLINFO_FILETIME.3                           \
 -  CURLINFO_FILETIME_T.3                         \
 -  CURLINFO_FTP_ENTRY_PATH.3                     \
 -  CURLINFO_HEADER_SIZE.3                        \
 -  CURLINFO_HTTPAUTH_AVAIL.3                     \
 -  CURLINFO_HTTP_CONNECTCODE.3                   \
 -  CURLINFO_HTTP_VERSION.3                       \
 -  CURLINFO_LASTSOCKET.3                         \
 -  CURLINFO_LOCAL_IP.3                           \
 -  CURLINFO_LOCAL_PORT.3                         \
 -  CURLINFO_NAMELOOKUP_TIME.3                    \
 -  CURLINFO_NAMELOOKUP_TIME_T.3                  \
 -  CURLINFO_NUM_CONNECTS.3                       \
 -  CURLINFO_OS_ERRNO.3                           \
 -  CURLINFO_PRETRANSFER_TIME.3                   \
 -  CURLINFO_PRETRANSFER_TIME_T.3                 \
 -  CURLINFO_PRIMARY_IP.3                         \
 -  CURLINFO_PRIMARY_PORT.3                       \
 -  CURLINFO_PRIVATE.3                            \
 -  CURLINFO_PROTOCOL.3                           \
 -  CURLINFO_PROXYAUTH_AVAIL.3                    \
 -  CURLINFO_PROXY_SSL_VERIFYRESULT.3             \
 -  CURLINFO_REDIRECT_COUNT.3                     \
 -  CURLINFO_REDIRECT_TIME.3                      \
 -  CURLINFO_REDIRECT_TIME_T.3                    \
 -  CURLINFO_REDIRECT_URL.3                       \
 -  CURLINFO_REQUEST_SIZE.3                       \
 -  CURLINFO_RESPONSE_CODE.3                      \
 -  CURLINFO_RTSP_CLIENT_CSEQ.3                   \
 -  CURLINFO_RTSP_CSEQ_RECV.3                     \
 -  CURLINFO_RTSP_SERVER_CSEQ.3                   \
 -  CURLINFO_RTSP_SESSION_ID.3                    \
 -  CURLINFO_SCHEME.3                             \
 -  CURLINFO_SIZE_DOWNLOAD.3                      \
 -  CURLINFO_SIZE_DOWNLOAD_T.3                    \
 -  CURLINFO_SIZE_UPLOAD.3                        \
 -  CURLINFO_SIZE_UPLOAD_T.3                      \
 -  CURLINFO_SPEED_DOWNLOAD.3                     \
 -  CURLINFO_SPEED_DOWNLOAD_T.3                   \
 -  CURLINFO_SPEED_UPLOAD.3                       \
 -  CURLINFO_SPEED_UPLOAD_T.3                     \
 -  CURLINFO_SSL_ENGINES.3                        \
 -  CURLINFO_SSL_VERIFYRESULT.3                   \
 -  CURLINFO_STARTTRANSFER_TIME.3                 \
 -  CURLINFO_STARTTRANSFER_TIME_T.3               \
 -  CURLINFO_TLS_SESSION.3                        \
 -  CURLINFO_TLS_SSL_PTR.3                        \
 -  CURLINFO_TOTAL_TIME.3                         \
 -  CURLINFO_TOTAL_TIME_T.3                       \
 -  CURLMOPT_CHUNK_LENGTH_PENALTY_SIZE.3          \
 -  CURLMOPT_CONTENT_LENGTH_PENALTY_SIZE.3        \
 -  CURLMOPT_MAXCONNECTS.3                        \
 -  CURLMOPT_MAX_HOST_CONNECTIONS.3               \
 -  CURLMOPT_MAX_PIPELINE_LENGTH.3                \
 -  CURLMOPT_MAX_TOTAL_CONNECTIONS.3              \
 -  CURLMOPT_PIPELINING.3                         \
 -  CURLMOPT_PIPELINING_SERVER_BL.3               \
 -  CURLMOPT_PIPELINING_SITE_BL.3                 \
 -  CURLMOPT_PUSHDATA.3                           \
 -  CURLMOPT_PUSHFUNCTION.3                       \
 -  CURLMOPT_SOCKETDATA.3                         \
 -  CURLMOPT_SOCKETFUNCTION.3                     \
 -  CURLMOPT_TIMERDATA.3                          \
 -  CURLMOPT_TIMERFUNCTION.3                      \
 -  CURLOPT_ABSTRACT_UNIX_SOCKET.3                \
 -  CURLOPT_ACCEPTTIMEOUT_MS.3                    \
 -  CURLOPT_ACCEPT_ENCODING.3                     \
 -  CURLOPT_ADDRESS_SCOPE.3                       \
 -  CURLOPT_ALTSVC.3                              \
 -  CURLOPT_ALTSVC_CTRL.3                         \
 -  CURLOPT_APPEND.3                              \
 -  CURLOPT_AUTOREFERER.3                         \
 -  CURLOPT_BUFFERSIZE.3                          \
 -  CURLOPT_CAINFO.3                              \
 -  CURLOPT_CAPATH.3                              \
 -  CURLOPT_CERTINFO.3                            \
 -  CURLOPT_CHUNK_BGN_FUNCTION.3                  \
 -  CURLOPT_CHUNK_DATA.3                          \
 -  CURLOPT_CHUNK_END_FUNCTION.3                  \
 -  CURLOPT_CLOSESOCKETDATA.3                     \
 -  CURLOPT_CLOSESOCKETFUNCTION.3                 \
 -  CURLOPT_UPKEEP_INTERVAL_MS.3             \
 -  CURLOPT_CONNECTTIMEOUT.3                      \
 -  CURLOPT_CONNECTTIMEOUT_MS.3                   \
 -  CURLOPT_CONNECT_ONLY.3                        \
 -  CURLOPT_CONNECT_TO.3                          \
 -  CURLOPT_CONV_FROM_NETWORK_FUNCTION.3          \
 -  CURLOPT_CONV_FROM_UTF8_FUNCTION.3             \
 -  CURLOPT_CONV_TO_NETWORK_FUNCTION.3            \
 -  CURLOPT_COOKIE.3                              \
 -  CURLOPT_COOKIEFILE.3                          \
 -  CURLOPT_COOKIEJAR.3                           \
 -  CURLOPT_COOKIELIST.3                          \
 -  CURLOPT_COOKIESESSION.3                       \
 -  CURLOPT_COPYPOSTFIELDS.3                      \
 -  CURLOPT_CRLF.3                                \
 -  CURLOPT_CRLFILE.3                             \
 -  CURLOPT_CUSTOMREQUEST.3                       \
 -  CURLOPT_CURLU.3                               \
 -  CURLOPT_DEBUGDATA.3                           \
 -  CURLOPT_DEBUGFUNCTION.3                       \
 -  CURLOPT_DEFAULT_PROTOCOL.3                    \
 -  CURLOPT_DIRLISTONLY.3                         \
 -  CURLOPT_DISALLOW_USERNAME_IN_URL.3            \
 -  CURLOPT_DNS_CACHE_TIMEOUT.3                   \
 -  CURLOPT_DNS_INTERFACE.3                       \
 -  CURLOPT_DNS_LOCAL_IP4.3                       \
 -  CURLOPT_DNS_LOCAL_IP6.3                       \
 -  CURLOPT_DNS_SERVERS.3                         \
 -  CURLOPT_DNS_SHUFFLE_ADDRESSES.3               \
 -  CURLOPT_DNS_USE_GLOBAL_CACHE.3                \
 -  CURLOPT_DOH_URL.3                             \
 -  CURLOPT_EGDSOCKET.3                           \
 -  CURLOPT_ERRORBUFFER.3                         \
 -  CURLOPT_EXPECT_100_TIMEOUT_MS.3               \
 -  CURLOPT_FAILONERROR.3                         \
 -  CURLOPT_FILETIME.3                            \
 -  CURLOPT_FNMATCH_DATA.3                        \
 -  CURLOPT_FNMATCH_FUNCTION.3                    \
 -  CURLOPT_FOLLOWLOCATION.3                      \
 -  CURLOPT_FORBID_REUSE.3                        \
 -  CURLOPT_FRESH_CONNECT.3                       \
 -  CURLOPT_FTPPORT.3                             \
 -  CURLOPT_FTPSSLAUTH.3                          \
 -  CURLOPT_FTP_ACCOUNT.3                         \
 -  CURLOPT_FTP_ALTERNATIVE_TO_USER.3             \
 -  CURLOPT_FTP_CREATE_MISSING_DIRS.3             \
 -  CURLOPT_FTP_FILEMETHOD.3                      \
 -  CURLOPT_FTP_RESPONSE_TIMEOUT.3                \
 -  CURLOPT_FTP_SKIP_PASV_IP.3                    \
 -  CURLOPT_FTP_SSL_CCC.3                         \
 -  CURLOPT_FTP_USE_EPRT.3                        \
 -  CURLOPT_FTP_USE_EPSV.3                        \
 -  CURLOPT_FTP_USE_PRET.3                        \
 -  CURLOPT_GSSAPI_DELEGATION.3                   \
 -  CURLOPT_HAPPY_EYEBALLS_TIMEOUT_MS.3           \
 -  CURLOPT_HAPROXYPROTOCOL.3                     \
 -  CURLOPT_HEADER.3                              \
 -  CURLOPT_HEADERDATA.3                          \
 -  CURLOPT_HEADERFUNCTION.3                      \
 -  CURLOPT_HEADEROPT.3                           \
 -  CURLOPT_HTTP09_ALLOWED.3                      \
 -  CURLOPT_HTTP200ALIASES.3                      \
 -  CURLOPT_HTTPAUTH.3                            \
 -  CURLOPT_HTTPGET.3                             \
 -  CURLOPT_HTTPHEADER.3                          \
 -  CURLOPT_HTTPPOST.3                            \
 -  CURLOPT_HTTPPROXYTUNNEL.3                     \
 -  CURLOPT_HTTP_CONTENT_DECODING.3               \
 -  CURLOPT_HTTP_TRANSFER_DECODING.3              \
 -  CURLOPT_HTTP_VERSION.3                        \
 -  CURLOPT_IGNORE_CONTENT_LENGTH.3               \
 -  CURLOPT_TRAILERDATA.3                         \
 -  CURLOPT_TRAILERFUNCTION.3                     \
 -  CURLOPT_INFILESIZE.3                          \
 -  CURLOPT_INFILESIZE_LARGE.3                    \
 -  CURLOPT_INTERFACE.3                           \
 -  CURLOPT_INTERLEAVEDATA.3                      \
 -  CURLOPT_INTERLEAVEFUNCTION.3                  \
 -  CURLOPT_IOCTLDATA.3                           \
 -  CURLOPT_IOCTLFUNCTION.3                       \
 -  CURLOPT_IPRESOLVE.3                           \
 -  CURLOPT_ISSUERCERT.3                          \
 -  CURLOPT_KEEP_SENDING_ON_ERROR.3               \
 -  CURLOPT_KEYPASSWD.3                           \
 -  CURLOPT_KRBLEVEL.3                            \
 -  CURLOPT_LOCALPORT.3                           \
 -  CURLOPT_LOCALPORTRANGE.3                      \
 -  CURLOPT_LOGIN_OPTIONS.3                       \
 -  CURLOPT_LOW_SPEED_LIMIT.3                     \
 -  CURLOPT_LOW_SPEED_TIME.3                      \
 -  CURLOPT_MAIL_AUTH.3                           \
 -  CURLOPT_MAIL_FROM.3                           \
 -  CURLOPT_MAIL_RCPT.3                           \
 -  CURLOPT_MAXAGE_CONN.3                         \
 -  CURLOPT_MAXCONNECTS.3                         \
 -  CURLOPT_MAXFILESIZE.3                         \
 -  CURLOPT_MAXFILESIZE_LARGE.3                   \
 -  CURLOPT_MAXREDIRS.3                           \
 -  CURLOPT_MAX_RECV_SPEED_LARGE.3                \
 -  CURLOPT_MAX_SEND_SPEED_LARGE.3                \
 -  CURLOPT_MIMEPOST.3                            \
 -  CURLOPT_NETRC.3                               \
 -  CURLOPT_NETRC_FILE.3                          \
 -  CURLOPT_NEW_DIRECTORY_PERMS.3                 \
 -  CURLOPT_NEW_FILE_PERMS.3                      \
 -  CURLOPT_NOBODY.3                              \
 -  CURLOPT_NOPROGRESS.3                          \
 -  CURLOPT_NOPROXY.3                             \
 -  CURLOPT_NOSIGNAL.3                            \
 -  CURLOPT_OPENSOCKETDATA.3                      \
 -  CURLOPT_OPENSOCKETFUNCTION.3                  \
 -  CURLOPT_PASSWORD.3                            \
 -  CURLOPT_PATH_AS_IS.3                          \
 -  CURLOPT_PINNEDPUBLICKEY.3                     \
 -  CURLOPT_PIPEWAIT.3                            \
 -  CURLOPT_PORT.3                                \
 -  CURLOPT_POST.3                                \
 -  CURLOPT_POSTFIELDS.3                          \
 -  CURLOPT_POSTFIELDSIZE.3                       \
 -  CURLOPT_POSTFIELDSIZE_LARGE.3                 \
 -  CURLOPT_POSTQUOTE.3                           \
 -  CURLOPT_POSTREDIR.3                           \
 -  CURLOPT_PREQUOTE.3                            \
 -  CURLOPT_PRE_PROXY.3                           \
 -  CURLOPT_PRIVATE.3                             \
 -  CURLOPT_PROGRESSDATA.3                        \
 -  CURLOPT_PROGRESSFUNCTION.3                    \
 -  CURLOPT_PROTOCOLS.3                           \
 -  CURLOPT_PROXY.3                               \
 -  CURLOPT_PROXYAUTH.3                           \
 -  CURLOPT_PROXYHEADER.3                         \
 -  CURLOPT_PROXYPASSWORD.3                       \
 -  CURLOPT_PROXYPORT.3                           \
 -  CURLOPT_PROXYTYPE.3                           \
 -  CURLOPT_PROXYUSERNAME.3                       \
 -  CURLOPT_PROXYUSERPWD.3                        \
 -  CURLOPT_PROXY_CAINFO.3                        \
 -  CURLOPT_PROXY_CAPATH.3                        \
 -  CURLOPT_PROXY_CRLFILE.3                       \
 -  CURLOPT_PROXY_KEYPASSWD.3                     \
 -  CURLOPT_PROXY_PINNEDPUBLICKEY.3               \
 -  CURLOPT_PROXY_SERVICE_NAME.3                  \
 -  CURLOPT_PROXY_SSLCERT.3                       \
 -  CURLOPT_PROXY_SSLCERTTYPE.3                   \
 -  CURLOPT_PROXY_SSLKEY.3                        \
 -  CURLOPT_PROXY_SSLKEYTYPE.3                    \
 -  CURLOPT_PROXY_SSLVERSION.3                    \
 -  CURLOPT_PROXY_SSL_CIPHER_LIST.3               \
 -  CURLOPT_PROXY_SSL_OPTIONS.3                   \
 -  CURLOPT_PROXY_SSL_VERIFYHOST.3                \
 -  CURLOPT_PROXY_SSL_VERIFYPEER.3                \
 -  CURLOPT_PROXY_TLS13_CIPHERS.3                 \
 -  CURLOPT_PROXY_TLSAUTH_PASSWORD.3              \
 -  CURLOPT_PROXY_TLSAUTH_TYPE.3                  \
 -  CURLOPT_PROXY_TLSAUTH_USERNAME.3              \
 -  CURLOPT_PROXY_TRANSFER_MODE.3                 \
 -  CURLOPT_PUT.3                                 \
 -  CURLOPT_QUOTE.3                               \
 -  CURLOPT_RANDOM_FILE.3                         \
 -  CURLOPT_RANGE.3                               \
 -  CURLOPT_READDATA.3                            \
 -  CURLOPT_READFUNCTION.3                        \
 -  CURLOPT_REDIR_PROTOCOLS.3                     \
 -  CURLOPT_REFERER.3                             \
 -  CURLOPT_REQUEST_TARGET.3                      \
 -  CURLOPT_RESOLVE.3                             \
 -  CURLOPT_RESOLVER_START_DATA.3                 \
 -  CURLOPT_RESOLVER_START_FUNCTION.3             \
 -  CURLOPT_RESUME_FROM.3                         \
 -  CURLOPT_RESUME_FROM_LARGE.3                   \
 -  CURLOPT_RTSP_CLIENT_CSEQ.3                    \
 -  CURLOPT_RTSP_REQUEST.3                        \
 -  CURLOPT_RTSP_SERVER_CSEQ.3                    \
 -  CURLOPT_RTSP_SESSION_ID.3                     \
 -  CURLOPT_RTSP_STREAM_URI.3                     \
 -  CURLOPT_RTSP_TRANSPORT.3                      \
 -  CURLOPT_SASL_IR.3                             \
 -  CURLOPT_SEEKDATA.3                            \
 -  CURLOPT_SEEKFUNCTION.3                        \
 -  CURLOPT_SERVICE_NAME.3                        \
 -  CURLOPT_SHARE.3                               \
 -  CURLOPT_SOCKOPTDATA.3                         \
 -  CURLOPT_SOCKOPTFUNCTION.3                     \
 -  CURLOPT_SOCKS5_AUTH.3                         \
 -  CURLOPT_SOCKS5_GSSAPI_NEC.3                   \
 -  CURLOPT_SOCKS5_GSSAPI_SERVICE.3               \
 -  CURLOPT_SSH_AUTH_TYPES.3                      \
 -  CURLOPT_SSH_COMPRESSION.3                     \
 -  CURLOPT_SSH_HOST_PUBLIC_KEY_MD5.3             \
 -  CURLOPT_SSH_KEYDATA.3                         \
 -  CURLOPT_SSH_KEYFUNCTION.3                     \
 -  CURLOPT_SSH_KNOWNHOSTS.3                      \
 -  CURLOPT_SSH_PRIVATE_KEYFILE.3                 \
 -  CURLOPT_SSH_PUBLIC_KEYFILE.3                  \
 -  CURLOPT_SSLCERT.3                             \
 -  CURLOPT_SSLCERTTYPE.3                         \
 -  CURLOPT_SSLENGINE.3                           \
 -  CURLOPT_SSLENGINE_DEFAULT.3                   \
 -  CURLOPT_SSLKEY.3                              \
 -  CURLOPT_SSLKEYTYPE.3                          \
 -  CURLOPT_SSLVERSION.3                          \
 -  CURLOPT_SSL_CIPHER_LIST.3                     \
 -  CURLOPT_SSL_CTX_DATA.3                        \
 -  CURLOPT_SSL_CTX_FUNCTION.3                    \
 -  CURLOPT_SSL_ENABLE_ALPN.3                     \
 -  CURLOPT_SSL_ENABLE_NPN.3                      \
 -  CURLOPT_SSL_FALSESTART.3                      \
 -  CURLOPT_SSL_OPTIONS.3                         \
 -  CURLOPT_SSL_SESSIONID_CACHE.3                 \
 -  CURLOPT_SSL_VERIFYHOST.3                      \
 -  CURLOPT_SSL_VERIFYPEER.3                      \
 -  CURLOPT_SSL_VERIFYSTATUS.3                    \
 -  CURLOPT_STDERR.3                              \
 -  CURLOPT_STREAM_DEPENDS.3                      \
 -  CURLOPT_STREAM_DEPENDS_E.3                    \
 -  CURLOPT_STREAM_WEIGHT.3                       \
 -  CURLOPT_SUPPRESS_CONNECT_HEADERS.3            \
 -  CURLOPT_TCP_FASTOPEN.3                        \
 -  CURLOPT_TCP_KEEPALIVE.3                       \
 -  CURLOPT_TCP_KEEPIDLE.3                        \
 -  CURLOPT_TCP_KEEPINTVL.3                       \
 -  CURLOPT_TCP_NODELAY.3                         \
 -  CURLOPT_TELNETOPTIONS.3                       \
 -  CURLOPT_TFTP_BLKSIZE.3                        \
 -  CURLOPT_TFTP_NO_OPTIONS.3                     \
 -  CURLOPT_TIMECONDITION.3                       \
 -  CURLOPT_TIMEOUT.3                             \
 -  CURLOPT_TIMEOUT_MS.3                          \
 -  CURLOPT_TIMEVALUE.3                           \
 -  CURLOPT_TIMEVALUE_LARGE.3                     \
 -  CURLOPT_TLS13_CIPHERS.3                       \
 -  CURLOPT_TLSAUTH_PASSWORD.3                    \
 -  CURLOPT_TLSAUTH_TYPE.3                        \
 -  CURLOPT_TLSAUTH_USERNAME.3                    \
 -  CURLOPT_TRANSFERTEXT.3                        \
 -  CURLOPT_TRANSFER_ENCODING.3                   \
 -  CURLOPT_UNIX_SOCKET_PATH.3                    \
 -  CURLOPT_UNRESTRICTED_AUTH.3                   \
 -  CURLOPT_UPLOAD.3                              \
 -  CURLOPT_UPLOAD_BUFFERSIZE.3                   \
 -  CURLOPT_URL.3                                 \
 -  CURLOPT_USERAGENT.3                           \
 -  CURLOPT_USERNAME.3                            \
 -  CURLOPT_USERPWD.3                             \
 -  CURLOPT_USE_SSL.3                             \
 -  CURLOPT_VERBOSE.3                             \
 -  CURLOPT_WILDCARDMATCH.3                       \
 -  CURLOPT_WRITEDATA.3                           \
 -  CURLOPT_WRITEFUNCTION.3                       \
 -  CURLOPT_XFERINFODATA.3                        \
 -  CURLOPT_XFERINFOFUNCTION.3                    \
 -  CURLOPT_XOAUTH2_BEARER.3
 +  GNURLINFO_ACTIVESOCKET.3                       \
 +  GNURLINFO_APPCONNECT_TIME.3                    \
 +  GNURLINFO_APPCONNECT_TIME_T.3                  \
 +  GNURLINFO_CERTINFO.3                           \
 +  GNURLINFO_CONDITION_UNMET.3                    \
 +  GNURLINFO_CONNECT_TIME.3                       \
 +  GNURLINFO_CONNECT_TIME_T.3                     \
 +  GNURLINFO_CONTENT_LENGTH_DOWNLOAD.3            \
 +  GNURLINFO_CONTENT_LENGTH_DOWNLOAD_T.3          \
 +  GNURLINFO_CONTENT_LENGTH_UPLOAD.3              \
 +  GNURLINFO_CONTENT_LENGTH_UPLOAD_T.3            \
 +  GNURLINFO_CONTENT_TYPE.3                       \
 +  GNURLINFO_COOKIELIST.3                         \
 +  GNURLINFO_EFFECTIVE_URL.3                      \
 +  GNURLINFO_FILETIME.3                           \
 +  GNURLINFO_FILETIME_T.3                         \
 +  GNURLINFO_FTP_ENTRY_PATH.3                     \
 +  GNURLINFO_HEADER_SIZE.3                        \
 +  GNURLINFO_HTTPAUTH_AVAIL.3                     \
 +  GNURLINFO_HTTP_CONNECTCODE.3                   \
 +  GNURLINFO_HTTP_VERSION.3                       \
 +  GNURLINFO_LASTSOCKET.3                         \
 +  GNURLINFO_LOCAL_IP.3                           \
 +  GNURLINFO_LOCAL_PORT.3                         \
 +  GNURLINFO_NAMELOOKUP_TIME.3                    \
 +  GNURLINFO_NAMELOOKUP_TIME_T.3                  \
 +  GNURLINFO_NUM_CONNECTS.3                       \
 +  GNURLINFO_OS_ERRNO.3                           \
 +  GNURLINFO_PRETRANSFER_TIME.3                   \
 +  GNURLINFO_PRETRANSFER_TIME_T.3                 \
 +  GNURLINFO_PRIMARY_IP.3                         \
 +  GNURLINFO_PRIMARY_PORT.3                       \
 +  GNURLINFO_PRIVATE.3                            \
 +  GNURLINFO_PROTOCOL.3                           \
 +  GNURLINFO_PROXYAUTH_AVAIL.3                    \
 +  GNURLINFO_PROXY_SSL_VERIFYRESULT.3             \
 +  GNURLINFO_REDIRECT_COUNT.3                     \
 +  GNURLINFO_REDIRECT_TIME.3                      \
 +  GNURLINFO_REDIRECT_TIME_T.3                    \
 +  GNURLINFO_REDIRECT_URL.3                       \
 +  GNURLINFO_REQUEST_SIZE.3                       \
 +  GNURLINFO_RESPONSE_CODE.3                      \
 +  GNURLINFO_RTSP_CLIENT_CSEQ.3                   \
 +  GNURLINFO_RTSP_CSEQ_RECV.3                     \
 +  GNURLINFO_RTSP_SERVER_CSEQ.3                   \
 +  GNURLINFO_RTSP_SESSION_ID.3                    \
 +  GNURLINFO_SCHEME.3                             \
 +  GNURLINFO_SIZE_DOWNLOAD.3                      \
 +  GNURLINFO_SIZE_DOWNLOAD_T.3                    \
 +  GNURLINFO_SIZE_UPLOAD.3                        \
 +  GNURLINFO_SIZE_UPLOAD_T.3                      \
 +  GNURLINFO_SPEED_DOWNLOAD.3                     \
 +  GNURLINFO_SPEED_DOWNLOAD_T.3                   \
 +  GNURLINFO_SPEED_UPLOAD.3                       \
 +  GNURLINFO_SPEED_UPLOAD_T.3                     \
 +  GNURLINFO_SSL_ENGINES.3                        \
 +  GNURLINFO_SSL_VERIFYRESULT.3                   \
 +  GNURLINFO_STARTTRANSFER_TIME.3                 \
 +  GNURLINFO_STARTTRANSFER_TIME_T.3               \
 +  GNURLINFO_TLS_SESSION.3                        \
 +  GNURLINFO_TLS_SSL_PTR.3                        \
 +  GNURLINFO_TOTAL_TIME.3                         \
 +  GNURLINFO_TOTAL_TIME_T.3                       \
 +  GNURLMOPT_CHUNK_LENGTH_PENALTY_SIZE.3          \
 +  GNURLMOPT_CONTENT_LENGTH_PENALTY_SIZE.3        \
 +  GNURLMOPT_MAXCONNECTS.3                        \
 +  GNURLMOPT_MAX_HOST_CONNECTIONS.3               \
 +  GNURLMOPT_MAX_PIPELINE_LENGTH.3                \
 +  GNURLMOPT_MAX_TOTAL_CONNECTIONS.3              \
 +  GNURLMOPT_PIPELINING.3                         \
 +  GNURLMOPT_PIPELINING_SERVER_BL.3               \
 +  GNURLMOPT_PIPELINING_SITE_BL.3                 \
 +  GNURLMOPT_PUSHDATA.3                           \
 +  GNURLMOPT_PUSHFUNCTION.3                       \
 +  GNURLMOPT_SOCKETDATA.3                         \
 +  GNURLMOPT_SOCKETFUNCTION.3                     \
 +  GNURLMOPT_TIMERDATA.3                          \
 +  GNURLMOPT_TIMERFUNCTION.3                      \
 +  GNURLOPT_ABSTRACT_UNIX_SOCKET.3                \
 +  GNURLOPT_ACCEPTTIMEOUT_MS.3                    \
 +  GNURLOPT_ACCEPT_ENCODING.3                     \
 +  GNURLOPT_ADDRESS_SCOPE.3                       \
 +  GNURLOPT_ALTSVC.3                              \
 +  GNURLOPT_ALTSVC_CTRL.3                         \
 +  GNURLOPT_APPEND.3                              \
 +  GNURLOPT_AUTOREFERER.3                         \
 +  GNURLOPT_BUFFERSIZE.3                          \
 +  GNURLOPT_CAINFO.3                              \
 +  GNURLOPT_CAPATH.3                              \
 +  GNURLOPT_CERTINFO.3                            \
 +  GNURLOPT_CHUNK_BGN_FUNCTION.3                  \
 +  GNURLOPT_CHUNK_DATA.3                          \
 +  GNURLOPT_CHUNK_END_FUNCTION.3                  \
 +  GNURLOPT_CLOSESOCKETDATA.3                     \
 +  GNURLOPT_CLOSESOCKETFUNCTION.3                 \
 +  GNURLOPT_UPKEEP_INTERVAL_MS.3             \
 +  GNURLOPT_CONNECTTIMEOUT.3                      \
 +  GNURLOPT_CONNECTTIMEOUT_MS.3                   \
 +  GNURLOPT_CONNECT_ONLY.3                        \
 +  GNURLOPT_CONNECT_TO.3                          \
 +  GNURLOPT_CONV_FROM_NETWORK_FUNCTION.3          \
 +  GNURLOPT_CONV_FROM_UTF8_FUNCTION.3             \
 +  GNURLOPT_CONV_TO_NETWORK_FUNCTION.3            \
 +  GNURLOPT_COOKIE.3                              \
 +  GNURLOPT_COOKIEFILE.3                          \
 +  GNURLOPT_COOKIEJAR.3                           \
 +  GNURLOPT_COOKIELIST.3                          \
 +  GNURLOPT_COOKIESESSION.3                       \
 +  GNURLOPT_COPYPOSTFIELDS.3                      \
 +  GNURLOPT_CRLF.3                                \
 +  GNURLOPT_CRLFILE.3                             \
 +  GNURLOPT_CUSTOMREQUEST.3                       \
 +  GNURLOPT_CURLU.3                               \
 +  GNURLOPT_DEBUGDATA.3                           \
 +  GNURLOPT_DEBUGFUNCTION.3                       \
 +  GNURLOPT_DEFAULT_PROTOCOL.3                    \
 +  GNURLOPT_DIRLISTONLY.3                         \
 +  GNURLOPT_DISALLOW_USERNAME_IN_URL.3            \
 +  GNURLOPT_DNS_CACHE_TIMEOUT.3                   \
 +  GNURLOPT_DNS_INTERFACE.3                       \
 +  GNURLOPT_DNS_LOCAL_IP4.3                       \
 +  GNURLOPT_DNS_LOCAL_IP6.3                       \
 +  GNURLOPT_DNS_SERVERS.3                         \
 +  GNURLOPT_DNS_SHUFFLE_ADDRESSES.3               \
 +  GNURLOPT_DNS_USE_GLOBAL_CACHE.3                \
 +  GNURLOPT_DOH_URL.3                             \
 +  GNURLOPT_EGDSOCKET.3                           \
 +  GNURLOPT_ERRORBUFFER.3                         \
 +  GNURLOPT_EXPECT_100_TIMEOUT_MS.3               \
 +  GNURLOPT_FAILONERROR.3                         \
 +  GNURLOPT_FILETIME.3                            \
 +  GNURLOPT_FNMATCH_DATA.3                        \
 +  GNURLOPT_FNMATCH_FUNCTION.3                    \
 +  GNURLOPT_FOLLOWLOCATION.3                      \
 +  GNURLOPT_FORBID_REUSE.3                        \
 +  GNURLOPT_FRESH_CONNECT.3                       \
 +  GNURLOPT_FTPPORT.3                             \
 +  GNURLOPT_FTPSSLAUTH.3                          \
 +  GNURLOPT_FTP_ACCOUNT.3                         \
 +  GNURLOPT_FTP_ALTERNATIVE_TO_USER.3             \
 +  GNURLOPT_FTP_CREATE_MISSING_DIRS.3             \
 +  GNURLOPT_FTP_FILEMETHOD.3                      \
 +  GNURLOPT_FTP_RESPONSE_TIMEOUT.3                \
 +  GNURLOPT_FTP_SKIP_PASV_IP.3                    \
 +  GNURLOPT_FTP_SSL_CCC.3                         \
 +  GNURLOPT_FTP_USE_EPRT.3                        \
 +  GNURLOPT_FTP_USE_EPSV.3                        \
 +  GNURLOPT_FTP_USE_PRET.3                        \
 +  GNURLOPT_GSSAPI_DELEGATION.3                   \
 +  GNURLOPT_HAPPY_EYEBALLS_TIMEOUT_MS.3           \
 +  GNURLOPT_HAPROXYPROTOCOL.3                     \
 +  GNURLOPT_HEADER.3                              \
 +  GNURLOPT_HEADERDATA.3                          \
 +  GNURLOPT_HEADERFUNCTION.3                      \
 +  GNURLOPT_HEADEROPT.3                           \
 +  GNURLOPT_HTTP09_ALLOWED.3                      \
 +  GNURLOPT_HTTP200ALIASES.3                      \
 +  GNURLOPT_HTTPAUTH.3                            \
 +  GNURLOPT_HTTPGET.3                             \
 +  GNURLOPT_HTTPHEADER.3                          \
 +  GNURLOPT_HTTPPOST.3                            \
 +  GNURLOPT_HTTPPROXYTUNNEL.3                     \
 +  GNURLOPT_HTTP_CONTENT_DECODING.3               \
 +  GNURLOPT_HTTP_TRANSFER_DECODING.3              \
 +  GNURLOPT_HTTP_VERSION.3                        \
 +  GNURLOPT_IGNORE_CONTENT_LENGTH.3               \
 +  GNURLOPT_TRAILERDATA.3                         \
 +  GNURLOPT_TRAILERFUNCTION.3                     \
 +  GNURLOPT_INFILESIZE.3                          \
 +  GNURLOPT_INFILESIZE_LARGE.3                    \
 +  GNURLOPT_INTERFACE.3                           \
 +  GNURLOPT_INTERLEAVEDATA.3                      \
 +  GNURLOPT_INTERLEAVEFUNCTION.3                  \
 +  GNURLOPT_IOCTLDATA.3                           \
 +  GNURLOPT_IOCTLFUNCTION.3                       \
 +  GNURLOPT_IPRESOLVE.3                           \
 +  GNURLOPT_ISSUERCERT.3                          \
 +  GNURLOPT_KEEP_SENDING_ON_ERROR.3               \
 +  GNURLOPT_KEYPASSWD.3                           \
 +  GNURLOPT_KRBLEVEL.3                            \
 +  GNURLOPT_LOCALPORT.3                           \
 +  GNURLOPT_LOCALPORTRANGE.3                      \
 +  GNURLOPT_LOGIN_OPTIONS.3                       \
 +  GNURLOPT_LOW_SPEED_LIMIT.3                     \
 +  GNURLOPT_LOW_SPEED_TIME.3                      \
 +  GNURLOPT_MAIL_AUTH.3                           \
 +  GNURLOPT_MAIL_FROM.3                           \
 +  GNURLOPT_MAIL_RCPT.3                           \
++  GNURLOPT_MAXAGE_CONN.3                         \
 +  GNURLOPT_MAXCONNECTS.3                         \
 +  GNURLOPT_MAXFILESIZE.3                         \
 +  GNURLOPT_MAXFILESIZE_LARGE.3                   \
 +  GNURLOPT_MAXREDIRS.3                           \
 +  GNURLOPT_MAX_RECV_SPEED_LARGE.3                \
 +  GNURLOPT_MAX_SEND_SPEED_LARGE.3                \
 +  GNURLOPT_MIMEPOST.3                            \
 +  GNURLOPT_NETRC.3                               \
 +  GNURLOPT_NETRC_FILE.3                          \
 +  GNURLOPT_NEW_DIRECTORY_PERMS.3                 \
 +  GNURLOPT_NEW_FILE_PERMS.3                      \
 +  GNURLOPT_NOBODY.3                              \
 +  GNURLOPT_NOPROGRESS.3                          \
 +  GNURLOPT_NOPROXY.3                             \
 +  GNURLOPT_NOSIGNAL.3                            \
 +  GNURLOPT_OPENSOCKETDATA.3                      \
 +  GNURLOPT_OPENSOCKETFUNCTION.3                  \
 +  GNURLOPT_PASSWORD.3                            \
 +  GNURLOPT_PATH_AS_IS.3                          \
 +  GNURLOPT_PINNEDPUBLICKEY.3                     \
 +  GNURLOPT_PIPEWAIT.3                            \
 +  GNURLOPT_PORT.3                                \
 +  GNURLOPT_POST.3                                \
 +  GNURLOPT_POSTFIELDS.3                          \
 +  GNURLOPT_POSTFIELDSIZE.3                       \
 +  GNURLOPT_POSTFIELDSIZE_LARGE.3                 \
 +  GNURLOPT_POSTQUOTE.3                           \
 +  GNURLOPT_POSTREDIR.3                           \
 +  GNURLOPT_PREQUOTE.3                            \
 +  GNURLOPT_PRE_PROXY.3                           \
 +  GNURLOPT_PRIVATE.3                             \
 +  GNURLOPT_PROGRESSDATA.3                        \
 +  GNURLOPT_PROGRESSFUNCTION.3                    \
 +  GNURLOPT_PROTOCOLS.3                           \
 +  GNURLOPT_PROXY.3                               \
 +  GNURLOPT_PROXYAUTH.3                           \
 +  GNURLOPT_PROXYHEADER.3                         \
 +  GNURLOPT_PROXYPASSWORD.3                       \
 +  GNURLOPT_PROXYPORT.3                           \
 +  GNURLOPT_PROXYTYPE.3                           \
 +  GNURLOPT_PROXYUSERNAME.3                       \
 +  GNURLOPT_PROXYUSERPWD.3                        \
 +  GNURLOPT_PROXY_CAINFO.3                        \
 +  GNURLOPT_PROXY_CAPATH.3                        \
 +  GNURLOPT_PROXY_CRLFILE.3                       \
 +  GNURLOPT_PROXY_KEYPASSWD.3                     \
 +  GNURLOPT_PROXY_PINNEDPUBLICKEY.3               \
 +  GNURLOPT_PROXY_SERVICE_NAME.3                  \
 +  GNURLOPT_PROXY_SSLCERT.3                       \
 +  GNURLOPT_PROXY_SSLCERTTYPE.3                   \
 +  GNURLOPT_PROXY_SSLKEY.3                        \
 +  GNURLOPT_PROXY_SSLKEYTYPE.3                    \
 +  GNURLOPT_PROXY_SSLVERSION.3                    \
 +  GNURLOPT_PROXY_SSL_CIPHER_LIST.3               \
 +  GNURLOPT_PROXY_SSL_OPTIONS.3                   \
 +  GNURLOPT_PROXY_SSL_VERIFYHOST.3                \
 +  GNURLOPT_PROXY_SSL_VERIFYPEER.3                \
 +  GNURLOPT_PROXY_TLS13_CIPHERS.3                 \
 +  GNURLOPT_PROXY_TLSAUTH_PASSWORD.3              \
 +  GNURLOPT_PROXY_TLSAUTH_TYPE.3                  \
 +  GNURLOPT_PROXY_TLSAUTH_USERNAME.3              \
 +  GNURLOPT_PROXY_TRANSFER_MODE.3                 \
 +  GNURLOPT_PUT.3                                 \
 +  GNURLOPT_QUOTE.3                               \
 +  GNURLOPT_RANDOM_FILE.3                         \
 +  GNURLOPT_RANGE.3                               \
 +  GNURLOPT_READDATA.3                            \
 +  GNURLOPT_READFUNCTION.3                        \
 +  GNURLOPT_REDIR_PROTOCOLS.3                     \
 +  GNURLOPT_REFERER.3                             \
 +  GNURLOPT_REQUEST_TARGET.3                      \
 +  GNURLOPT_RESOLVE.3                             \
 +  GNURLOPT_RESOLVER_START_DATA.3                 \
 +  GNURLOPT_RESOLVER_START_FUNCTION.3             \
 +  GNURLOPT_RESUME_FROM.3                         \
 +  GNURLOPT_RESUME_FROM_LARGE.3                   \
 +  GNURLOPT_RTSP_CLIENT_CSEQ.3                    \
 +  GNURLOPT_RTSP_REQUEST.3                        \
 +  GNURLOPT_RTSP_SERVER_CSEQ.3                    \
 +  GNURLOPT_RTSP_SESSION_ID.3                     \
 +  GNURLOPT_RTSP_STREAM_URI.3                     \
 +  GNURLOPT_RTSP_TRANSPORT.3                      \
 +  GNURLOPT_SASL_IR.3                             \
 +  GNURLOPT_SEEKDATA.3                            \
 +  GNURLOPT_SEEKFUNCTION.3                        \
 +  GNURLOPT_SERVICE_NAME.3                        \
 +  GNURLOPT_SHARE.3                               \
 +  GNURLOPT_SOCKOPTDATA.3                         \
 +  GNURLOPT_SOCKOPTFUNCTION.3                     \
 +  GNURLOPT_SOCKS5_AUTH.3                         \
 +  GNURLOPT_SOCKS5_GSSAPI_NEC.3                   \
 +  GNURLOPT_SOCKS5_GSSAPI_SERVICE.3               \
 +  GNURLOPT_SSH_AUTH_TYPES.3                      \
 +  GNURLOPT_SSH_COMPRESSION.3                     \
 +  GNURLOPT_SSH_HOST_PUBLIC_KEY_MD5.3             \
 +  GNURLOPT_SSH_KEYDATA.3                         \
 +  GNURLOPT_SSH_KEYFUNCTION.3                     \
 +  GNURLOPT_SSH_KNOWNHOSTS.3                      \
 +  GNURLOPT_SSH_PRIVATE_KEYFILE.3                 \
 +  GNURLOPT_SSH_PUBLIC_KEYFILE.3                  \
 +  GNURLOPT_SSLCERT.3                             \
 +  GNURLOPT_SSLCERTTYPE.3                         \
 +  GNURLOPT_SSLENGINE.3                           \
 +  GNURLOPT_SSLENGINE_DEFAULT.3                   \
 +  GNURLOPT_SSLKEY.3                              \
 +  GNURLOPT_SSLKEYTYPE.3                          \
 +  GNURLOPT_SSLVERSION.3                          \
 +  GNURLOPT_SSL_CIPHER_LIST.3                     \
 +  GNURLOPT_SSL_CTX_DATA.3                        \
 +  GNURLOPT_SSL_CTX_FUNCTION.3                    \
 +  GNURLOPT_SSL_ENABLE_ALPN.3                     \
 +  GNURLOPT_SSL_ENABLE_NPN.3                      \
 +  GNURLOPT_SSL_FALSESTART.3                      \
 +  GNURLOPT_SSL_OPTIONS.3                         \
 +  GNURLOPT_SSL_SESSIONID_CACHE.3                 \
 +  GNURLOPT_SSL_VERIFYHOST.3                      \
 +  GNURLOPT_SSL_VERIFYPEER.3                      \
 +  GNURLOPT_SSL_VERIFYSTATUS.3                    \
 +  GNURLOPT_STDERR.3                              \
 +  GNURLOPT_STREAM_DEPENDS.3                      \
 +  GNURLOPT_STREAM_DEPENDS_E.3                    \
 +  GNURLOPT_STREAM_WEIGHT.3                       \
 +  GNURLOPT_SUPPRESS_CONNECT_HEADERS.3            \
 +  GNURLOPT_TCP_FASTOPEN.3                        \
 +  GNURLOPT_TCP_KEEPALIVE.3                       \
 +  GNURLOPT_TCP_KEEPIDLE.3                        \
 +  GNURLOPT_TCP_KEEPINTVL.3                       \
 +  GNURLOPT_TCP_NODELAY.3                         \
 +  GNURLOPT_TELNETOPTIONS.3                       \
 +  GNURLOPT_TFTP_BLKSIZE.3                        \
 +  GNURLOPT_TFTP_NO_OPTIONS.3                     \
 +  GNURLOPT_TIMECONDITION.3                       \
 +  GNURLOPT_TIMEOUT.3                             \
 +  GNURLOPT_TIMEOUT_MS.3                          \
 +  GNURLOPT_TIMEVALUE.3                           \
 +  GNURLOPT_TIMEVALUE_LARGE.3                     \
 +  GNURLOPT_TLS13_CIPHERS.3                       \
 +  GNURLOPT_TLSAUTH_PASSWORD.3                    \
 +  GNURLOPT_TLSAUTH_TYPE.3                        \
 +  GNURLOPT_TLSAUTH_USERNAME.3                    \
 +  GNURLOPT_TRANSFERTEXT.3                        \
 +  GNURLOPT_TRANSFER_ENCODING.3                   \
 +  GNURLOPT_UNIX_SOCKET_PATH.3                    \
 +  GNURLOPT_UNRESTRICTED_AUTH.3                   \
 +  GNURLOPT_UPLOAD.3                              \
 +  GNURLOPT_UPLOAD_BUFFERSIZE.3                   \
 +  GNURLOPT_URL.3                                 \
 +  GNURLOPT_USERAGENT.3                           \
 +  GNURLOPT_USERNAME.3                            \
 +  GNURLOPT_USERPWD.3                             \
 +  GNURLOPT_USE_SSL.3                             \
 +  GNURLOPT_VERBOSE.3                             \
 +  GNURLOPT_WILDCARDMATCH.3                       \
 +  GNURLOPT_WRITEDATA.3                           \
 +  GNURLOPT_WRITEFUNCTION.3                       \
 +  GNURLOPT_XFERINFODATA.3                        \
 +  GNURLOPT_XFERINFOFUNCTION.3                    \
 +  GNURLOPT_XOAUTH2_BEARER.3
diff --cc lib/altsvc.c
index 3bde72c2a,85a4e01b5..73cd5d734
--- a/lib/altsvc.c
+++ b/lib/altsvc.c
@@@ -26,10 -26,10 +26,10 @@@
  #include "curl_setup.h"
  
  #if !defined(CURL_DISABLE_HTTP) && defined(USE_ALTSVC)
 -#include <curl/curl.h>
 +#include <gnurl/curl.h>
  #include "urldata.h"
  #include "altsvc.h"
- #include "cookie.h" /* for Curl_get_line() */
+ #include "curl_get_line.h"
  #include "strcase.h"
  #include "parsedate.h"
  #include "sendf.h"
diff --cc lib/curl_path.c
index 74406ace4,85dddcef1..3e1fe2a7c
--- a/lib/curl_path.c
+++ b/lib/curl_path.c
@@@ -22,9 -22,9 +22,9 @@@
  
  #include "curl_setup.h"
  
- #if defined(USE_LIBSSH2) || defined(USE_LIBSSH)
+ #if defined(USE_SSH)
  
 -#include <curl/curl.h>
 +#include <gnurl/curl.h>
  #include "curl_memory.h"
  #include "curl_path.h"
  #include "escape.h"
diff --cc lib/curl_sasl.c
index 437a9f66a,018e4228b..e8a940211
--- a/lib/curl_sasl.c
+++ b/lib/curl_sasl.c
@@@ -31,7 -31,10 +31,10 @@@
  
  #include "curl_setup.h"
  
+ #if !defined(CURL_DISABLE_IMAP) || !defined(CURL_DISABLE_SMTP) || \
+   !defined(CURL_DISABLE_POP3)
+ 
 -#include <curl/curl.h>
 +#include <gnurl/curl.h>
  #include "urldata.h"
  
  #include "curl_base64.h"
diff --cc lib/formdata.c
index 5a6cdd644,429d479da..ae453b1c6
--- a/lib/formdata.c
+++ b/lib/formdata.c
@@@ -22,9 -22,10 +22,10 @@@
  
  #include "curl_setup.h"
  
 -#include <curl/curl.h>
 +#include <gnurl/curl.h>
  
- #ifndef CURL_DISABLE_HTTP
+ #include "formdata.h"
+ #if !defined(CURL_DISABLE_HTTP) && !defined(CURL_DISABLE_MIME)
  
  #if defined(HAVE_LIBGEN_H) && defined(HAVE_BASENAME)
  #include <libgen.h>
diff --cc lib/urldata.h
index 0681e8da7,d759592d9..5ca202f2e
--- a/lib/urldata.h
+++ b/lib/urldata.h
@@@ -1617,11 -1627,9 +1628,9 @@@ struct UserDefined 
    curl_sshkeycallback ssh_keyfunc; /* key matching callback */
    void *ssh_keyfunc_userp;         /* custom pointer to callback */
    enum CURL_NETRC_OPTION
 -       use_netrc;        /* defined in include/curl.h */
 +       use_netrc;        /* defined in include/gnurl.h */
    curl_usessl use_ssl;   /* if AUTH TLS is to be attempted etc, for FTP or
                              IMAP or POP3 or others! */
-   curl_ftpauth ftpsslauth; /* what AUTH XXX to be attempted */
-   curl_ftpccc ftp_ccc;   /* FTP CCC options */
    long new_file_perms;    /* Permissions to use when creating remote files */
    long new_directory_perms; /* Permissions to use when creating remote dirs */
    long ssh_auth_types;   /* allowed SSH auth types */
diff --cc lib/vauth/cleartext.c
index 27acbfec9,6f452c169..d17ceaed3
--- a/lib/vauth/cleartext.c
+++ b/lib/vauth/cleartext.c
@@@ -25,7 -25,10 +25,10 @@@
  
  #include "curl_setup.h"
  
+ #if !defined(CURL_DISABLE_IMAP) || !defined(CURL_DISABLE_SMTP) ||       \
+   !defined(CURL_DISABLE_POP3)
+ 
 -#include <curl/curl.h>
 +#include <gnurl/curl.h>
  #include "urldata.h"
  
  #include "vauth/vauth.h"
diff --cc lib/vauth/oauth2.c
index 28f64e105,b4e9f8e70..6db148b62
--- a/lib/vauth/oauth2.c
+++ b/lib/vauth/oauth2.c
@@@ -24,7 -24,10 +24,10 @@@
  
  #include "curl_setup.h"
  
+ #if !defined(CURL_DISABLE_IMAP) || !defined(CURL_DISABLE_SMTP) || \
+   !defined(CURL_DISABLE_POP3)
+ 
 -#include <curl/curl.h>
 +#include <gnurl/curl.h>
  #include "urldata.h"
  
  #include "vauth/vauth.h"

-- 
To stop receiving notification emails like this one, please contact
address@hidden



reply via email to

[Prev in Thread] Current Thread [Next in Thread]