← Commit list

a58b50fca6

Stefan Eissing

2024-08-17

SUCCESS Duration: 115s

Subject

transfer: Curl_sendrecv() and event related improvements

Binary

Download Binary (853 KB)

Architecture & Compiler Flags

Architecture: x86_64-linux-gnu Compiler: gcc (Ubuntu 11.4.0-1ubuntu1~22.04.3) 11.4.0

—

Build Log

$ git checkout -f a58b50fca6eb543896a7c1cb05bb21aa1fc49251
Previous HEAD position was 2c4d04c4d3 GHA: update dependency gnutls/gnutls to v3.8.7
HEAD is now at a58b50fca6 transfer: Curl_sendrecv() and event related improvements

$ git clean -fdx
Removing Makefile
Removing Makefile.in
Removing aclocal.m4
Removing autom4te.cache/
Removing compile
Removing config.guess
Removing config.log
Removing config.status
Removing config.sub
Removing configure
Removing curl-config
Removing depcomp
Removing docs/Makefile
Removing docs/Makefile.in
Removing docs/cmdline-opts/Makefile
Removing docs/cmdline-opts/Makefile.in
Removing docs/examples/.deps/
Removing docs/examples/Makefile
Removing docs/examples/Makefile.in
Removing docs/libcurl/Makefile
Removing docs/libcurl/Makefile.in
Removing docs/libcurl/opts/Makefile
Removing docs/libcurl/opts/Makefile.in
Removing include/Makefile
Removing include/Makefile.in
Removing include/curl/Makefile
Removing include/curl/Makefile.in
Removing install-sh
Removing lib/.deps/
Removing lib/.dirstamp
Removing lib/.libs/
Removing lib/Makefile
Removing lib/Makefile.in
Removing lib/base64.o
Removing lib/curl_config.h
Removing lib/curl_config.h.in
Removing lib/curl_multibyte.o
Removing lib/dynbuf.o
Removing lib/libcurl.la
Removing lib/libcurl.vers
Removing lib/libcurl_la-altsvc.lo
Removing lib/libcurl_la-altsvc.o
Removing lib/libcurl_la-amigaos.lo
Removing lib/libcurl_la-amigaos.o
Removing lib/libcurl_la-asyn-ares.lo
Removing lib/libcurl_la-asyn-ares.o
Removing lib/libcurl_la-asyn-thread.lo
Removing lib/libcurl_la-asyn-thread.o
Removing lib/libcurl_la-base64.lo
Removing lib/libcurl_la-base64.o
Removing lib/libcurl_la-bufq.lo
Removing lib/libcurl_la-bufq.o
Removing lib/libcurl_la-bufref.lo
Removing lib/libcurl_la-bufref.o
Removing lib/libcurl_la-c-hyper.lo
Removing lib/libcurl_la-c-hyper.o
Removing lib/libcurl_la-cf-h1-proxy.lo
Removing lib/libcurl_la-cf-h1-proxy.o
Removing lib/libcurl_la-cf-h2-proxy.lo
Removing lib/libcurl_la-cf-h2-proxy.o
Removing lib/libcurl_la-cf-haproxy.lo
Removing lib/libcurl_la-cf-haproxy.o
Removing lib/libcurl_la-cf-https-connect.lo
Removing lib/libcurl_la-cf-https-connect.o
Removing lib/libcurl_la-cf-socket.lo
Removing lib/libcurl_la-cf-socket.o
Removing lib/libcurl_la-cfilters.lo
Removing lib/libcurl_la-cfilters.o
Removing lib/libcurl_la-conncache.lo
Removing lib/libcurl_la-conncache.o
Removing lib/libcurl_la-connect.lo
Removing lib/libcurl_la-connect.o
Removing lib/libcurl_la-content_encoding.lo
Removing lib/libcurl_la-content_encoding.o
Removing lib/libcurl_la-cookie.lo
Removing lib/libcurl_la-cookie.o
Removing lib/libcurl_la-curl_addrinfo.lo
Removing lib/libcurl_la-curl_addrinfo.o
Removing lib/libcurl_la-curl_des.lo
Removing lib/libcurl_la-curl_des.o
Removing lib/libcurl_la-curl_endian.lo
Removing lib/libcurl_la-curl_endian.o
Removing lib/libcurl_la-curl_fnmatch.lo
Removing lib/libcurl_la-curl_fnmatch.o
Removing lib/libcurl_la-curl_get_line.lo
Removing lib/libcurl_la-curl_get_line.o
Removing lib/libcurl_la-curl_gethostname.lo
Removing lib/libcurl_la-curl_gethostname.o
Removing lib/libcurl_la-curl_gssapi.lo
Removing lib/libcurl_la-curl_gssapi.o
Removing lib/libcurl_la-curl_memrchr.lo
Removing lib/libcurl_la-curl_memrchr.o
Removing lib/libcurl_la-curl_multibyte.lo
Removing lib/libcurl_la-curl_multibyte.o
Removing lib/libcurl_la-curl_ntlm_core.lo
Removing lib/libcurl_la-curl_ntlm_core.o
Removing lib/libcurl_la-curl_path.lo
Removing lib/libcurl_la-curl_path.o
Removing lib/libcurl_la-curl_range.lo
Removing lib/libcurl_la-curl_range.o
Removing lib/libcurl_la-curl_rtmp.lo
Removing lib/libcurl_la-curl_rtmp.o
Removing lib/libcurl_la-curl_sasl.lo
Removing lib/libcurl_la-curl_sasl.o
Removing lib/libcurl_la-curl_sha512_256.lo
Removing lib/libcurl_la-curl_sha512_256.o
Removing lib/libcurl_la-curl_sspi.lo
Removing lib/libcurl_la-curl_sspi.o
Removing lib/libcurl_la-curl_threads.lo
Removing lib/libcurl_la-curl_threads.o
Removing lib/libcurl_la-curl_trc.lo
Removing lib/libcurl_la-curl_trc.o
Removing lib/libcurl_la-cw-out.lo
Removing lib/libcurl_la-cw-out.o
Removing lib/libcurl_la-dict.lo
Removing lib/libcurl_la-dict.o
Removing lib/libcurl_la-dllmain.lo
Removing lib/libcurl_la-dllmain.o
Removing lib/libcurl_la-doh.lo
Removing lib/libcurl_la-doh.o
Removing lib/libcurl_la-dynbuf.lo
Removing lib/libcurl_la-dynbuf.o
Removing lib/libcurl_la-dynhds.lo
Removing lib/libcurl_la-dynhds.o
Removing lib/libcurl_la-easy.lo
Removing lib/libcurl_la-easy.o
Removing lib/libcurl_la-easygetopt.lo
Removing lib/libcurl_la-easygetopt.o
Removing lib/libcurl_la-easyoptions.lo
Removing lib/libcurl_la-easyoptions.o
Removing lib/libcurl_la-escape.lo
Removing lib/libcurl_la-escape.o
Removing lib/libcurl_la-file.lo
Removing lib/libcurl_la-file.o
Removing lib/libcurl_la-fileinfo.lo
Removing lib/libcurl_la-fileinfo.o
Removing lib/libcurl_la-fopen.lo
Removing lib/libcurl_la-fopen.o
Removing lib/libcurl_la-formdata.lo
Removing lib/libcurl_la-formdata.o
Removing lib/libcurl_la-ftp.lo
Removing lib/libcurl_la-ftp.o
Removing lib/libcurl_la-ftplistparser.lo
Removing lib/libcurl_la-ftplistparser.o
Removing lib/libcurl_la-getenv.lo
Removing lib/libcurl_la-getenv.o
Removing lib/libcurl_la-getinfo.lo
Removing lib/libcurl_la-getinfo.o
Removing lib/libcurl_la-gopher.lo
Removing lib/libcurl_la-gopher.o
Removing lib/libcurl_la-hash.lo
Removing lib/libcurl_la-hash.o
Removing lib/libcurl_la-headers.lo
Removing lib/libcurl_la-headers.o
Removing lib/libcurl_la-hmac.lo
Removing lib/libcurl_la-hmac.o
Removing lib/libcurl_la-hostasyn.lo
Removing lib/libcurl_la-hostasyn.o
Removing lib/libcurl_la-hostip.lo
Removing lib/libcurl_la-hostip.o
Removing lib/libcurl_la-hostip4.lo
Removing lib/libcurl_la-hostip4.o
Removing lib/libcurl_la-hostip6.lo
Removing lib/libcurl_la-hostip6.o
Removing lib/libcurl_la-hostsyn.lo
Removing lib/libcurl_la-hostsyn.o
Removing lib/libcurl_la-hsts.lo
Removing lib/libcurl_la-hsts.o
Removing lib/libcurl_la-http.lo
Removing lib/libcurl_la-http.o
Removing lib/libcurl_la-http1.lo
Removing lib/libcurl_la-http1.o
Removing lib/libcurl_la-http2.lo
Removing lib/libcurl_la-http2.o
Removing lib/libcurl_la-http_aws_sigv4.lo
Removing lib/libcurl_la-http_aws_sigv4.o
Removing lib/libcurl_la-http_chunks.lo
Removing lib/libcurl_la-http_chunks.o
Removing lib/libcurl_la-http_digest.lo
Removing lib/libcurl_la-http_digest.o
Removing lib/libcurl_la-http_negotiate.lo
Removing lib/libcurl_la-http_negotiate.o
Removing lib/libcurl_la-http_ntlm.lo
Removing lib/libcurl_la-http_ntlm.o
Removing lib/libcurl_la-http_proxy.lo
Removing lib/libcurl_la-http_proxy.o
Removing lib/libcurl_la-idn.lo
Removing lib/libcurl_la-idn.o
Removing lib/libcurl_la-if2ip.lo
Removing lib/libcurl_la-if2ip.o
Removing lib/libcurl_la-imap.lo
Removing lib/libcurl_la-imap.o
Removing lib/libcurl_la-inet_ntop.lo
Removing lib/libcurl_la-inet_ntop.o
Removing lib/libcurl_la-inet_pton.lo
Removing lib/libcurl_la-inet_pton.o
Removing lib/libcurl_la-krb5.lo
Removing lib/libcurl_la-krb5.o
Removing lib/libcurl_la-ldap.lo
Removing lib/libcurl_la-ldap.o
Removing lib/libcurl_la-llist.lo
Removing lib/libcurl_la-llist.o
Removing lib/libcurl_la-macos.lo
Removing lib/libcurl_la-macos.o
Removing lib/libcurl_la-md4.lo
Removing lib/libcurl_la-md4.o
Removing lib/libcurl_la-md5.lo
Removing lib/libcurl_la-md5.o
Removing lib/libcurl_la-memdebug.lo
Removing lib/libcurl_la-memdebug.o
Removing lib/libcurl_la-mime.lo
Removing lib/libcurl_la-mime.o
Removing lib/libcurl_la-mprintf.lo
Removing lib/libcurl_la-mprintf.o
Removing lib/libcurl_la-mqtt.lo
Removing lib/libcurl_la-mqtt.o
Removing lib/libcurl_la-multi.lo
Removing lib/libcurl_la-multi.o
Removing lib/libcurl_la-netrc.lo
Removing lib/libcurl_la-netrc.o
Removing lib/libcurl_la-nonblock.lo
Removing lib/libcurl_la-nonblock.o
Removing lib/libcurl_la-noproxy.lo
Removing lib/libcurl_la-noproxy.o
Removing lib/libcurl_la-openldap.lo
Removing lib/libcurl_la-openldap.o
Removing lib/libcurl_la-parsedate.lo
Removing lib/libcurl_la-parsedate.o
Removing lib/libcurl_la-pingpong.lo
Removing lib/libcurl_la-pingpong.o
Removing lib/libcurl_la-pop3.lo
Removing lib/libcurl_la-pop3.o
Removing lib/libcurl_la-progress.lo
Removing lib/libcurl_la-progress.o
Removing lib/libcurl_la-psl.lo
Removing lib/libcurl_la-psl.o
Removing lib/libcurl_la-rand.lo
Removing lib/libcurl_la-rand.o
Removing lib/libcurl_la-rename.lo
Removing lib/libcurl_la-rename.o
Removing lib/libcurl_la-request.lo
Removing lib/libcurl_la-request.o
Removing lib/libcurl_la-rtsp.lo
Removing lib/libcurl_la-rtsp.o
Removing lib/libcurl_la-select.lo
Removing lib/libcurl_la-select.o
Removing lib/libcurl_la-sendf.lo
Removing lib/libcurl_la-sendf.o
Removing lib/libcurl_la-setopt.lo
Removing lib/libcurl_la-setopt.o
Removing lib/libcurl_la-sha256.lo
Removing lib/libcurl_la-sha256.o
Removing lib/libcurl_la-share.lo
Removing lib/libcurl_la-share.o
Removing lib/libcurl_la-slist.lo
Removing lib/libcurl_la-slist.o
Removing lib/libcurl_la-smb.lo
Removing lib/libcurl_la-smb.o
Removing lib/libcurl_la-smtp.lo
Removing lib/libcurl_la-smtp.o
Removing lib/libcurl_la-socketpair.lo
Removing lib/libcurl_la-socketpair.o
Removing lib/libcurl_la-socks.lo
Removing lib/libcurl_la-socks.o
Removing lib/libcurl_la-socks_gssapi.lo
Removing lib/libcurl_la-socks_gssapi.o
Removing lib/libcurl_la-socks_sspi.lo
Removing lib/libcurl_la-socks_sspi.o
Removing lib/libcurl_la-speedcheck.lo
Removing lib/libcurl_la-speedcheck.o
Removing lib/libcurl_la-splay.lo
Removing lib/libcurl_la-splay.o
Removing lib/libcurl_la-strcase.lo
Removing lib/libcurl_la-strcase.o
Removing lib/libcurl_la-strdup.lo
Removing lib/libcurl_la-strdup.o
Removing lib/libcurl_la-strerror.lo
Removing lib/libcurl_la-strerror.o
Removing lib/libcurl_la-strtok.lo
Removing lib/libcurl_la-strtok.o
Removing lib/libcurl_la-strtoofft.lo
Removing lib/libcurl_la-strtoofft.o
Removing lib/libcurl_la-system_win32.lo
Removing lib/libcurl_la-system_win32.o
Removing lib/libcurl_la-telnet.lo
Removing lib/libcurl_la-telnet.o
Removing lib/libcurl_la-tftp.lo
Removing lib/libcurl_la-tftp.o
Removing lib/libcurl_la-timediff.lo
Removing lib/libcurl_la-timediff.o
Removing lib/libcurl_la-timeval.lo
Removing lib/libcurl_la-timeval.o
Removing lib/libcurl_la-transfer.lo
Removing lib/libcurl_la-transfer.o
Removing lib/libcurl_la-url.lo
Removing lib/libcurl_la-url.o
Removing lib/libcurl_la-urlapi.lo
Removing lib/libcurl_la-urlapi.o
Removing lib/libcurl_la-version.lo
Removing lib/libcurl_la-version.o
Removing lib/libcurl_la-version_win32.lo
Removing lib/libcurl_la-version_win32.o
Removing lib/libcurl_la-warnless.lo
Removing lib/libcurl_la-warnless.o
Removing lib/libcurl_la-ws.lo
Removing lib/libcurl_la-ws.o
Removing lib/nonblock.o
Removing lib/stamp-h1
Removing lib/strtoofft.o
Removing lib/timediff.o
Removing lib/vauth/.deps/
Removing lib/vauth/.dirstamp
Removing lib/vauth/libcurl_la-cleartext.lo
Removing lib/vauth/libcurl_la-cleartext.o
Removing lib/vauth/libcurl_la-cram.lo
Removing lib/vauth/libcurl_la-cram.o
Removing lib/vauth/libcurl_la-digest.lo
Removing lib/vauth/libcurl_la-digest.o
Removing lib/vauth/libcurl_la-digest_sspi.lo
Removing lib/vauth/libcurl_la-digest_sspi.o
Removing lib/vauth/libcurl_la-gsasl.lo
Removing lib/vauth/libcurl_la-gsasl.o
Removing lib/vauth/libcurl_la-krb5_gssapi.lo
Removing lib/vauth/libcurl_la-krb5_gssapi.o
Removing lib/vauth/libcurl_la-krb5_sspi.lo
Removing lib/vauth/libcurl_la-krb5_sspi.o
Removing lib/vauth/libcurl_la-ntlm.lo
Removing lib/vauth/libcurl_la-ntlm.o
Removing lib/vauth/libcurl_la-ntlm_sspi.lo
Removing lib/vauth/libcurl_la-ntlm_sspi.o
Removing lib/vauth/libcurl_la-oauth2.lo
Removing lib/vauth/libcurl_la-oauth2.o
Removing lib/vauth/libcurl_la-spnego_gssapi.lo
Removing lib/vauth/libcurl_la-spnego_gssapi.o
Removing lib/vauth/libcurl_la-spnego_sspi.lo
Removing lib/vauth/libcurl_la-spnego_sspi.o
Removing lib/vauth/libcurl_la-vauth.lo
Removing lib/vauth/libcurl_la-vauth.o
Removing lib/version_win32.o
Removing lib/vquic/.deps/
Removing lib/vquic/.dirstamp
Removing lib/vquic/libcurl_la-curl_msh3.lo
Removing lib/vquic/libcurl_la-curl_msh3.o
Removing lib/vquic/libcurl_la-curl_ngtcp2.lo
Removing lib/vquic/libcurl_la-curl_ngtcp2.o
Removing lib/vquic/libcurl_la-curl_osslq.lo
Removing lib/vquic/libcurl_la-curl_osslq.o
Removing lib/vquic/libcurl_la-curl_quiche.lo
Removing lib/vquic/libcurl_la-curl_quiche.o
Removing lib/vquic/libcurl_la-vquic-tls.lo
Removing lib/vquic/libcurl_la-vquic-tls.o
Removing lib/vquic/libcurl_la-vquic.lo
Removing lib/vquic/libcurl_la-vquic.o
Removing lib/vssh/.deps/
Removing lib/vssh/.dirstamp
Removing lib/vssh/libcurl_la-libssh.lo
Removing lib/vssh/libcurl_la-libssh.o
Removing lib/vssh/libcurl_la-libssh2.lo
Removing lib/vssh/libcurl_la-libssh2.o
Removing lib/vssh/libcurl_la-wolfssh.lo
Removing lib/vssh/libcurl_la-wolfssh.o
Removing lib/vtls/.deps/
Removing lib/vtls/.dirstamp
Removing lib/vtls/libcurl_la-bearssl.lo
Removing lib/vtls/libcurl_la-bearssl.o
Removing lib/vtls/libcurl_la-cipher_suite.lo
Removing lib/vtls/libcurl_la-cipher_suite.o
Removing lib/vtls/libcurl_la-gtls.lo
Removing lib/vtls/libcurl_la-gtls.o
Removing lib/vtls/libcurl_la-hostcheck.lo
Removing lib/vtls/libcurl_la-hostcheck.o
Removing lib/vtls/libcurl_la-keylog.lo
Removing lib/vtls/libcurl_la-keylog.o
Removing lib/vtls/libcurl_la-mbedtls.lo
Removing lib/vtls/libcurl_la-mbedtls.o
Removing lib/vtls/libcurl_la-mbedtls_threadlock.lo
Removing lib/vtls/libcurl_la-mbedtls_threadlock.o
Removing lib/vtls/libcurl_la-openssl.lo
Removing lib/vtls/libcurl_la-openssl.o
Removing lib/vtls/libcurl_la-rustls.lo
Removing lib/vtls/libcurl_la-rustls.o
Removing lib/vtls/libcurl_la-schannel.lo
Removing lib/vtls/libcurl_la-schannel.o
Removing lib/vtls/libcurl_la-schannel_verify.lo
Removing lib/vtls/libcurl_la-schannel_verify.o
Removing lib/vtls/libcurl_la-sectransp.lo
Removing lib/vtls/libcurl_la-sectransp.o
Removing lib/vtls/libcurl_la-vtls.lo
Removing lib/vtls/libcurl_la-vtls.o
Removing lib/vtls/libcurl_la-wolfssl.lo
Removing lib/vtls/libcurl_la-wolfssl.o
Removing lib/vtls/libcurl_la-x509asn1.lo
Removing lib/vtls/libcurl_la-x509asn1.o
Removing lib/warnless.o
Removing libcurl.pc
Removing libtool
Removing ltmain.sh
Removing m4/libtool.m4
Removing m4/ltoptions.m4
Removing m4/ltsugar.m4
Removing m4/ltversion.m4
Removing m4/lt~obsolete.m4
Removing missing
Removing packages/Makefile
Removing packages/Makefile.in
Removing packages/vms/Makefile
Removing packages/vms/Makefile.in
Removing scripts/Makefile
Removing scripts/Makefile.in
Removing src/.deps/
Removing src/.libs/
Removing src/Makefile
Removing src/Makefile.in
Removing src/curl
Removing src/slist_wc.o
Removing src/terminal.o
Removing src/tool_binmode.o
Removing src/tool_bname.o
Removing src/tool_ca_embed.c
Removing src/tool_ca_embed.o
Removing src/tool_cb_dbg.o
Removing src/tool_cb_hdr.o
Removing src/tool_cb_prg.o
Removing src/tool_cb_rea.o
Removing src/tool_cb_see.o
Removing src/tool_cb_soc.o
Removing src/tool_cb_wrt.o
Removing src/tool_cfgable.o
Removing src/tool_dirhie.o
Removing src/tool_doswin.o
Removing src/tool_easysrc.o
Removing src/tool_filetime.o
Removing src/tool_findfile.o
Removing src/tool_formparse.o
Removing src/tool_getparam.o
Removing src/tool_getpass.o
Removing src/tool_help.o
Removing src/tool_helpers.o
Removing src/tool_hugehelp.c
Removing src/tool_hugehelp.o
Removing src/tool_ipfs.o
Removing src/tool_libinfo.o
Removing src/tool_listhelp.o
Removing src/tool_main.o
Removing src/tool_msgs.o
Removing src/tool_operate.o
Removing src/tool_operhlp.o
Removing src/tool_paramhlp.o
Removing src/tool_parsecfg.o
Removing src/tool_progress.o
Removing src/tool_setopt.o
Removing src/tool_sleep.o
Removing src/tool_stderr.o
Removing src/tool_strdup.o
Removing src/tool_urlglob.o
Removing src/tool_util.o
Removing src/tool_vms.o
Removing src/tool_writeout.o
Removing src/tool_writeout_json.o
Removing src/tool_xattr.o
Removing src/var.o
Removing tests/Makefile
Removing tests/Makefile.in
Removing tests/certs/Makefile
Removing tests/certs/Makefile.in
Removing tests/certs/scripts/Makefile
Removing tests/certs/scripts/Makefile.in
Removing tests/config
Removing tests/configurehelp.pm
Removing tests/data/Makefile
Removing tests/data/Makefile.in
Removing tests/http/Makefile
Removing tests/http/Makefile.in
Removing tests/http/clients/.deps/
Removing tests/http/clients/Makefile
Removing tests/http/clients/Makefile.in
Removing tests/http/config.ini
Removing tests/libtest/.deps/
Removing tests/libtest/Makefile
Removing tests/libtest/Makefile.in
Removing tests/server/.deps/
Removing tests/server/Makefile
Removing tests/server/Makefile.in
Removing tests/unit/.deps/
Removing tests/unit/Makefile
Removing tests/unit/Makefile.in

$ autoreconf -fi
libtoolize: putting auxiliary files in '.'.
libtoolize: copying file './ltmain.sh'
libtoolize: putting macros in AC_CONFIG_MACRO_DIRS, 'm4'.
libtoolize: copying file 'm4/libtool.m4'
libtoolize: copying file 'm4/ltoptions.m4'
libtoolize: copying file 'm4/ltsugar.m4'
libtoolize: copying file 'm4/ltversion.m4'
libtoolize: copying file 'm4/lt~obsolete.m4'
libtoolize: Remember to add 'LT_INIT' to configure.ac.
configure.ac:125: installing './compile'
configure.ac:437: installing './config.guess'
configure.ac:437: installing './config.sub'
configure.ac:125: installing './install-sh'
configure.ac:131: installing './missing'
docs/examples/Makefile.am: installing './depcomp'

$ bash -c find . -name config.guess -exec cp /usr/share/misc/config.guess {} \;

$ bash -c find . -name config.sub -exec cp /usr/share/misc/config.sub {} \;

$ chmod +x configure

$ ./configure --disable-shared --without-ssl --disable-docs
checking whether to enable maintainer-specific portions of Makefiles... no
checking whether make supports nested variables... yes
checking whether to enable debug build options... no
checking whether to enable compiler optimizer... (assumed) yes
checking whether to enable strict compiler warnings... no
checking whether to enable compiler warnings as errors... no
checking whether to enable curl debug memory tracking... no
checking whether to enable hiding of library internal symbols... yes
checking whether to enable c-ares for DNS lookups... no
checking whether to disable dependency on -lrt... (assumed no)
checking whether to enable HTTPSRR support... no
checking whether to enable ECH support... no
checking for path separator... :
checking for sed... /usr/bin/sed
checking for grep... /usr/bin/grep
checking that grep -E works... yes
checking for ar... /usr/bin/ar
checking for a BSD-compatible install... /usr/bin/install -c
checking for gcc... ccache gcc
checking whether the C compiler works... yes
checking for C compiler default output file name... a.out
checking for suffix of executables...
checking whether we are cross compiling... no
checking for suffix of object files... o
checking whether the compiler supports GNU C... yes
checking whether ccache gcc accepts -g... yes
checking for ccache gcc option to enable C11 features... none needed
checking whether ccache gcc understands -c and -o together... yes
checking how to run the C preprocessor... ccache gcc -E
checking for stdio.h... yes
checking for stdlib.h... yes
checking for string.h... yes
checking for inttypes.h... yes
checking for stdint.h... yes
checking for strings.h... yes
checking for sys/stat.h... yes
checking for sys/types.h... yes
checking for unistd.h... yes
checking for stdatomic.h... yes
checking if _Atomic is available... yes
checking for a sed that does not truncate output... (cached) /usr/bin/sed
checking for code coverage support... no
checking whether build environment is sane... yes
checking for a race-free mkdir -p... /usr/bin/mkdir -p
checking for gawk... gawk
checking whether make sets $(MAKE)... yes
checking whether make supports the include directive... yes (GNU style)
checking dependency style of ccache gcc... gcc3
checking curl version... 8.10.0-DEV
checking for httpd... no
checking for apache2... no
checking for apachectl... no
checking for apxs... no
configure: httpd/apache2 not in PATH, http tests disabled
configure: apxs not in PATH, http tests disabled
checking for nghttpx... no
checking for caddy... /usr/bin/caddy
checking build system type... x86_64-pc-linux-gnu
checking host system type... x86_64-pc-linux-gnu
checking for grep that handles long lines and -e... (cached) /usr/bin/grep
checking for egrep... /usr/bin/grep -E
checking if OS is AIX (to define _ALL_SOURCE)... no
checking if _THREAD_SAFE is already defined... no
checking if _THREAD_SAFE is actually needed... no
checking if _THREAD_SAFE is onwards defined... no
checking if _REENTRANT is already defined... no
checking if _REENTRANT is actually needed... no
checking if _REENTRANT is onwards defined... no
checking for special C compiler options needed for large files... no
checking for _FILE_OFFSET_BITS value needed for large files... no
checking how to print strings... printf
checking for a sed that does not truncate output... (cached) /usr/bin/sed
checking for fgrep... /usr/bin/grep -F
checking for ld used by ccache gcc... /usr/bin/ld
checking if the linker (/usr/bin/ld) is GNU ld... yes
checking for BSD- or MS-compatible name lister (nm)... /usr/bin/nm -B
checking the name lister (/usr/bin/nm -B) interface... BSD nm
checking whether ln -s works... yes
checking the maximum length of command line arguments... 1572864
checking how to convert x86_64-pc-linux-gnu file names to x86_64-pc-linux-gnu format... func_convert_file_noop
checking how to convert x86_64-pc-linux-gnu file names to toolchain format... func_convert_file_noop
checking for /usr/bin/ld option to reload object files... -r
checking for objdump... objdump
checking how to recognize dependent libraries... pass_all
checking for dlltool... no
checking how to associate runtime and link libraries... printf %s\n
checking for archiver @FILE support... @
checking for strip... strip
checking for ranlib... ranlib
checking command to parse /usr/bin/nm -B output from ccache gcc object... ok
checking for sysroot... no
checking for a working dd... /usr/bin/dd
checking how to truncate binary pipes... /usr/bin/dd bs=4096 count=1
checking for mt... mt
checking if mt is a manifest tool... no
checking for dlfcn.h... yes
checking for objdir... .libs
checking if ccache gcc supports -fno-rtti -fno-exceptions... no
checking for ccache gcc option to produce PIC... -fPIC -DPIC
checking if ccache gcc PIC flag -fPIC -DPIC works... yes
checking if ccache gcc static flag -static works... yes
checking if ccache gcc supports -c -o file.o... yes
checking if ccache gcc supports -c -o file.o... (cached) yes
checking whether the ccache gcc linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes
checking dynamic linker characteristics... GNU/Linux ld.so
checking how to hardcode library paths into programs... immediate
checking whether stripping libraries is possible... yes
checking if libtool supports shared libraries... yes
checking whether to build shared libraries... no
checking whether to build static libraries... yes
checking whether to build shared libraries with -version-info... yes
checking whether to build shared libraries with -no-undefined... no
checking whether to build shared libraries with -mimpure-text... no
checking whether to build shared libraries with PIC... yes
checking whether to build static libraries with PIC... yes
checking whether to build shared libraries only... no
checking whether to build static libraries only... yes
checking for windres... no
checking if cpp -P is needed... yes
checking if cpp -P works... yes
checking if compiler is DEC/Compaq/HP C... no
checking if compiler is HP-UX C... no
checking if compiler is IBM C... no
checking if compiler is Intel C... no
checking if compiler is clang... no
checking if compiler is GNU C... yes
checking compiler version... gcc '1100' (raw: '11')
checking if compiler is SunPro C... no
checking if compiler is Tiny C... no
checking whether build target is a native Windows one... no
checking if compiler accepts some basic options... yes
configure: compiler options added: -Werror-implicit-function-declaration
checking if compiler optimizer assumed setting might be used... yes
checking if compiler accepts optimizer enabling options... yes
configure: compiler options added: -O2
checking if compiler accepts strict warning options... yes
configure: compiler options added: -Wno-system-headers
checking if compiler halts on compilation errors... yes
checking if compiler halts on negative sized arrays... yes
checking if compiler halts on function prototype mismatch... yes
checking if compiler supports hiding library internal symbols... yes
checking whether build target supports Win32 file API... no
checking whether build target supports Win32 crypto API... no
checking for good-to-use Darwin CFLAGS... no
checking whether to support http... yes
checking whether to support ftp... yes
checking whether to support file... yes
checking whether to support ldap... yes
checking whether to support ldaps... yes
checking whether to support rtsp... yes
checking whether to support proxies... yes
checking whether to support dict... yes
checking whether to support telnet... yes
checking whether to support tftp... yes
checking whether to support pop3... yes
checking whether to support imap... yes
checking whether to support smb... yes
checking whether to support smtp... yes
checking whether to support gopher... yes
checking whether to support mqtt... no
checking whether to provide built-in manual... yes
checking whether to build documentation... no
checking whether to enable generation of C code... yes
checking whether to use libgcc... no
checking if X/Open network library is required... no
checking for gethostbyname... yes
checking whether build target is a native Windows one... (cached) no
checking for proto/bsdsocket.h... no
checking for connect in libraries... yes
checking for sys/types.h... (cached) yes
checking for sys/time.h... yes
checking for monotonic clock_gettime... yes
checking for clock_gettime in libraries... no additional lib required
checking if monotonic clock_gettime works... yes
checking for sys/types.h... (cached) yes
checking for sys/time.h... (cached) yes
checking for raw monotonic clock_gettime... yes
checking for pkg-config... /usr/bin/pkg-config
checking for zlib options with pkg-config... found
checking for zlib.h... yes
configure: found both libz and libz.h header
checking for BrotliDecoderDecompress in -lbrotlidec... no
checking for brotli/decode.h... no
checking for ZSTD_createDStream in -lzstd... no
checking for zstd.h... no
checking for lber.h... no
checking for ldap.h... no
checking for ldap_ssl.h... no
checking for LDAP libraries... cannot find LDAP libraries
checking whether to enable IPv6... yes
checking if struct sockaddr_in6 has sin6_scope_id member... yes
checking if argv can be written to... yes
checking if GSS-API support is requested... no
checking whether to enable Windows native SSL/TLS... no
checking whether to enable Secure Transport... no
checking whether to enable Amiga native SSL/TLS (AmiSSL v5)... no
checking for pkg-config... (cached) /usr/bin/pkg-config
checking for libpsl options with pkg-config... found
checking for psl_builtin in -lpsl... yes
checking for libpsl.h... yes
checking for library containing gsasl_init... no
checking for RTMP_Init in -lrtmp... no
checking whether versioned symbols are wanted... no
checking whether to enable Windows native IDN (Windows native builds only)... no
checking whether to build with libidn2... (assumed) yes
checking for pkg-config... (cached) /usr/bin/pkg-config
checking for libidn2 options with pkg-config... no
configure: IDN_LIBS: "-lidn2"
configure: IDN_LDFLAGS: ""
configure: IDN_CPPFLAGS: ""
configure: IDN_DIR: ""
checking if idn2_lookup_ul can be linked... no
checking for idn2.h... no
checking for pkg-config... (cached) /usr/bin/pkg-config
checking for libnghttp2 options with pkg-config... no
checking for nghttp2_session_get_stream_local_window_size in -lnghttp2... no
checking for sys/types.h... (cached) yes
checking for sys/time.h... (cached) yes
checking for sys/select.h... yes
checking for sys/socket.h... yes
checking for sys/ioctl.h... yes
checking for unistd.h... (cached) yes
checking for stdlib.h... (cached) yes
checking for arpa/inet.h... yes
checking for net/if.h... yes
checking for netinet/in.h... yes
checking for netinet/in6.h... no
checking for sys/un.h... yes
checking for linux/tcp.h... yes
checking for netinet/tcp.h... yes
checking for netinet/udp.h... yes
checking for netdb.h... yes
checking for sys/sockio.h... no
checking for sys/stat.h... (cached) yes
checking for sys/param.h... yes
checking for termios.h... yes
checking for termio.h... yes
checking for fcntl.h... yes
checking for io.h... no
checking for pwd.h... yes
checking for utime.h... yes
checking for sys/utime.h... no
checking for sys/poll.h... yes
checking for poll.h... yes
checking for socket.h... no
checking for sys/resource.h... yes
checking for libgen.h... yes
checking for locale.h... yes
checking for stdbool.h... yes
checking for sys/filio.h... no
checking for sys/wait.h... yes
checking for sys/eventfd.h... yes
checking for setjmp.h... yes
checking for an ANSI C-conforming const... yes
checking for size_t... yes
checking for sys/types.h... (cached) yes
checking for sys/time.h... (cached) yes
checking for sys/socket.h... (cached) yes
checking for struct timeval... yes
checking run-time libs availability... fine
checking size of size_t... 8
checking size of long... 8
checking size of int... 4
checking size of time_t... 8
checking size of off_t... 8
checking size of curl_off_t... 8
checking size of curl_socket_t... 4
checking for long long... yes
checking for ssize_t... yes
checking for bool... yes
checking for sa_family_t... yes
checking for suseconds_t... yes
checking if time_t is unsigned... no
checking for in_addr_t... yes
checking for struct sockaddr_storage... yes
checking for sys/select.h... (cached) yes
checking for sys/socket.h... (cached) yes
checking for select... yes
checking for sys/types.h... (cached) yes
checking for sys/socket.h... (cached) yes
checking for recv... yes
checking for sys/types.h... (cached) yes
checking for sys/socket.h... (cached) yes
checking for send... yes
checking for sys/types.h... (cached) yes
checking for sys/socket.h... (cached) yes
checking for MSG_NOSIGNAL... yes
checking for sys/types.h... (cached) yes
checking for unistd.h... (cached) yes
checking if alarm can be linked... yes
checking if alarm is prototyped... yes
checking if alarm is compilable... yes
checking if alarm usage allowed... yes
checking if alarm might be used... yes
checking for sys/types.h... (cached) yes
checking for strings.h... (cached) yes
checking for sys/types.h... (cached) yes
checking for libgen.h... (cached) yes
checking if basename can be linked... yes
checking if basename is prototyped... yes
checking if basename is compilable... yes
checking if basename usage allowed... yes
checking if basename might be used... yes
checking for sys/types.h... (cached) yes
checking for socket.h... (cached) no
checking if closesocket can be linked... no
checking if closesocket might be used... no
checking for sys/types.h... (cached) yes
checking for sys/socket.h... (cached) yes
checking if CloseSocket can be linked... no
checking if CloseSocket might be used... no
checking for sys/types.h... (cached) yes
checking for unistd.h... (cached) yes
checking for fcntl.h... (cached) yes
checking if fcntl can be linked... yes
checking if fcntl is prototyped... yes
checking if fcntl is compilable... yes
checking if fcntl usage allowed... yes
checking if fcntl might be used... yes
checking if fcntl O_NONBLOCK is compilable... yes
checking if fcntl O_NONBLOCK usage allowed... yes
checking if fcntl O_NONBLOCK might be used... yes
checking whether build target is a native Windows one... (cached) no
checking for sys/types.h... (cached) yes
checking for netdb.h... (cached) yes
checking if freeaddrinfo can be linked... yes
checking if freeaddrinfo is prototyped... yes
checking if freeaddrinfo is compilable... yes
checking if freeaddrinfo usage allowed... yes
checking if freeaddrinfo might be used... yes
checking for sys/types.h... (cached) yes
checking for sys/xattr.h... yes
checking if fsetxattr can be linked... yes
checking if fsetxattr is prototyped... yes
checking if fsetxattr takes 5 args.... yes
checking if fsetxattr is compilable... yes
checking if fsetxattr usage allowed... yes
checking if fsetxattr might be used... yes
checking if ftruncate can be linked... yes
checking if ftruncate is prototyped... yes
checking if ftruncate is compilable... yes
checking if ftruncate usage allowed... yes
checking if ftruncate might be used... yes
checking for sys/types.h... (cached) yes
checking if getaddrinfo can be linked... yes
checking if getaddrinfo is prototyped... yes
checking if getaddrinfo is compilable... yes
checking if getaddrinfo seems to work... yes
checking if getaddrinfo usage allowed... yes
checking if getaddrinfo might be used... yes
checking if getaddrinfo is threadsafe... yes
checking if gethostbyname can be linked... yes
checking if gethostbyname is prototyped... yes
checking if gethostbyname is compilable... yes
checking if gethostbyname usage allowed... yes
checking if gethostbyname might be used... yes
checking if gethostbyname_r can be linked... yes
checking if gethostbyname_r is prototyped... yes
checking if gethostbyname_r takes 3 args.... no
checking if gethostbyname_r takes 5 args.... no
checking if gethostbyname_r takes 6 args.... yes
checking if gethostbyname_r is compilable... yes
checking if gethostbyname_r usage allowed... yes
checking if gethostbyname_r might be used... yes
checking if gethostname can be linked... yes
checking if gethostname is prototyped... yes
checking if gethostname is compilable... yes
checking for gethostname arg 2 data type... size_t
checking if gethostname usage allowed... yes
checking if gethostname might be used... yes
checking if getpeername can be linked... yes
checking if getpeername is prototyped... yes
checking if getpeername is compilable... yes
checking if getpeername usage allowed... yes
checking if getpeername might be used... yes
checking if getsockname can be linked... yes
checking if getsockname is prototyped... yes
checking if getsockname is compilable... yes
checking if getsockname usage allowed... yes
checking if getsockname might be used... yes
checking for net/if.h... (cached) yes
checking if if_nametoindex can be linked... yes
checking if if_nametoindex is prototyped... yes
checking if if_nametoindex is compilable... yes
checking if if_nametoindex usage allowed... yes
checking if if_nametoindex might be used... yes
checking for sys/types.h... (cached) yes
checking for sys/socket.h... (cached) yes
checking for netinet/in.h... (cached) yes
checking for ifaddrs.h... yes
checking if getifaddrs can be linked... yes
checking if getifaddrs is prototyped... yes
checking if getifaddrs is compilable... yes
checking if getifaddrs seems to work... yes
checking if getifaddrs usage allowed... yes
checking if getifaddrs might be used... yes
checking for sys/types.h... (cached) yes
checking for sys/time.h... (cached) yes
checking if gmtime_r can be linked... yes
checking if gmtime_r is prototyped... yes
checking if gmtime_r is compilable... yes
checking if gmtime_r seems to work... yes
checking if gmtime_r usage allowed... yes
checking if gmtime_r might be used... yes
checking for sys/types.h... (cached) yes
checking for sys/socket.h... (cached) yes
checking for netinet/in.h... (cached) yes
checking for arpa/inet.h... (cached) yes
checking if inet_ntop can be linked... yes
checking if inet_ntop is prototyped... yes
checking if inet_ntop is compilable... yes
checking if inet_ntop seems to work... yes
checking if inet_ntop usage allowed... yes
checking if inet_ntop might be used... yes
checking if inet_pton can be linked... yes
checking if inet_pton is prototyped... yes
checking if inet_pton is compilable... yes
checking if inet_pton seems to work... yes
checking if inet_pton usage allowed... yes
checking if inet_pton might be used... yes
checking for sys/types.h... (cached) yes
checking for unistd.h... (cached) yes
checking for sys/socket.h... (cached) yes
checking for sys/ioctl.h... (cached) yes
checking for stropts.h... no
checking if ioctl can be linked... yes
checking if ioctl is prototyped... yes
checking if ioctl is compilable... yes
checking if ioctl usage allowed... yes
checking if ioctl might be used... yes
checking if ioctl FIONBIO is compilable... yes
checking if ioctl FIONBIO usage allowed... yes
checking if ioctl FIONBIO might be used... yes
checking if ioctl SIOCGIFADDR is compilable... yes
checking if ioctl SIOCGIFADDR usage allowed... yes
checking if ioctl SIOCGIFADDR might be used... yes
checking if ioctlsocket can be linked... no
checking if ioctlsocket might be used... no
checking if IoctlSocket can be linked... no
checking if IoctlSocket might be used... no
checking if memrchr can be linked... yes
checking if memrchr is prototyped... no
checking if memrchr might be used... no
checking for sys/types.h... (cached) yes
checking for poll.h... (cached) yes
checking for sys/poll.h... (cached) yes
checking if poll can be linked... yes
checking if poll is prototyped... yes
checking if poll is compilable... yes
checking if poll seems to work... yes
checking if poll usage allowed... yes
checking if poll might be used... yes
checking for sys/types.h... (cached) yes
checking if sigaction can be linked... yes
checking if sigaction is prototyped... yes
checking if sigaction is compilable... yes
checking if sigaction usage allowed... yes
checking if sigaction might be used... yes
checking if siginterrupt can be linked... yes
checking if siginterrupt is prototyped... yes
checking if siginterrupt is compilable... yes
checking if siginterrupt usage allowed... yes
checking if siginterrupt might be used... yes
checking if signal can be linked... yes
checking if signal is prototyped... yes
checking if signal is compilable... yes
checking if signal usage allowed... yes
checking if signal might be used... yes
checking for sys/types.h... (cached) yes
checking if sigsetjmp can be linked... no
checking if sigsetjmp seems a macro... yes
checking if sigsetjmp is compilable... yes
checking if sigsetjmp usage allowed... yes
checking if sigsetjmp might be used... yes
checking if socket can be linked... yes
checking if socket is prototyped... yes
checking if socket is compilable... yes
checking if socket usage allowed... yes
checking if socket might be used... yes
checking if socketpair can be linked... yes
checking if socketpair is prototyped... yes
checking if socketpair is compilable... yes
checking if socketpair usage allowed... yes
checking if socketpair might be used... yes
checking if strcasecmp can be linked... yes
checking if strcasecmp is prototyped... yes
checking if strcasecmp is compilable... yes
checking if strcasecmp usage allowed... yes
checking if strcasecmp might be used... yes
checking if strcmpi can be linked... no
checking if strcmpi might be used... no
checking if strdup can be linked... yes
checking if strdup is prototyped... yes
checking if strdup is compilable... yes
checking if strdup usage allowed... yes
checking if strdup might be used... yes
checking if strerror_r can be linked... yes
checking if strerror_r is prototyped... yes
checking if strerror_r is compilable... yes
checking if strerror_r is glibc like... no
checking if strerror_r is POSIX like... yes
checking if strerror_r seems to work... yes
checking if strerror_r usage allowed... yes
checking if strerror_r might be used... yes
checking if stricmp can be linked... no
checking if stricmp might be used... no
checking if strtok_r can be linked... yes
checking if strtok_r is prototyped... yes
checking if strtok_r is compilable... yes
checking if strtok_r usage allowed... yes
checking if strtok_r might be used... yes
checking if strtoll can be linked... yes
checking if strtoll is prototyped... yes
checking if strtoll is compilable... yes
checking if strtoll usage allowed... yes
checking if strtoll might be used... yes
checking for ccache gcc options needed to detect all undeclared functions... none needed
checking whether getpwuid_r is declared... yes
checking for _fseeki64... no
checking for arc4random... no
checking for eventfd... yes
checking for fnmatch... yes
checking for fseeko... yes
checking for geteuid... yes
checking for getpass_r... no
checking for getppid... yes
checking for getpwuid... yes
checking for getpwuid_r... yes
checking for getrlimit... yes
checking for gettimeofday... yes
checking for if_nametoindex... yes
checking for mach_absolute_time... no
checking for pipe... yes
checking for sched_yield... yes
checking for sendmsg... yes
checking for setlocale... yes
checking for setmode... no
checking for setrlimit... yes
checking for snprintf... yes
checking for utime... yes
checking for utimes... yes
checking whether fseeko is declared... yes
checking how to set a socket into non-blocking mode... fcntl O_NONBLOCK
checking whether to enable the threaded resolver... yes
checking whether to link macOS CoreFoundation, CoreServices, and SystemConfiguration frameworks... no
checking whether to use POSIX threads for threaded resolver... auto
checking for pthread.h... yes
checking for pthread_create... yes
checking for dirent.h... yes
checking for opendir... yes
checking convert -I options to -isystem... yes
checking whether to enable verbose strings... yes
checking whether to enable SSPI support (Windows native builds only)... no
checking whether to enable basic authentication method... yes
checking whether to enable bearer authentication method... yes
checking whether to enable digest authentication method... yes
checking whether to enable kerberos authentication method... yes
checking whether to enable negotiate authentication method... yes
checking whether to enable aws sig methods... yes
checking whether to support NTLM... yes
checking whether to enable TLS-SRP authentication... yes
checking whether to enable Unix domain sockets... auto
checking for struct sockaddr_un.sun_path... yes
checking whether to support cookies... yes
checking whether to support socketpair... yes
checking whether to support HTTP authentication... yes
checking whether to support DoH... yes
checking whether to support the MIME API... yes
checking whether to support binding connections locally... yes
checking whether to support the form API... yes
checking whether to support date parsing... yes
checking whether to support netrc parsing... yes
checking whether to support progress-meter... yes
checking whether to support DNS shuffling... yes
checking whether to support curl_easy_option*... yes
checking whether to support alt-svc... yes
checking whether to support headers-api... yes
configure: disables HSTS due to lack of SSL
checking whether to support WebSockets... no
checking whether hiding of library internal symbols will actually happen... yes
checking if this build supports HTTPS-proxy... no
checking that generated files are newer than configure... done
configure: creating ./config.status
config.status: creating Makefile
config.status: creating docs/Makefile
config.status: creating docs/examples/Makefile
config.status: creating docs/libcurl/Makefile
config.status: creating docs/libcurl/opts/Makefile
config.status: creating docs/cmdline-opts/Makefile
config.status: creating include/Makefile
config.status: creating include/curl/Makefile
config.status: creating src/Makefile
config.status: creating lib/Makefile
config.status: creating scripts/Makefile
config.status: creating lib/libcurl.vers
config.status: creating tests/Makefile
config.status: creating tests/config
config.status: creating tests/certs/Makefile
config.status: creating tests/certs/scripts/Makefile
config.status: creating tests/data/Makefile
config.status: creating tests/server/Makefile
config.status: creating tests/libtest/Makefile
config.status: creating tests/unit/Makefile
config.status: creating tests/http/config.ini
config.status: creating tests/http/Makefile
config.status: creating tests/http/clients/Makefile
config.status: creating packages/Makefile
config.status: creating packages/vms/Makefile
config.status: creating curl-config
config.status: creating libcurl.pc
config.status: creating lib/curl_config.h
config.status: executing depfiles commands
config.status: executing libtool commands
configure: Configured to build curl/libcurl:

Host setup: x86_64-pc-linux-gnu
Install prefix: /usr/local
Compiler: ccache gcc
CFLAGS: -Werror-implicit-function-declaration -O2 -Wno-system-headers
CFLAGS extras:
CPPFLAGS:
LDFLAGS:
LIBS: -lpsl -lz

curl version: 8.10.0-DEV
SSL: no (--with-{openssl,gnutls,mbedtls,wolfssl,schannel,secure-transport,amissl,bearssl,rustls} )
SSH: no (--with-{libssh,libssh2})
zlib: enabled
brotli: no (--with-brotli)
zstd: no (--with-zstd)
GSS-API: no (--with-gssapi)
GSASL: no (libgsasl not found)
TLS-SRP: no (--enable-tls-srp)
resolver: POSIX threaded
IPv6: enabled
Unix sockets: enabled
IDN: no (--with-{libidn2,winidn})
Build docs: no
Build libcurl: Shared=no, Static=yes
Built-in manual: no (--enable-manual)
--libcurl option: enabled (--disable-libcurl-option)
Verbose errors: enabled (--disable-verbose)
Code coverage: disabled
SSPI: no (--enable-sspi)
ca cert bundle: no
ca cert path:
ca fallback:
LDAP: no (--enable-ldap / --with-ldap-lib / --with-lber-lib)
LDAPS: no (--enable-ldaps)
RTSP: enabled
RTMP: no (--with-librtmp)
PSL: enabled
Alt-svc: enabled (--disable-alt-svc)
Headers API: enabled (--disable-headers-api)
HSTS: no (--enable-hsts)
HTTP1: enabled (internal)
HTTP2: no (--with-nghttp2)
HTTP3: no (--with-ngtcp2 --with-nghttp3, --with-quiche, --with-openssl-quic, --with-msh3)
ECH: no (--enable-ech)
WebSockets: no (--enable-websockets)
Protocols: dict file ftp gopher http imap ipfs ipns mqtt pop3 rtsp smtp telnet tftp
Features: alt-svc AsynchDNS IPv6 Largefile libz PSL threadsafe UnixSockets

configure: WARNING: Cannot find libraries for LDAP support: LDAP disabled
configure: WARNING: libgsasl was not found
configure: WARNING: Cannot find libidn2

$ make -j3
Making all in lib
make[1]: Entering directory '/root/asi_db/builds/curl/_worktrees/w0/lib'
make all-am
make[2]: Entering directory '/root/asi_db/builds/curl/_worktrees/w0/lib'
CC libcurl_la-altsvc.lo
CC libcurl_la-amigaos.lo
CC libcurl_la-asyn-ares.lo
CC libcurl_la-base64.lo
CC libcurl_la-asyn-thread.lo
CC libcurl_la-bufq.lo
CC libcurl_la-bufref.lo
CC libcurl_la-c-hyper.lo
CC libcurl_la-cf-h1-proxy.lo
CC libcurl_la-cf-h2-proxy.lo
CC libcurl_la-cf-haproxy.lo
CC libcurl_la-cf-https-connect.lo
CC libcurl_la-cf-socket.lo
CC libcurl_la-cfilters.lo
CC libcurl_la-conncache.lo
CC libcurl_la-connect.lo
CC libcurl_la-content_encoding.lo
CC libcurl_la-cookie.lo
CC libcurl_la-curl_addrinfo.lo
CC libcurl_la-curl_des.lo
CC libcurl_la-curl_endian.lo
CC libcurl_la-curl_fnmatch.lo
CC libcurl_la-curl_get_line.lo
CC libcurl_la-curl_gethostname.lo
CC libcurl_la-curl_gssapi.lo
CC libcurl_la-curl_memrchr.lo
CC libcurl_la-curl_multibyte.lo
CC libcurl_la-curl_ntlm_core.lo
CC libcurl_la-curl_path.lo
CC libcurl_la-curl_range.lo
CC libcurl_la-curl_rtmp.lo
CC libcurl_la-curl_sasl.lo
CC libcurl_la-curl_sha512_256.lo
CC libcurl_la-curl_sspi.lo
CC libcurl_la-curl_threads.lo
CC libcurl_la-curl_trc.lo
CC libcurl_la-cw-out.lo
CC libcurl_la-dict.lo
CC libcurl_la-dllmain.lo
CC libcurl_la-doh.lo
CC libcurl_la-dynbuf.lo
CC libcurl_la-dynhds.lo
CC libcurl_la-easy.lo
CC libcurl_la-easygetopt.lo
CC libcurl_la-easyoptions.lo
CC libcurl_la-escape.lo
CC libcurl_la-file.lo
CC libcurl_la-fileinfo.lo
CC libcurl_la-fopen.lo
CC libcurl_la-formdata.lo
CC libcurl_la-ftp.lo
CC libcurl_la-ftplistparser.lo
CC libcurl_la-getenv.lo
CC libcurl_la-getinfo.lo
CC libcurl_la-gopher.lo
CC libcurl_la-hash.lo
CC libcurl_la-headers.lo
CC libcurl_la-hmac.lo
CC libcurl_la-hostasyn.lo
CC libcurl_la-hostip.lo
CC libcurl_la-hostip4.lo
CC libcurl_la-hostip6.lo
CC libcurl_la-hostsyn.lo
CC libcurl_la-hsts.lo
CC libcurl_la-http.lo
CC libcurl_la-http1.lo
CC libcurl_la-http2.lo
CC libcurl_la-http_aws_sigv4.lo
CC libcurl_la-http_chunks.lo
CC libcurl_la-http_digest.lo
CC libcurl_la-http_negotiate.lo
CC libcurl_la-http_ntlm.lo
CC libcurl_la-http_proxy.lo
CC libcurl_la-idn.lo
CC libcurl_la-if2ip.lo
CC libcurl_la-imap.lo
CC libcurl_la-inet_ntop.lo
CC libcurl_la-inet_pton.lo
CC libcurl_la-krb5.lo
CC libcurl_la-ldap.lo
CC libcurl_la-llist.lo
CC libcurl_la-macos.lo
CC libcurl_la-md4.lo
CC libcurl_la-md5.lo
CC libcurl_la-memdebug.lo
CC libcurl_la-mime.lo
CC libcurl_la-mprintf.lo
CC libcurl_la-mqtt.lo
CC libcurl_la-multi.lo
CC libcurl_la-netrc.lo
CC libcurl_la-nonblock.lo
CC libcurl_la-noproxy.lo
CC libcurl_la-openldap.lo
CC libcurl_la-parsedate.lo
CC libcurl_la-pingpong.lo
CC libcurl_la-pop3.lo
CC libcurl_la-progress.lo
CC libcurl_la-psl.lo
CC libcurl_la-rand.lo
CC libcurl_la-rename.lo
CC libcurl_la-request.lo
CC libcurl_la-rtsp.lo
CC libcurl_la-select.lo
CC libcurl_la-sendf.lo
CC libcurl_la-setopt.lo
CC libcurl_la-sha256.lo
CC libcurl_la-share.lo
CC libcurl_la-slist.lo
CC libcurl_la-smb.lo
CC libcurl_la-smtp.lo
CC libcurl_la-socketpair.lo
CC libcurl_la-socks.lo
CC libcurl_la-socks_gssapi.lo
CC libcurl_la-socks_sspi.lo
CC libcurl_la-speedcheck.lo
CC libcurl_la-splay.lo
CC libcurl_la-strcase.lo
CC libcurl_la-strdup.lo
CC libcurl_la-strerror.lo
CC libcurl_la-strtok.lo
CC libcurl_la-strtoofft.lo
CC libcurl_la-system_win32.lo
CC libcurl_la-telnet.lo
CC libcurl_la-tftp.lo
CC libcurl_la-timediff.lo
CC libcurl_la-timeval.lo
CC libcurl_la-transfer.lo
CC libcurl_la-url.lo
CC libcurl_la-urlapi.lo
CC libcurl_la-version.lo
CC libcurl_la-version_win32.lo
CC libcurl_la-warnless.lo
CC libcurl_la-ws.lo
CC vauth/libcurl_la-cleartext.lo
CC vauth/libcurl_la-cram.lo
CC vauth/libcurl_la-digest.lo
CC vauth/libcurl_la-digest_sspi.lo
CC vauth/libcurl_la-krb5_gssapi.lo
CC vauth/libcurl_la-gsasl.lo
CC vauth/libcurl_la-krb5_sspi.lo
CC vauth/libcurl_la-ntlm.lo
CC vauth/libcurl_la-ntlm_sspi.lo
CC vauth/libcurl_la-oauth2.lo
CC vauth/libcurl_la-spnego_gssapi.lo
CC vauth/libcurl_la-spnego_sspi.lo
CC vauth/libcurl_la-vauth.lo
CC vtls/libcurl_la-bearssl.lo
CC vtls/libcurl_la-cipher_suite.lo
CC vtls/libcurl_la-gtls.lo
CC vtls/libcurl_la-hostcheck.lo
CC vtls/libcurl_la-keylog.lo
CC vtls/libcurl_la-mbedtls.lo
CC vtls/libcurl_la-mbedtls_threadlock.lo
CC vtls/libcurl_la-openssl.lo
CC vtls/libcurl_la-rustls.lo
CC vtls/libcurl_la-schannel.lo
CC vtls/libcurl_la-schannel_verify.lo
CC vtls/libcurl_la-sectransp.lo
CC vtls/libcurl_la-vtls.lo
CC vtls/libcurl_la-wolfssl.lo
CC vtls/libcurl_la-x509asn1.lo
CC vquic/libcurl_la-curl_msh3.lo
CC vquic/libcurl_la-curl_ngtcp2.lo
CC vquic/libcurl_la-curl_osslq.lo
CC vquic/libcurl_la-curl_quiche.lo
CC vquic/libcurl_la-vquic.lo
CC vssh/libcurl_la-libssh.lo
CC vquic/libcurl_la-vquic-tls.lo
CC vssh/libcurl_la-libssh2.lo
CC vssh/libcurl_la-wolfssh.lo
CCLD libcurl.la
make[2]: Leaving directory '/root/asi_db/builds/curl/_worktrees/w0/lib'
make[1]: Leaving directory '/root/asi_db/builds/curl/_worktrees/w0/lib'
Making all in docs
make[1]: Entering directory '/root/asi_db/builds/curl/_worktrees/w0/docs'
Making all in .
make[2]: Entering directory '/root/asi_db/builds/curl/_worktrees/w0/docs'
make[2]: Nothing to be done for 'all-am'.
make[2]: Leaving directory '/root/asi_db/builds/curl/_worktrees/w0/docs'
Making all in cmdline-opts
make[2]: Entering directory '/root/asi_db/builds/curl/_worktrees/w0/docs/cmdline-opts'
make[2]: Nothing to be done for 'all'.
make[2]: Leaving directory '/root/asi_db/builds/curl/_worktrees/w0/docs/cmdline-opts'
Making all in libcurl
make[2]: Entering directory '/root/asi_db/builds/curl/_worktrees/w0/docs/libcurl'
Making all in opts
make[3]: Entering directory '/root/asi_db/builds/curl/_worktrees/w0/docs/libcurl/opts'
make[3]: Nothing to be done for 'all'.
make[3]: Leaving directory '/root/asi_db/builds/curl/_worktrees/w0/docs/libcurl/opts'
make[3]: Entering directory '/root/asi_db/builds/curl/_worktrees/w0/docs/libcurl'
make[3]: Nothing to be done for 'all-am'.
make[3]: Leaving directory '/root/asi_db/builds/curl/_worktrees/w0/docs/libcurl'
make[2]: Leaving directory '/root/asi_db/builds/curl/_worktrees/w0/docs/libcurl'
make[1]: Leaving directory '/root/asi_db/builds/curl/_worktrees/w0/docs'
Making all in src
make[1]: Entering directory '/root/asi_db/builds/curl/_worktrees/w0/src'
CC slist_wc.o
CC terminal.o
CC tool_binmode.o
CC tool_bname.o
CC tool_cb_dbg.o
CC tool_cb_hdr.o
CC tool_cb_prg.o
CC tool_cb_rea.o
CC tool_cb_see.o
CC tool_cb_soc.o
CC tool_cb_wrt.o
CC tool_cfgable.o
CC tool_dirhie.o
CC tool_doswin.o
CC tool_easysrc.o
CC tool_filetime.o
CC tool_findfile.o
CC tool_formparse.o
CC tool_getparam.o
CC tool_getpass.o
CC tool_help.o
CC tool_helpers.o
echo '#include "tool_hugehelp.h"' >> tool_hugehelp.c
CC tool_ipfs.o
CC tool_libinfo.o
CC tool_listhelp.o
CC tool_main.o
CC tool_msgs.o
CC tool_operate.o
CC tool_operhlp.o
CC tool_paramhlp.o
CC tool_parsecfg.o
CC tool_progress.o
CC tool_setopt.o
CC tool_sleep.o
CC tool_stderr.o
CC tool_strdup.o
CC tool_urlglob.o
CC tool_util.o
CC tool_vms.o
CC tool_writeout.o
CC tool_writeout_json.o
CC tool_xattr.o
CC var.o
echo 'extern const void *curl_ca_embed; const void *curl_ca_embed;' > tool_ca_embed.c
CC tool_hugehelp.o
CC tool_ca_embed.o
CC ../lib/base64.o
CC ../lib/curl_multibyte.o
CC ../lib/dynbuf.o
CC ../lib/nonblock.o
CC ../lib/strtoofft.o
CC ../lib/timediff.o
CC ../lib/version_win32.o
CC ../lib/warnless.o
CCLD curl
make[1]: Leaving directory '/root/asi_db/builds/curl/_worktrees/w0/src'
Making all in scripts
make[1]: Entering directory '/root/asi_db/builds/curl/_worktrees/w0/scripts'
make[1]: Nothing to be done for 'all'.
make[1]: Leaving directory '/root/asi_db/builds/curl/_worktrees/w0/scripts'
make[1]: Entering directory '/root/asi_db/builds/curl/_worktrees/w0'
make[1]: Nothing to be done for 'all-am'.
make[1]: Leaving directory '/root/asi_db/builds/curl/_worktrees/w0'

Commit Diff GitHub →

lib/cf-socket.c +3 -0 lib/conncache.c +12 -9 lib/easy.c +46 -27 lib/http.c +2 -1 lib/multi.c +209 -167 lib/multihandle.h +3 -2 lib/multiif.h +1 -1 lib/sigpipe.h +2 -0 lib/transfer.c +35 -71 lib/transfer.h +1 -1 lib/url.c +2 -2 tests/valgrind.supp +2 -2

lib/cf-socket.c+3 -0

@@ -404,6 +404,9 @@ CURLcode Curl_socket_open(struct Curl_easy *data,
	static int socket_close(struct Curl_easy data, struct connectdata conn,
	int use_callback, curl_socket_t sock)
	{
+	if(CURL_SOCKET_BAD == sock)
+	return 0;
+
	if(use_callback && conn && conn->fclosesocket) {
	int rc;
	Curl_multi_closed(data, sock);

lib/conncache.c+12 -9

@@ -131,6 +131,12 @@ int Curl_conncache_init(struct conncache *connc,
	if(!connc->closure_handle)
	return 1; /* bad */
	connc->closure_handle->state.internal = true;
+	/* TODO: this is quirky. We need an internal handle for certain
+	* operations, but we do not add it to the multi (if there is one).
+	* But we give it the multi so that socket event operations can work.
+	* Probably better to have an internal handle owned by the multi that
+	* can be used for conncache operations. */
+	connc->closure_handle->multi = multi;
	#ifdef DEBUGBUILD
	if(getenv("CURL_DEBUG"))
	connc->closure_handle->set.verbose = true;
@@ -146,6 +152,10 @@ int Curl_conncache_init(struct conncache *connc,
	void Curl_conncache_destroy(struct conncache *connc)
	{
	if(connc) {
+	if(connc->closure_handle) {
+	connc->closure_handle->multi = NULL;
+	Curl_close(&connc->closure_handle);
+	}
	Curl_hash_destroy(&connc->hash);
	connc->multi = NULL;
	}
@@ -611,7 +621,8 @@ static void connc_close_all(struct conncache *connc)

	sigpipe_apply(data, &pipe_st);
	Curl_hostcache_clean(data, data->dns.hostcache);
-	Curl_close(&data);
+	connc->closure_handle->multi = NULL;
+	Curl_close(&connc->closure_handle);
	sigpipe_restore(&pipe_st);
	}

@@ -980,14 +991,6 @@ static void connc_disconnect(struct Curl_easy *data,

	Curl_attach_connection(data, conn);

-	if(connc && connc->multi && connc->multi->socket_cb) {
-	struct easy_pollset ps;
-	/* With an empty pollset, all previously polled sockets will be removed
-	* via the multi_socket API callback. */
-	memset(&ps, 0, sizeof(ps));
-	(void)Curl_multi_pollset_ev(connc->multi, data, &ps, &conn->shutdown_poll);
-	}
-
	connc_run_conn_shutdown_handler(data, conn);
	if(do_shutdown) {
	/* Make a last attempt to shutdown handlers and filters, if

lib/easy.c+46 -27

@@ -391,25 +391,22 @@ struct events {
	int running_handles; /* store the returned number */
	};

+	#define DEBUG_EV_POLL 0
+
	/* events_timer
	*
	* Callback that gets called with a new value when the timeout should be
	* updated.
	*/
-
	static int events_timer(struct Curl_multi multi, / multi handle */
	long timeout_ms, /* see above */
	void userp) / private callback pointer */
	{
	struct events *ev = userp;
	(void)multi;
-	if(timeout_ms == -1)
-	/* timeout removed */
-	timeout_ms = 0;
-	else if(timeout_ms == 0)
-	/* timeout is already reached! */
-	timeout_ms = 1; /* trigger asap */
-
+	#if DEBUG_EV_POLL
+	fprintf(stderr, "events_timer: set timeout %ldms\n", timeout_ms);
+	#endif
	ev->ms = timeout_ms;
	ev->msbump = TRUE;
	return 0;
@@ -463,6 +460,7 @@ static int events_socket(struct Curl_easy easy, / easy handle */
	struct events *ev = userp;
	struct socketmonitor *m;
	struct socketmonitor *prev = NULL;
+	bool found = FALSE;

	#if defined(CURL_DISABLE_VERBOSE_STRINGS)
	(void) easy;
@@ -472,7 +470,7 @@ static int events_socket(struct Curl_easy easy, / easy handle */
	m = ev->list;
	while(m) {
	if(m->socket.fd == s) {
-
+	found = TRUE;
	if(what == CURL_POLL_REMOVE) {
	struct socketmonitor *nxt = m->next;
	/* remove this node from the list of monitored sockets */
@@ -481,7 +479,6 @@ static int events_socket(struct Curl_easy easy, / easy handle */
	else
	ev->list = nxt;
	free(m);
-	m = nxt;
	infof(easy, "socket cb: socket %" CURL_FORMAT_SOCKET_T
	" REMOVED", s);
	}
@@ -499,12 +496,13 @@ static int events_socket(struct Curl_easy easy, / easy handle */
	prev = m;
	m = m->next; /* move to next node */
	}
-	if(!m) {
+
+	if(!found) {
	if(what == CURL_POLL_REMOVE) {
-	/* this happens a bit too often, libcurl fix perhaps? */
-	/* fprintf(stderr,
-	"%s: socket %d asked to be REMOVED but not present!\n",
-	__func__, s); */
+	/* should not happen if our logic is correct, but is no drama. */
+	DEBUGF(infof(easy, "socket cb: asked to REMOVE socket %"
+	CURL_FORMAT_SOCKET_T "but not present!", s));
+	DEBUGASSERT(0);
	}
	else {
	m = malloc(sizeof(struct socketmonitor));
@@ -565,14 +563,15 @@ static CURLcode wait_or_timeout(struct Curl_multi multi, struct events ev)
	int pollrc;
	int i;
	struct curltime before;
-	struct curltime after;

	/* populate the fds[] array */
	for(m = ev->list, f = &fds[0]; m; m = m->next) {
	f->fd = m->socket.fd;
	f->events = m->socket.events;
	f->revents = 0;
-	/* fprintf(stderr, "poll() %d check socket %d\n", numfds, f->fd); */
+	#if DEBUG_EV_POLL
+	fprintf(stderr, "poll() %d check socket %d\n", numfds, f->fd);
+	#endif
	f++;
	numfds++;
	}
@@ -580,12 +579,27 @@ static CURLcode wait_or_timeout(struct Curl_multi multi, struct events ev)
	/* get the time stamp to use to figure out how long poll takes */
	before = Curl_now();

-	/* wait for activity or timeout */
-	pollrc = Curl_poll(fds, (unsigned int)numfds, ev->ms);
-	if(pollrc < 0)
-	return CURLE_UNRECOVERABLE_POLL;
-
-	after = Curl_now();
+	if(numfds) {
+	/* wait for activity or timeout */
+	#if DEBUG_EV_POLL
+	fprintf(stderr, "poll(numfds=%d, timeout=%ldms)\n", numfds, ev->ms);
+	#endif
+	pollrc = Curl_poll(fds, (unsigned int)numfds, ev->ms);
+	#if DEBUG_EV_POLL
+	fprintf(stderr, "poll(numfds=%d, timeout=%ldms) -> %d\n",
+	numfds, ev->ms, pollrc);
+	#endif
+	if(pollrc < 0)
+	return CURLE_UNRECOVERABLE_POLL;
+	}
+	else {
+	#if DEBUG_EV_POLL
+	fprintf(stderr, "poll, but no fds, wait timeout=%ldms\n", ev->ms);
+	#endif
+	pollrc = 0;
+	if(ev->ms > 0)
+	Curl_wait_ms(ev->ms);
+	}

	ev->msbump = FALSE; /* reset here */

@@ -618,12 +632,17 @@ static CURLcode wait_or_timeout(struct Curl_multi multi, struct events ev)
	}
	}

-	if(!ev->msbump) {
+
+	if(!ev->msbump && ev->ms >= 0) {
	/* If nothing updated the timeout, we decrease it by the spent time.
	* If it was updated, it has the new timeout time stored already.
	*/
-	timediff_t timediff = Curl_timediff(after, before);
+	timediff_t timediff = Curl_timediff(Curl_now(), before);
	if(timediff > 0) {
+	#if DEBUG_EV_POLL
+	fprintf(stderr, "poll timeout %ldms not updated, decrease by "
+	"time spent %ldms\n", ev->ms, (long)timediff);
+	#endif
	if(timediff > ev->ms)
	ev->ms = 0;
	else
@@ -656,7 +675,7 @@ static CURLcode easy_events(struct Curl_multi *multi)
	{
	/* this struct is made static to allow it to be used after this function
	returns and curl_multi_remove_handle() is called */
-	static struct events evs = {2, FALSE, 0, NULL, 0};
+	static struct events evs = {-1, FALSE, 0, NULL, 0};

	/* if running event-based, do some further multi inits */
	events_setup(multi, &evs);
@@ -1121,7 +1140,7 @@ CURLcode curl_easy_pause(struct Curl_easy *data, int action)
	(data->mstate == MSTATE_PERFORMING \|\|
	data->mstate == MSTATE_RATELIMITING));
	/* Unpausing writes is detected on the next run in
-	* transfer.c:Curl_readwrite(). This is because this may result
+	* transfer.c:Curl_sendrecv(). This is because this may result
	* in a transfer error if the application's callbacks fail */

	/* Set the new keepon state, so it takes effect no matter what error

lib/http.c+2 -1

@@ -4441,7 +4441,8 @@ static CURLcode cr_exp100_read(struct Curl_easy *data,
	}
	/* We are now waiting for a reply from the server or
	* a timeout on our side IFF the request has been fully sent. */
-	DEBUGF(infof(data, "cr_exp100_read, start AWAITING_CONTINUE"));
+	DEBUGF(infof(data, "cr_exp100_read, start AWAITING_CONTINUE, "
+	"timeout %ldms", data->set.expect_100_timeout));
	ctx->state = EXP100_AWAITING_CONTINUE;
	ctx->start = Curl_now();
	Curl_expire(data, data->set.expect_100_timeout, EXPIRE_100_TIMEOUT);

lib/multi.c+209 -167

@@ -94,9 +94,12 @@ static CURLMcode add_next_timeout(struct curltime now,
	struct Curl_multi *multi,
	struct Curl_easy *d);
	static CURLMcode multi_timeout(struct Curl_multi *multi,
+	struct curltime *expire_time,
	long *timeout_ms);
	static void process_pending_handles(struct Curl_multi *multi);
	static void multi_xfer_bufs_free(struct Curl_multi *multi);
+	static void Curl_expire_ex(struct Curl_easy data, const struct curltime nowp,
+	timediff_t milli, expire_id id);

	#ifdef DEBUGBUILD
	static const char * const multi_statename[]={
@@ -418,6 +421,7 @@ struct Curl_multi Curl_multi_handle(size_t hashsize, / socket hash */

	multi->multiplexing = TRUE;
	multi->max_concurrent_streams = 100;
+	multi->last_timeout_ms = -1;

	#ifdef USE_WINSOCK
	multi->wsa_event = WSACreateEvent();
@@ -527,18 +531,6 @@ CURLMcode curl_multi_add_handle(struct Curl_multi *multi,
	happen. */
	Curl_expire(data, 0, EXPIRE_RUN_NOW);

-	/* A somewhat crude work-around for a little glitch in Curl_update_timer()
-	that happens if the lastcall time is set to the same time when the handle
-	is removed as when the next handle is added, as then the check in
-	Curl_update_timer() that prevents calling the application multiple times
-	with the same timer info will not trigger and then the new handle's
-	timeout will not be notified to the app.
-
-	The work-around is thus simply to clear the 'lastcall' variable to force
-	Curl_update_timer() to always trigger a callback to the app when a new
-	easy handle is added */
-	memset(&multi->timer_lastcall, 0, sizeof(multi->timer_lastcall));
-
	rc = Curl_update_timer(multi);
	if(rc) {
	data->multi = NULL; /* not anymore */
@@ -799,6 +791,7 @@ CURLMcode curl_multi_remove_handle(struct Curl_multi *multi,
	bool premature;
	struct Curl_llist_node *e;
	CURLMcode rc;
+	bool removed_timer = FALSE;

	/* First, make some basic checks that the CURLM handle is a good handle */
	if(!GOOD_MULTI_HANDLE(multi))
@@ -849,7 +842,7 @@ CURLMcode curl_multi_remove_handle(struct Curl_multi *multi,
	/* The timer must be shut down before data->multi is set to NULL, else the
	timenode will remain in the splay tree after curl_easy_cleanup is
	called. Do it after multi_done() in case that sets another time! */
-	Curl_expire_clear(data);
+	removed_timer = Curl_expire_clear(data);

	/* the handle is in a list, remove it from whichever it is */
	Curl_node_remove(&data->multi_queue);
@@ -930,9 +923,11 @@ CURLMcode curl_multi_remove_handle(struct Curl_multi *multi,

	process_pending_handles(multi);

-	rc = Curl_update_timer(multi);
-	if(rc)
-	return rc;
+	if(removed_timer) {
+	rc = Curl_update_timer(multi);
+	if(rc)
+	return rc;
+	}
	return CURLM_OK;
	}

@@ -1167,7 +1162,6 @@ CURLMcode curl_multi_fdset(struct Curl_multi *multi,
	Some easy handles may not have connected to the remote host yet,
	and then we must make sure that is done. */
	int this_max_fd = -1;
-	struct easy_pollset ps;
	struct Curl_llist_node *e;
	(void)exc_fd_set; /* not used */

@@ -1177,23 +1171,22 @@ CURLMcode curl_multi_fdset(struct Curl_multi *multi,
	if(multi->in_callback)
	return CURLM_RECURSIVE_API_CALL;

-	memset(&ps, 0, sizeof(ps));
	for(e = Curl_llist_head(&multi->process); e; e = Curl_node_next(e)) {
	struct Curl_easy *data = Curl_node_elem(e);
	unsigned int i;

-	multi_getsock(data, &ps);
+	multi_getsock(data, &data->last_poll);

-	for(i = 0; i < ps.num; i++) {
-	if(!FDSET_SOCK(ps.sockets[i]))
+	for(i = 0; i < data->last_poll.num; i++) {
+	if(!FDSET_SOCK(data->last_poll.sockets[i]))
	/* pretend it does not exist */
	continue;
-	if(ps.actions[i] & CURL_POLL_IN)
-	FD_SET(ps.sockets[i], read_fd_set);
-	if(ps.actions[i] & CURL_POLL_OUT)
-	FD_SET(ps.sockets[i], write_fd_set);
-	if((int)ps.sockets[i] > this_max_fd)
-	this_max_fd = (int)ps.sockets[i];
+	if(data->last_poll.actions[i] & CURL_POLL_IN)
+	FD_SET(data->last_poll.sockets[i], read_fd_set);
+	if(data->last_poll.actions[i] & CURL_POLL_OUT)
+	FD_SET(data->last_poll.sockets[i], write_fd_set);
+	if((int)data->last_poll.sockets[i] > this_max_fd)
+	this_max_fd = (int)data->last_poll.sockets[i];
	}
	}

@@ -1208,7 +1201,6 @@ CURLMcode curl_multi_waitfds(struct Curl_multi *multi,
	unsigned int *fd_count)
	{
	struct curl_waitfds cwfds;
-	struct easy_pollset ps;
	CURLMcode result = CURLM_OK;
	struct Curl_llist_node *e;

@@ -1222,11 +1214,10 @@ CURLMcode curl_multi_waitfds(struct Curl_multi *multi,
	return CURLM_RECURSIVE_API_CALL;

	Curl_waitfds_init(&cwfds, ufds, size);
-	memset(&ps, 0, sizeof(ps));
	for(e = Curl_llist_head(&multi->process); e; e = Curl_node_next(e)) {
	struct Curl_easy *data = Curl_node_elem(e);
-	multi_getsock(data, &ps);
-	if(Curl_waitfds_add_ps(&cwfds, &ps)) {
+	multi_getsock(data, &data->last_poll);
+	if(Curl_waitfds_add_ps(&cwfds, &data->last_poll)) {
	result = CURLM_OUT_OF_MEMORY;
	goto out;
	}
@@ -1269,8 +1260,8 @@ static CURLMcode multi_wait(struct Curl_multi *multi,
	bool extrawait, /* when no socket, wait */
	bool use_wakeup)
	{
-	struct easy_pollset ps;
	size_t i;
+	struct curltime expire_time;
	long timeout_internal;
	int retcode = 0;
	struct pollfd a_few_on_stack[NUM_POLLS_ON_STACK];
@@ -1297,14 +1288,13 @@ static CURLMcode multi_wait(struct Curl_multi *multi,
	return CURLM_BAD_FUNCTION_ARGUMENT;

	Curl_pollfds_init(&cpfds, a_few_on_stack, NUM_POLLS_ON_STACK);
-	memset(&ps, 0, sizeof(ps));

	/* Add the curl handles to our pollfds first */
	for(e = Curl_llist_head(&multi->process); e; e = Curl_node_next(e)) {
	struct Curl_easy *data = Curl_node_elem(e);

-	multi_getsock(data, &ps);
-	if(Curl_pollfds_add_ps(&cpfds, &ps)) {
+	multi_getsock(data, &data->last_poll);
+	if(Curl_pollfds_add_ps(&cpfds, &data->last_poll)) {
	result = CURLM_OUT_OF_MEMORY;
	goto out;
	}
@@ -1367,7 +1357,7 @@ static CURLMcode multi_wait(struct Curl_multi *multi,
	* poll. Collecting the sockets may install new timers by protocols
	* and connection filters.
	* Use the shorter one of the internal and the caller requested timeout. */
-	(void)multi_timeout(multi, &timeout_internal);
+	(void)multi_timeout(multi, &expire_time, &timeout_internal);
	if((timeout_internal >= 0) && (timeout_internal < (long)timeout_ms))
	timeout_ms = (int)timeout_internal;

@@ -1443,16 +1433,15 @@ static CURLMcode multi_wait(struct Curl_multi *multi,
	for(e = Curl_llist_head(&multi->process); e && !result;
	e = Curl_node_next(e)) {
	struct Curl_easy *data = Curl_node_elem(e);
-	multi_getsock(data, &ps);

-	for(i = 0; i < ps.num; i++) {
+	for(i = 0; i < data->last_poll.num; i++) {
	wsa_events.lNetworkEvents = 0;
-	if(WSAEnumNetworkEvents(ps.sockets[i], NULL,
+	if(WSAEnumNetworkEvents(data->last_poll.sockets[i], NULL,
	&wsa_events) == 0) {
	if(ret && !pollrc && wsa_events.lNetworkEvents)
	retcode++;
	}
-	WSAEventSelect(ps.sockets[i], multi->wsa_event, 0);
+	WSAEventSelect(data->last_poll.sockets[i], multi->wsa_event, 0);
	}
	}
	}
@@ -2397,7 +2386,7 @@ static CURLMcode multi_runsingle(struct Curl_multi *multi,
	}

	/* read/write data if it is ready to do so */
-	result = Curl_readwrite(data);
+	result = Curl_sendrecv(data, nowp);

	if(data->req.done \|\| (result == CURLE_RECV_ERROR)) {
	/* If CURLE_RECV_ERROR happens early enough, we assume it was a race
@@ -3064,11 +3053,15 @@ void Curl_multi_closed(struct Curl_easy *data, curl_socket_t s)
	if(data) {
	/* if there is still an easy handle associated with this connection */
	struct Curl_multi *multi = data->multi;
+	DEBUGF(infof(data, "Curl_multi_closed, fd=%" CURL_FORMAT_SOCKET_T
+	" multi is %p", s, (void *)multi));
	if(multi) {
	/* this is set if this connection is part of a handle that is added to
	a multi handle, and only then this is necessary */
	struct Curl_sh_entry *entry = sh_getentry(&multi->sockhash, s);

+	DEBUGF(infof(data, "Curl_multi_closed, fd=%" CURL_FORMAT_SOCKET_T
+	" entry is %p", s, (void *)entry));
	if(entry) {
	int rc = 0;
	if(multi->socket_cb) {
@@ -3145,6 +3138,59 @@ static CURLMcode add_next_timeout(struct curltime now,
	return CURLM_OK;
	}

+	struct multi_run_ctx {
+	struct Curl_multi *multi;
+	struct curltime now;
+	size_t run_xfers;
+	SIGPIPE_MEMBER(pipe_st);
+	bool run_conn_cache;
+	};
+
+	static CURLMcode multi_run_expired(struct multi_run_ctx *mrc)
+	{
+	struct Curl_multi *multi = mrc->multi;
+	struct Curl_easy *data = NULL;
+	struct Curl_tree *t = NULL;
+	CURLMcode result = CURLM_OK;
+
+	/*
+	* The loop following here will go on as long as there are expire-times left
+	* to process (compared to mrc->now) in the splay and 'data' will be
+	* re-assigned for every expired handle we deal with.
+	*/
+	while(1) {
+	/* Check if there is one (more) expired timer to deal with! This function
+	extracts a matching node if there is one */
+	multi->timetree = Curl_splaygetbest(mrc->now, multi->timetree, &t);
+	if(!t)
+	goto out;
+
+	data = Curl_splayget(t); /* assign this for next loop */
+	if(!data)
+	continue;
+
+	(void)add_next_timeout(mrc->now, multi, data);
+	if(data == multi->conn_cache.closure_handle) {
+	mrc->run_conn_cache = TRUE;
+	continue;
+	}
+
+	mrc->run_xfers++;
+	sigpipe_apply(data, &mrc->pipe_st);
+	result = multi_runsingle(multi, &mrc->now, data);
+
+	if(CURLM_OK >= result) {
+	/* get the socket(s) and check if the state has been changed since
+	last */
+	result = singlesocket(multi, data);
+	if(result)
+	goto out;
+	}
+	}
+
+	out:
+	return result;
+	}
	static CURLMcode multi_socket(struct Curl_multi *multi,
	bool checkall,
	curl_socket_t s,
@@ -3153,10 +3199,13 @@ static CURLMcode multi_socket(struct Curl_multi *multi,
	{
	CURLMcode result = CURLM_OK;
	struct Curl_easy *data = NULL;
-	struct Curl_tree *t = NULL;
-	struct curltime now = Curl_now();
-	bool run_conn_cache = FALSE;
-	SIGPIPE_VARIABLE(pipe_st);
+	struct multi_run_ctx mrc;
+
+	(void)ev_bitmask;
+	memset(&mrc, 0, sizeof(mrc));
+	mrc.multi = multi;
+	mrc.now = Curl_now();
+	sigpipe_init(&mrc.pipe_st);

	if(checkall) {
	struct Curl_llist_node *e;
@@ -3171,10 +3220,10 @@ static CURLMcode multi_socket(struct Curl_multi *multi,
	result = singlesocket(multi, Curl_node_elem(e));
	}
	}
-
-	/* or should we fall-through and do the timer-based stuff? */
-	return result;
+	mrc.run_conn_cache = TRUE;
+	goto out;
	}
+
	if(s != CURL_SOCKET_TIMEOUT) {
	struct Curl_sh_entry *entry = sh_getentry(&multi->sockhash, s);

@@ -3201,76 +3250,42 @@ static CURLMcode multi_socket(struct Curl_multi *multi,
	DEBUGASSERT(data->magic == CURLEASY_MAGIC_NUMBER);

	if(data == multi->conn_cache.closure_handle)
-	run_conn_cache = TRUE;
+	mrc.run_conn_cache = TRUE;
	else {
-	if(data->conn && !(data->conn->handler->flags & PROTOPT_DIRLOCK))
-	/* set socket event bitmask if they are not locked */
-	data->state.select_bits \|= (unsigned char)ev_bitmask;
-
-	Curl_expire(data, 0, EXPIRE_RUN_NOW);
+	/* Expire with out current now, so we will get it below when
+	* asking the splaytree for expired transfers. */
+	Curl_expire_ex(data, &mrc.now, 0, EXPIRE_RUN_NOW);
	}
	}
-
-	/* Now we fall-through and do the timer-based stuff, since we do not want
-	to force the user to have to deal with timeouts as long as at least
-	one connection in fact has traffic. */
-
-	now = Curl_now(); /* get a newer time since the multi_runsingle() loop
-	may have taken some time */
	}
	}
-	else {
-	/* Asked to run due to time-out. Clear the 'lastcall' variable to force
-	Curl_update_timer() to trigger a callback to the app again even if the
-	same timeout is still the one to run after this call. That handles the
-	case when the application asks libcurl to run the timeout
-	prematurely. */
-	memset(&multi->timer_lastcall, 0, sizeof(multi->timer_lastcall));
-	}

-	/*
-	* The loop following here will go on as long as there are expire-times left
-	* to process in the splay and 'data' will be re-assigned for every expired
-	* handle we deal with.
-	*/
-	sigpipe_init(&pipe_st);
-	do {
-	if(data == multi->conn_cache.closure_handle)
-	run_conn_cache = TRUE;
-	/* the first loop lap 'data' can be NULL */
-	else if(data) {
-	sigpipe_apply(data, &pipe_st);
-	result = multi_runsingle(multi, &now, data);
-
-	if(CURLM_OK >= result) {
-	/* get the socket(s) and check if the state has been changed since
-	last */
-	result = singlesocket(multi, data);
-	if(result)
-	break;
-	}
-	}
-
-	/* Check if there is one (more) expired timer to deal with! This function
-	extracts a matching node if there is one */
-
-	multi->timetree = Curl_splaygetbest(now, multi->timetree, &t);
-	if(t) {
-	data = Curl_splayget(t); /* assign this for next loop */
-	(void)add_next_timeout(now, multi, data);
-	}
+	result = multi_run_expired(&mrc);
+	if(result)
+	goto out;

-	} while(t);
+	if(mrc.run_xfers) {
+	/* Running transfers takes time. With a new timestamp, we might catch
+	* other expires which are due now. Instead of telling the application
+	* to set a 0 timeout and call us again, we run them here.
+	* Do that only once or it might be unfair to transfers on other
+	* sockets. */
+	mrc.now = Curl_now();
+	result = multi_run_expired(&mrc);
+	}

-	if(run_conn_cache) {
-	sigpipe_apply(multi->conn_cache.closure_handle, &pipe_st);
+	out:
+	if(mrc.run_conn_cache) {
+	sigpipe_apply(multi->conn_cache.closure_handle, &mrc.pipe_st);
	Curl_conncache_multi_perform(multi);
	}
-
-	sigpipe_restore(&pipe_st);
+	sigpipe_restore(&mrc.pipe_st);

	if(running_handles)
	*running_handles = (int)multi->num_alive;
+
+	if(CURLM_OK >= result)
+	result = Curl_update_timer(multi);
	return result;
	}

@@ -3359,39 +3374,28 @@ CURLMcode curl_multi_setopt(struct Curl_multi *multi,
	CURLMcode curl_multi_socket(struct Curl_multi *multi, curl_socket_t s,
	int *running_handles)
	{
-	CURLMcode result;
	if(multi->in_callback)
	return CURLM_RECURSIVE_API_CALL;
-	result = multi_socket(multi, FALSE, s, 0, running_handles);
-	if(CURLM_OK >= result)
-	result = Curl_update_timer(multi);
-	return result;
+	return multi_socket(multi, FALSE, s, 0, running_handles);
	}

	CURLMcode curl_multi_socket_action(struct Curl_multi *multi, curl_socket_t s,
	int ev_bitmask, int *running_handles)
	{
-	CURLMcode result;
	if(multi->in_callback)
	return CURLM_RECURSIVE_API_CALL;
-	result = multi_socket(multi, FALSE, s, ev_bitmask, running_handles);
-	if(CURLM_OK >= result)
-	result = Curl_update_timer(multi);
-	return result;
+	return multi_socket(multi, FALSE, s, ev_bitmask, running_handles);
	}

	CURLMcode curl_multi_socket_all(struct Curl_multi multi, int running_handles)
	{
-	CURLMcode result;
	if(multi->in_callback)
	return CURLM_RECURSIVE_API_CALL;
-	result = multi_socket(multi, TRUE, CURL_SOCKET_BAD, 0, running_handles);
-	if(CURLM_OK >= result)
-	result = Curl_update_timer(multi);
-	return result;
+	return multi_socket(multi, TRUE, CURL_SOCKET_BAD, 0, running_handles);
	}

	static CURLMcode multi_timeout(struct Curl_multi *multi,
+	struct curltime *expire_time,
	long *timeout_ms)
	{
	static const struct curltime tv_zero = {0, 0};
@@ -3407,6 +3411,9 @@ static CURLMcode multi_timeout(struct Curl_multi *multi,

	/* splay the lowest to the bottom */
	multi->timetree = Curl_splay(tv_zero, multi->timetree);
+	/* this will not return NULL from a non-emtpy tree, but some compilers
+	* are not convinced of that. Analyzers are hard. */
+	*expire_time = multi->timetree? multi->timetree->key : tv_zero;

	/* 'multi->timetree' will be non-NULL here but the compilers sometimes
	yell at us if we assume so */
@@ -3418,12 +3425,15 @@ static CURLMcode multi_timeout(struct Curl_multi *multi,
	overly long timeouts */
	*timeout_ms = (long)diff;
	}
-	else
+	else {
	/* 0 means immediately */
	*timeout_ms = 0;
+	}
	}
-	else
+	else {
+	*expire_time = tv_zero;
	*timeout_ms = -1;
+	}

	return CURLM_OK;
	}
@@ -3431,6 +3441,8 @@ static CURLMcode multi_timeout(struct Curl_multi *multi,
	CURLMcode curl_multi_timeout(struct Curl_multi *multi,
	long *timeout_ms)
	{
+	struct curltime expire_time;
+
	/* First, make some basic checks that the CURLM handle is a good handle */
	if(!GOOD_MULTI_HANDLE(multi))
	return CURLM_BAD_HANDLE;
@@ -3438,56 +3450,79 @@ CURLMcode curl_multi_timeout(struct Curl_multi *multi,
	if(multi->in_callback)
	return CURLM_RECURSIVE_API_CALL;

-	return multi_timeout(multi, timeout_ms);
+	return multi_timeout(multi, &expire_time, timeout_ms);
	}

+	#define DEBUG_UPDATE_TIMER 0
+
	/*
	* Tell the application it should update its timers, if it subscribes to the
	* update timer callback.
	*/
	CURLMcode Curl_update_timer(struct Curl_multi *multi)
	{
+	struct curltime expire_ts;
	long timeout_ms;
	int rc;
+	bool set_value = FALSE;

	if(!multi->timer_cb \|\| multi->dead)
	return CURLM_OK;
-	if(multi_timeout(multi, &timeout_ms)) {
+	if(multi_timeout(multi, &expire_ts, &timeout_ms)) {
	return CURLM_OK;
	}
-	if(timeout_ms < 0) {
-	static const struct curltime none = {0, 0};
-	if(Curl_timediff_us(none, multi->timer_lastcall)) {
-	multi->timer_lastcall = none;
-	/* there is no timeout now but there was one previously, tell the app to
-	disable it */
-	set_in_callback(multi, TRUE);
-	rc = multi->timer_cb(multi, -1, multi->timer_userp);
-	set_in_callback(multi, FALSE);
-	if(rc == -1) {
-	multi->dead = TRUE;
-	return CURLM_ABORTED_BY_CALLBACK;
-	}
-	return CURLM_OK;
-	}
-	return CURLM_OK;
-	}
-
-	/* When multi_timeout() is done, multi->timetree points to the node with the
-	* timeout we got the (relative) time-out time for. We can thus easily check
-	* if this is the same (fixed) time as we got in a previous call and then
-	* avoid calling the callback again. */
-	if(Curl_timediff_us(multi->timetree->key, multi->timer_lastcall) == 0)
-	return CURLM_OK;

-	multi->timer_lastcall = multi->timetree->key;
+	if(timeout_ms < 0 && multi->last_timeout_ms < 0) {
+	#if DEBUG_UPDATE_TIMER
+	fprintf(stderr, "Curl_update_timer(), still no timeout, no change\n");
+	#endif
+	}
+	else if(timeout_ms < 0) {
+	/* there is no timeout now but there was one previously */
+	#if DEBUG_UPDATE_TIMER
+	fprintf(stderr, "Curl_update_timer(), remove timeout, "
+	" last_timeout=%ldms\n", multi->last_timeout_ms);
+	#endif
+	timeout_ms = -1; /* normalize */
+	set_value = TRUE;
+	}
+	else if(multi->last_timeout_ms < 0) {
+	#if DEBUG_UPDATE_TIMER
+	fprintf(stderr, "Curl_update_timer(), had no timeout, set now\n");
+	#endif
+	set_value = TRUE;
+	}
+	else if(Curl_timediff_us(multi->last_expire_ts, expire_ts)) {
+	/* We had a timeout before and have one now, the absolute timestamp
+	* differs. The relative timeout_ms may be the same, but the starting
+	* point differs. Let the application restart its timer. */
+	#if DEBUG_UPDATE_TIMER
+	fprintf(stderr, "Curl_update_timer(), expire timestamp changed\n");
+	#endif
+	set_value = TRUE;
+	}
+	else {
+	/* We have same expire time as previously. Our relative 'timeout_ms'
+	* may be different now, but the application has the timer running
+	* and we do not to tell it to start this again. */
+	#if DEBUG_UPDATE_TIMER
+	fprintf(stderr, "Curl_update_timer(), same expire timestamp, no change\n");
+	#endif
+	}

-	set_in_callback(multi, TRUE);
-	rc = multi->timer_cb(multi, timeout_ms, multi->timer_userp);
-	set_in_callback(multi, FALSE);
-	if(rc == -1) {
-	multi->dead = TRUE;
-	return CURLM_ABORTED_BY_CALLBACK;
+	if(set_value) {
+	#if DEBUG_UPDATE_TIMER
+	fprintf(stderr, "Curl_update_timer(), set timeout %ldms\n", timeout_ms);
+	#endif
+	multi->last_expire_ts = expire_ts;
+	multi->last_timeout_ms = timeout_ms;
+	set_in_callback(multi, TRUE);
+	rc = multi->timer_cb(multi, timeout_ms, multi->timer_userp);
+	set_in_callback(multi, FALSE);
+	if(rc == -1) {
+	multi->dead = TRUE;
+	return CURLM_ABORTED_BY_CALLBACK;
+	}
	}
	return CURLM_OK;
	}
@@ -3566,10 +3601,12 @@ multi_addtimeout(struct Curl_easy *data,
	*
	* Expire replaces a former timeout using the same id if already set.
	*/
-	void Curl_expire(struct Curl_easy *data, timediff_t milli, expire_id id)
+	static void Curl_expire_ex(struct Curl_easy *data,
+	const struct curltime *nowp,
+	timediff_t milli, expire_id id)
	{
	struct Curl_multi *multi = data->multi;
-	struct curltime *nowp = &data->state.expiretime;
+	struct curltime *curr_expire = &data->state.expiretime;
	struct curltime set;

	/* this is only interesting while there is still an associated multi struct
@@ -3579,7 +3616,7 @@ void Curl_expire(struct Curl_easy *data, timediff_t milli, expire_id id)

	DEBUGASSERT(id < EXPIRE_LAST);

-	set = Curl_now();
+	set = *nowp;
	set.tv_sec += (time_t)(milli/1000); /* might be a 64 to 32 bits conversion */
	set.tv_usec += (int)(milli%1000)*1000;

@@ -3595,11 +3632,11 @@ void Curl_expire(struct Curl_easy *data, timediff_t milli, expire_id id)
	in case we need to recompute the minimum timer later. */
	multi_addtimeout(data, &set, id);

-	if(nowp->tv_sec \|\| nowp->tv_usec) {
+	if(curr_expire->tv_sec \|\| curr_expire->tv_usec) {
	/* This means that the struct is added as a node in the splay tree.
	Compare if the new time is earlier, and only remove-old/add-new if it
	is. */
-	timediff_t diff = Curl_timediff(set, *nowp);
+	timediff_t diff = Curl_timediff(set, *curr_expire);
	int rc;

	if(diff > 0) {
@@ -3618,12 +3655,18 @@ void Curl_expire(struct Curl_easy *data, timediff_t milli, expire_id id)

	/* Indicate that we are in the splay tree and insert the new timer expiry
	value since it is our local minimum. */
-	*nowp = set;
+	*curr_expire = set;
	Curl_splayset(&data->state.timenode, data);
-	multi->timetree = Curl_splayinsert(*nowp, multi->timetree,
+	multi->timetree = Curl_splayinsert(*curr_expire, multi->timetree,
	&data->state.timenode);
	}

+	void Curl_expire(struct Curl_easy *data, timediff_t milli, expire_id id)
+	{
+	struct curltime now = Curl_now();
+	Curl_expire_ex(data, &now, milli, id);
+	}
+
	/*
	* Curl_expire_done()
	*
@@ -3641,7 +3684,7 @@ void Curl_expire_done(struct Curl_easy *data, expire_id id)
	*
	* Clear ALL timeout values for this handle.
	*/
-	void Curl_expire_clear(struct Curl_easy *data)
+	bool Curl_expire_clear(struct Curl_easy *data)
	{
	struct Curl_multi *multi = data->multi;
	struct curltime *nowp = &data->state.expiretime;
@@ -3649,7 +3692,7 @@ void Curl_expire_clear(struct Curl_easy *data)
	/* this is only interesting while there is still an associated multi struct
	remaining! */
	if(!multi)
-	return;
+	return FALSE;

	if(nowp->tv_sec \|\| nowp->tv_usec) {
	/* Since this is an cleared time, we must remove the previous entry from
@@ -3670,12 +3713,11 @@ void Curl_expire_clear(struct Curl_easy *data)
	#endif
	nowp->tv_sec = 0;
	nowp->tv_usec = 0;
+	return TRUE;
	}
+	return FALSE;
	}

-
-
-
	CURLMcode curl_multi_assign(struct Curl_multi *multi, curl_socket_t s,
	void *hashp)
	{

lib/multihandle.h+3 -2

@@ -151,8 +151,9 @@ struct Curl_multi {
	/* timer callback and user data pointer for the socket() API /
	curl_multi_timer_callback timer_cb;
	void *timer_userp;
-	struct curltime timer_lastcall; /* the fixed time for the timeout for the
-	previous callback */
+	long last_timeout_ms; /* the last timeout value set via timer_cb */
+	struct curltime last_expire_ts; /* timestamp of last expiry */
+
	#ifdef USE_WINSOCK
	WSAEVENT wsa_event; /* Winsock event used for waits */
	#else

lib/multiif.h+1 -1

@@ -30,7 +30,7 @@

	CURLcode Curl_updatesocket(struct Curl_easy *data);
	void Curl_expire(struct Curl_easy *data, timediff_t milli, expire_id);
-	void Curl_expire_clear(struct Curl_easy *data);
+	bool Curl_expire_clear(struct Curl_easy *data);
	void Curl_expire_done(struct Curl_easy *data, expire_id id);
	CURLMcode Curl_update_timer(struct Curl_multi *multi) WARN_UNUSED_RESULT;
	void Curl_attach_connection(struct Curl_easy *data,

lib/sigpipe.h+2 -0

@@ -35,6 +35,7 @@ struct sigpipe_ignore {
	};

	#define SIGPIPE_VARIABLE(x) struct sigpipe_ignore x
+	#define SIGPIPE_MEMBER(x) struct sigpipe_ignore x

	static void sigpipe_init(struct sigpipe_ignore *ig)
	{
@@ -92,6 +93,7 @@ static void sigpipe_apply(struct Curl_easy *data,
	#define sigpipe_init(x) Curl_nop_stmt
	#define sigpipe_restore(x) Curl_nop_stmt
	#define SIGPIPE_VARIABLE(x)
+	#define SIGPIPE_MEMBER(x) bool x
	#endif

	#endif /* HEADER_CURL_SIGPIPE_H */

lib/transfer.c+35 -71

@@ -196,18 +196,6 @@ CURLcode Curl_xfer_send_shutdown(struct Curl_easy data, bool done)
	return Curl_conn_shutdown(data, sockindex, done);
	}

-	static bool xfer_send_shutdown_started(struct Curl_easy *data)
-	{
-	int sockindex;
-
-	if(!data \|\| !data->conn)
-	return CURLE_FAILED_INIT;
-	if(data->conn->writesockfd == CURL_SOCKET_BAD)
-	return CURLE_FAILED_INIT;
-	sockindex = (data->conn->writesockfd == data->conn->sock[SECONDARYSOCKET]);
-	return Curl_shutdown_started(data, sockindex);
-	}
-
	/**
	* Receive raw response data for the transfer.
	* @param data the transfer
@@ -261,7 +249,7 @@ static ssize_t Curl_xfer_recv_resp(struct Curl_easy *data,
	return -1;
	}
	}
-	DEBUGF(infof(data, "readwrite_data: we are done"));
+	DEBUGF(infof(data, "sendrecv_dl: we are done"));
	}
	DEBUGASSERT(nread >= 0);
	return nread;
@@ -272,9 +260,9 @@ static ssize_t Curl_xfer_recv_resp(struct Curl_easy *data,
	* the stream was rewound (in which case we have data in a
	* buffer)
	*/
-	static CURLcode readwrite_data(struct Curl_easy *data,
-	struct SingleRequest *k,
-	int *didwhat)
+	static CURLcode sendrecv_dl(struct Curl_easy *data,
+	struct SingleRequest *k,
+	int *didwhat)
	{
	struct connectdata *conn = data->conn;
	CURLcode result = CURLE_OK;
@@ -381,14 +369,14 @@ static CURLcode readwrite_data(struct Curl_easy *data,
	out:
	Curl_multi_xfer_buf_release(data, xfer_buf);
	if(result)
-	DEBUGF(infof(data, "readwrite_data() -> %d", result));
+	DEBUGF(infof(data, "sendrecv_dl() -> %d", result));
	return result;
	}

	/*
	* Send data to upload to the server, when the socket is writable.
	*/
-	static CURLcode readwrite_upload(struct Curl_easy data, int didwhat)
+	static CURLcode sendrecv_ul(struct Curl_easy data, int didwhat)
	{
	/* We should not get here when the sending is already done. It
	* probably means that someone set `data-req.keepon \|= KEEP_SEND`
@@ -421,66 +409,44 @@ static int select_bits_paused(struct Curl_easy *data, int select_bits)
	}

	/*
-	* Curl_readwrite() is the low-level function to be called when data is to
+	* Curl_sendrecv() is the low-level function to be called when data is to
	* be read and written to/from the connection.
	*/
-	CURLcode Curl_readwrite(struct Curl_easy *data)
+	CURLcode Curl_sendrecv(struct Curl_easy data, struct curltime nowp)
	{
-	struct connectdata *conn = data->conn;
	struct SingleRequest *k = &data->req;
-	CURLcode result;
-	struct curltime now;
+	CURLcode result = CURLE_OK;
	int didwhat = 0;
-	int select_bits;
+	int select_bits = 0;

+	DEBUGASSERT(nowp);
	if(data->state.select_bits) {
	if(select_bits_paused(data, data->state.select_bits)) {
	/* leave the bits unchanged, so they'll tell us what to do when
	* this transfer gets unpaused. */
-	DEBUGF(infof(data, "readwrite, select_bits, early return on PAUSED"));
+	/* DEBUGF(infof(data, "sendrecv, select_bits, early return on PAUSED"));
+	*/
	result = CURLE_OK;
	goto out;
	}
-	select_bits = data->state.select_bits;
	data->state.select_bits = 0;
+	/* DEBUGF(infof(data, "sendrecv, select_bits %x, RUN", select_bits)); */
+	select_bits = (CURL_CSELECT_OUT\|CURL_CSELECT_IN);
	}
-	else if(((k->keepon & KEEP_RECVBITS) == KEEP_RECV) &&
-	xfer_recv_shutdown_started(data)) {
-	DEBUGF(infof(data, "readwrite, recv for finishing shutdown"));
-	select_bits = CURL_CSELECT_IN;
+	else if(data->last_poll.num) {
+	/* The transfer wanted something polled. Let's run all available
+	* send/receives. Worst case we EAGAIN on some. */
+	/* DEBUGF(infof(data, "sendrecv, had poll sockets, RUN")); */
+	select_bits = (CURL_CSELECT_OUT\|CURL_CSELECT_IN);
	}
-	else if(((k->keepon & KEEP_SENDBITS) == KEEP_SEND) &&
-	xfer_send_shutdown_started(data)) {
-	DEBUGF(infof(data, "readwrite, send for finishing shutdown"));
+	else if(data->req.keepon & KEEP_SEND_TIMED) {
+	/* DEBUGF(infof(data, "sendrecv, KEEP_SEND_TIMED, RUN ul")); */
	select_bits = CURL_CSELECT_OUT;
	}
-	else {
-	curl_socket_t fd_read;
-	curl_socket_t fd_write;
-	/* only use the proper socket if the *_HOLD bit is not set simultaneously
-	as then we are in rate limiting state in that transfer direction */
-	if((k->keepon & KEEP_RECVBITS) == KEEP_RECV)
-	fd_read = conn->sockfd;
-	else
-	fd_read = CURL_SOCKET_BAD;
-
-	if(Curl_req_want_send(data))
-	fd_write = conn->writesockfd;
-	else
-	fd_write = CURL_SOCKET_BAD;
-
-	select_bits = Curl_socket_check(fd_read, CURL_SOCKET_BAD, fd_write, 0);
-	}
-
-	if(select_bits == CURL_CSELECT_ERR) {
-	failf(data, "select/poll returned error");
-	result = CURLE_SEND_ERROR;
-	goto out;
-	}

	#ifdef USE_HYPER
-	if(conn->datastream) {
-	result = conn->datastream(data, conn, &didwhat, select_bits);
+	if(data->conn->datastream) {
+	result = data->conn->datastream(data, data->conn, &didwhat, select_bits);
	if(result \|\| data->req.done)
	goto out;
	}
@@ -490,17 +456,15 @@ CURLcode Curl_readwrite(struct Curl_easy *data)
	the stream was rewound (in which case we have data in a
	buffer) */
	if((k->keepon & KEEP_RECV) && (select_bits & CURL_CSELECT_IN)) {
-	result = readwrite_data(data, k, &didwhat);
+	result = sendrecv_dl(data, k, &didwhat);
	if(result \|\| data->req.done)
	goto out;
	}

	/* If we still have writing to do, we check if we have a writable socket. */
-	if((Curl_req_want_send(data) && (select_bits & CURL_CSELECT_OUT)) \|\|
-	(k->keepon & KEEP_SEND_TIMED)) {
-	/* write */
-
-	result = readwrite_upload(data, &didwhat);
+	if((Curl_req_want_send(data) \|\| (data->req.keepon & KEEP_SEND_TIMED)) &&
+	(select_bits & CURL_CSELECT_OUT)) {
+	result = sendrecv_ul(data, &didwhat);
	if(result)
	goto out;
	}
@@ -508,8 +472,8 @@ CURLcode Curl_readwrite(struct Curl_easy *data)
	}
	#endif

-	now = Curl_now();
-	if(!didwhat) {
+	if(select_bits && !didwhat) {
+	/* Transfer wanted to send/recv, but nothing was possible. */
	result = Curl_conn_ev_data_idle(data);
	if(result)
	goto out;
@@ -518,23 +482,23 @@ CURLcode Curl_readwrite(struct Curl_easy *data)
	if(Curl_pgrsUpdate(data))
	result = CURLE_ABORTED_BY_CALLBACK;
	else
-	result = Curl_speedcheck(data, now);
+	result = Curl_speedcheck(data, *nowp);
	if(result)
	goto out;

	if(k->keepon) {
-	if(0 > Curl_timeleft(data, &now, FALSE)) {
+	if(0 > Curl_timeleft(data, nowp, FALSE)) {
	if(k->size != -1) {
	failf(data, "Operation timed out after %" CURL_FORMAT_TIMEDIFF_T
	" milliseconds with %" CURL_FORMAT_CURL_OFF_T " out of %"
	CURL_FORMAT_CURL_OFF_T " bytes received",
-	Curl_timediff(now, data->progress.t_startsingle),
+	Curl_timediff(*nowp, data->progress.t_startsingle),
	k->bytecount, k->size);
	}
	else {
	failf(data, "Operation timed out after %" CURL_FORMAT_TIMEDIFF_T
	" milliseconds with %" CURL_FORMAT_CURL_OFF_T " bytes received",
-	Curl_timediff(now, data->progress.t_startsingle),
+	Curl_timediff(*nowp, data->progress.t_startsingle),
	k->bytecount);
	}
	result = CURLE_OPERATION_TIMEDOUT;
@@ -573,7 +537,7 @@ CURLcode Curl_readwrite(struct Curl_easy *data)

	out:
	if(result)
-	DEBUGF(infof(data, "Curl_readwrite() -> %d", result));
+	DEBUGF(infof(data, "Curl_sendrecv() -> %d", result));
	return result;
	}

lib/transfer.h+1 -1

@@ -44,7 +44,7 @@ typedef enum {

	CURLcode Curl_follow(struct Curl_easy data, char newurl,
	followtype type);
-	CURLcode Curl_readwrite(struct Curl_easy *data);
+	CURLcode Curl_sendrecv(struct Curl_easy data, struct curltime nowp);
	int Curl_single_getsock(struct Curl_easy *data,
	struct connectdata conn, curl_socket_t socks);
	CURLcode Curl_retry_request(struct Curl_easy data, char *url);

lib/url.c+2 -2

@@ -234,8 +234,6 @@ CURLcode Curl_close(struct Curl_easy **datap)
	data = *datap;
	*datap = NULL;

-	Curl_expire_clear(data); /* shut off timers */
-
	/* Detach connection if any is left. This should not be normal, but can be
	the case for example with CONNECT_ONLY + recv/send (test 556) */
	Curl_detach_connection(data);
@@ -253,6 +251,8 @@ CURLcode Curl_close(struct Curl_easy **datap)
	}
	}

+	Curl_expire_clear(data); /* shut off any timers left */
+
	data->magic = 0; /* force a clear AFTER the possibly enforced removal from
	the multi handle, since that function uses the magic
	field! */

tests/valgrind.supp+2 -2

@@ -14,7 +14,7 @@
	fun:zstd_unencode_write
	fun:Curl_unencode_write
	fun:readwrite_data
-	fun:Curl_readwrite
+	fun:Curl_sendrecv
	fun:multi_runsingle
	fun:curl_multi_perform
	fun:easy_transfer
@@ -31,7 +31,7 @@
	Memcheck:Cond
	fun:ZSTD_decompressStream
	fun:zstd_unencode_write
-	fun:Curl_readwrite
+	fun:Curl_sendrecv
	fun:multi_runsingle
	fun:curl_multi_perform
	fun:curl_easy_perform