← Commit list

a1850ad7de

Stefan Eissing

2025-02-20

SUCCESS Duration: 111s

Subject

cfilter: remove 'blocking' connect handling

Binary

Download Binary (870 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 a1850ad7debe33fded6367e34d5c06be4d51f58e
Previous HEAD position was 279a4772ae http: negotiation and room for alt-svc/https rr to navigate
HEAD is now at a1850ad7de cfilter: remove 'blocking' connect handling

$ git clean -fdx
Removing Makefile
Removing Makefile.in
Removing aclocal.m4
Removing autom4te.cache/
Removing buildinfo.txt
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/curl-base64.o
Removing lib/curl-curl_multibyte.o
Removing lib/curl-dynbuf.o
Removing lib/curl-nonblock.o
Removing lib/curl-strcase.o
Removing lib/curl-strparse.o
Removing lib/curl-strtoofft.o
Removing lib/curl-timediff.o
Removing lib/curl-version_win32.o
Removing lib/curl-warnless.o
Removing lib/curl_config.h
Removing lib/curl_config.h.in
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-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_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-httpsrr.lo
Removing lib/libcurl_la-httpsrr.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-strequal.lo
Removing lib/libcurl_la-strequal.o
Removing lib/libcurl_la-strerror.lo
Removing lib/libcurl_la-strerror.o
Removing lib/libcurl_la-strparse.lo
Removing lib/libcurl_la-strparse.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/stamp-h1
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/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-curl_path.lo
Removing lib/vssh/libcurl_la-curl_path.o
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-vtls_scache.lo
Removing lib/vtls/libcurl_la-vtls_scache.o
Removing lib/vtls/libcurl_la-vtls_spack.lo
Removing lib/vtls/libcurl_la-vtls_spack.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 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/curl-slist_wc.o
Removing src/curl-terminal.o
Removing src/curl-tool_bname.o
Removing src/curl-tool_ca_embed.o
Removing src/curl-tool_cb_dbg.o
Removing src/curl-tool_cb_hdr.o
Removing src/curl-tool_cb_prg.o
Removing src/curl-tool_cb_rea.o
Removing src/curl-tool_cb_see.o
Removing src/curl-tool_cb_soc.o
Removing src/curl-tool_cb_wrt.o
Removing src/curl-tool_cfgable.o
Removing src/curl-tool_dirhie.o
Removing src/curl-tool_doswin.o
Removing src/curl-tool_easysrc.o
Removing src/curl-tool_filetime.o
Removing src/curl-tool_findfile.o
Removing src/curl-tool_formparse.o
Removing src/curl-tool_getparam.o
Removing src/curl-tool_getpass.o
Removing src/curl-tool_help.o
Removing src/curl-tool_helpers.o
Removing src/curl-tool_hugehelp.o
Removing src/curl-tool_ipfs.o
Removing src/curl-tool_libinfo.o
Removing src/curl-tool_listhelp.o
Removing src/curl-tool_main.o
Removing src/curl-tool_msgs.o
Removing src/curl-tool_operate.o
Removing src/curl-tool_operhlp.o
Removing src/curl-tool_paramhlp.o
Removing src/curl-tool_parsecfg.o
Removing src/curl-tool_progress.o
Removing src/curl-tool_setopt.o
Removing src/curl-tool_sleep.o
Removing src/curl-tool_ssls.o
Removing src/curl-tool_stderr.o
Removing src/curl-tool_strdup.o
Removing src/curl-tool_urlglob.o
Removing src/curl-tool_util.o
Removing src/curl-tool_vms.o
Removing src/curl-tool_writeout.o
Removing src/curl-tool_writeout_json.o
Removing src/curl-tool_xattr.o
Removing src/curl-var.o
Removing src/tool_ca_embed.c
Removing src/tool_hugehelp.c
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:126: installing './compile'
configure.ac:422: installing './config.guess'
configure.ac:422: installing './config.sub'
configure.ac:126: installing './install-sh'
configure.ac:132: 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 whether to enable SSL session export 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.12.2-DEV
checking for httpd... no
checking for apache2... 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 crypto API... no
checking whether to build libcurl and curl in "unity" mode... no
checking whether to build tests into single-binary bundles... no
checking whether to support http... yes
checking whether to support ftp... yes
checking whether to support file... yes
checking whether to support IPFS... 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 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 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 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/eventfd.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 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 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_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 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... yes
checking if memrchr is compilable... yes
checking if memrchr usage allowed... yes
checking if memrchr 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 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... 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 for eventfd... yes
checking for fnmatch... 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 mach_absolute_time... no
checking for pipe... yes
checking for poll... yes
checking for sendmsg... yes
checking for sendmmsg... 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 for if_nametoindex... yes
checking for realpath... yes
checking for sched_yield... 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 stricmp can be linked... no
checking if stricmp might be used... no
checking for arc4random... no
checking for fseeko... yes
checking for ccache gcc options needed to detect all undeclared functions... none needed
checking whether fseeko is declared... yes
checking how to set a socket into non-blocking mode... fcntl O_NONBLOCK
checking for perl... /usr/bin/perl
checking whether to enable the threaded resolver... yes
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 the SHA-512/256 hash algorithm... 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... yes
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/configurehelp.pm
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: -D_GNU_SOURCE
LDFLAGS:
curl-config:
LIBS: -lpsl -lz

curl version: 8.12.2-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 cert embed: no
ca fallback:
LDAP: no (--enable-ldap / --with-ldap-lib / --with-lber-lib)
LDAPS: no (--enable-ldaps)
IPFS/IPNS: enabled
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)
HTTPS RR: no (--enable-httpsrr)
SSLS-EXPORT: no (--enable-ssls-export)
Protocols: dict file ftp gopher http imap ipfs ipns mqtt pop3 rtsp smtp telnet tftp ws
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-asyn-ares.lo
CC libcurl_la-amigaos.lo
CC libcurl_la-asyn-thread.lo
CC libcurl_la-base64.lo
CC libcurl_la-bufq.lo
CC libcurl_la-bufref.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_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-httpsrr.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-strequal.lo
CC libcurl_la-strerror.lo
CC libcurl_la-strparse.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-gsasl.lo
CC vauth/libcurl_la-krb5_gssapi.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-vtls_scache.lo
CC vtls/libcurl_la-vtls_spack.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 vquic/libcurl_la-vquic-tls.lo
CC vssh/libcurl_la-libssh.lo
CC vssh/libcurl_la-libssh2.lo
CC vssh/libcurl_la-curl_path.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 curl-slist_wc.o
CC curl-terminal.o
CC curl-tool_bname.o
CC curl-tool_cb_dbg.o
CC curl-tool_cb_hdr.o
CC curl-tool_cb_prg.o
CC curl-tool_cb_rea.o
CC curl-tool_cb_see.o
CC curl-tool_cb_soc.o
CC curl-tool_cb_wrt.o
CC curl-tool_cfgable.o
CC curl-tool_dirhie.o
CC curl-tool_doswin.o
CC curl-tool_easysrc.o
CC curl-tool_filetime.o
CC curl-tool_findfile.o
CC curl-tool_formparse.o
CC curl-tool_getparam.o
CC curl-tool_getpass.o
CC curl-tool_help.o
CC curl-tool_helpers.o
CC curl-tool_ipfs.o
CC curl-tool_libinfo.o
CC curl-tool_listhelp.o
CC curl-tool_main.o
CC curl-tool_msgs.o
CC curl-tool_operate.o
CC curl-tool_operhlp.o
CC curl-tool_paramhlp.o
CC curl-tool_parsecfg.o
CC curl-tool_progress.o
CC curl-tool_setopt.o
CC curl-tool_sleep.o
CC curl-tool_ssls.o
CC curl-tool_stderr.o
CC curl-tool_strdup.o
CC curl-tool_urlglob.o
CC curl-tool_util.o
CC curl-tool_vms.o
CC curl-tool_writeout.o
CC curl-tool_writeout_json.o
CC curl-tool_xattr.o
CC curl-var.o
echo '#include "tool_hugehelp.h"' >> tool_hugehelp.c
echo 'extern const void *curl_ca_embed; const void *curl_ca_embed;' > tool_ca_embed.c
CC ../lib/curl-base64.o
CC ../lib/curl-curl_multibyte.o
CC ../lib/curl-dynbuf.o
CC ../lib/curl-nonblock.o
CC ../lib/curl-strtoofft.o
CC ../lib/curl-strparse.o
CC ../lib/curl-strcase.o
CC ../lib/curl-timediff.o
CC ../lib/curl-version_win32.o
CC ../lib/curl-warnless.o
CC curl-tool_hugehelp.o
CC curl-tool_ca_embed.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-h1-proxy.c+3 -3

@@ -598,7 +598,7 @@ static CURLcode H1_CONNECT(struct Curl_cfilter *cf,
	infof(data, "Connect me again please");
	Curl_conn_cf_close(cf, data);
	connkeep(conn, "HTTP proxy CONNECT");
-	result = Curl_conn_cf_connect(cf->next, data, FALSE, &done);
+	result = Curl_conn_cf_connect(cf->next, data, &done);
	goto out;
	}
	else {
@@ -638,7 +638,7 @@ out:

	static CURLcode cf_h1_proxy_connect(struct Curl_cfilter *cf,
	struct Curl_easy *data,
-	bool blocking, bool *done)
+	bool *done)
	{
	CURLcode result;
	struct h1_tunnel_state *ts = cf->ctx;
@@ -649,7 +649,7 @@ static CURLcode cf_h1_proxy_connect(struct Curl_cfilter *cf,
	}

	CURL_TRC_CF(data, cf, "connect");
-	result = cf->next->cft->do_connect(cf->next, data, blocking, done);
+	result = cf->next->cft->do_connect(cf->next, data, done);
	if(result \|\| !*done)
	return result;

lib/cf-h2-proxy.c+2 -2

@@ -1090,7 +1090,7 @@ out:

	static CURLcode cf_h2_proxy_connect(struct Curl_cfilter *cf,
	struct Curl_easy *data,
-	bool blocking, bool *done)
+	bool *done)
	{
	struct cf_h2_proxy_ctx *ctx = cf->ctx;
	CURLcode result = CURLE_OK;
@@ -1105,7 +1105,7 @@ static CURLcode cf_h2_proxy_connect(struct Curl_cfilter *cf,

	/* Connect the lower filters first */
	if(!cf->next->connected) {
-	result = Curl_conn_cf_connect(cf->next, data, blocking, done);
+	result = Curl_conn_cf_connect(cf->next, data, done);
	if(result \|\| !*done)
	return result;
	}

lib/cf-haproxy.c+2 -2

@@ -105,7 +105,7 @@ static CURLcode cf_haproxy_date_out_set(struct Curl_cfilter*cf,

	static CURLcode cf_haproxy_connect(struct Curl_cfilter *cf,
	struct Curl_easy *data,
-	bool blocking, bool *done)
+	bool *done)
	{
	struct cf_haproxy_ctx *ctx = cf->ctx;
	CURLcode result;
@@ -117,7 +117,7 @@ static CURLcode cf_haproxy_connect(struct Curl_cfilter *cf,
	return CURLE_OK;
	}

-	result = cf->next->cft->do_connect(cf->next, data, blocking, done);
+	result = cf->next->cft->do_connect(cf->next, data, done);
	if(result \|\| !*done)
	return result;

lib/cf-https-connect.c+2 -3

@@ -175,7 +175,7 @@ static CURLcode cf_hc_baller_connect(struct cf_hc_baller *b,
	struct Curl_cfilter *save = cf->next;

	cf->next = b->cf;
-	b->result = Curl_conn_cf_connect(cf->next, data, FALSE, done);
+	b->result = Curl_conn_cf_connect(cf->next, data, done);
	b->cf = cf->next; /* it might mutate */
	cf->next = save;
	return b->result;
@@ -291,14 +291,13 @@ static bool time_to_start_next(struct Curl_cfilter *cf,

	static CURLcode cf_hc_connect(struct Curl_cfilter *cf,
	struct Curl_easy *data,
-	bool blocking, bool *done)
+	bool *done)
	{
	struct cf_hc_ctx *ctx = cf->ctx;
	struct curltime now;
	CURLcode result = CURLE_OK;
	size_t i, failed_ballers;

-	(void)blocking;
	if(cf->connected) {
	*done = TRUE;
	return CURLE_OK;

lib/cf-socket.c+3 -8

@@ -1304,7 +1304,7 @@ static int do_connect(struct Curl_cfilter cf, struct Curl_easy data,

	static CURLcode cf_tcp_connect(struct Curl_cfilter *cf,
	struct Curl_easy *data,
-	bool blocking, bool *done)
+	bool *done)
	{
	struct cf_socket_ctx *ctx = cf->ctx;
	CURLcode result = CURLE_COULDNT_CONNECT;
@@ -1316,9 +1316,6 @@ static CURLcode cf_tcp_connect(struct Curl_cfilter *cf,
	return CURLE_OK;
	}

-	if(blocking)
-	return CURLE_UNSUPPORTED_PROTOCOL;
-
	done = FALSE; / a negative world view is best */
	if(ctx->sock == CURL_SOCKET_BAD) {
	int error;
@@ -1889,12 +1886,11 @@ static CURLcode cf_udp_setup_quic(struct Curl_cfilter *cf,

	static CURLcode cf_udp_connect(struct Curl_cfilter *cf,
	struct Curl_easy *data,
-	bool blocking, bool *done)
+	bool *done)
	{
	struct cf_socket_ctx *ctx = cf->ctx;
	CURLcode result = CURLE_COULDNT_CONNECT;

-	(void)blocking;
	if(cf->connected) {
	*done = TRUE;
	return CURLE_OK;
@@ -2099,7 +2095,7 @@ static void cf_tcp_set_accepted_remote_ip(struct Curl_cfilter *cf,

	static CURLcode cf_tcp_accept_connect(struct Curl_cfilter *cf,
	struct Curl_easy *data,
-	bool blocking, bool *done)
+	bool *done)
	{
	struct cf_socket_ctx *ctx = cf->ctx;
	#ifdef USE_IPV6
@@ -2115,7 +2111,6 @@ static CURLcode cf_tcp_accept_connect(struct Curl_cfilter *cf,

	/* we start accepted, if we ever close, we cannot go on */
	(void)data;
-	(void)blocking;
	if(cf->connected) {
	*done = TRUE;
	return CURLE_OK;

lib/cfilters.c+57 -4

@@ -368,10 +368,10 @@ bool Curl_conn_cf_discard_sub(struct Curl_cfilter *cf,

	CURLcode Curl_conn_cf_connect(struct Curl_cfilter *cf,
	struct Curl_easy *data,
-	bool blocking, bool *done)
+	bool *done)
	{
	if(cf)
-	return cf->cft->do_connect(cf, data, blocking, done);
+	return cf->cft->do_connect(cf, data, done);
	return CURLE_FAILED_INIT;
	}

@@ -405,6 +405,9 @@ CURLcode Curl_conn_connect(struct Curl_easy *data,
	bool blocking,
	bool *done)
	{
+	#define CF_CONN_NUM_POLLS_ON_STACK 5
+	struct pollfd a_few_on_stack[CF_CONN_NUM_POLLS_ON_STACK];
+	struct curl_pollfds cpfds;
	struct Curl_cfilter *cf;
	CURLcode result = CURLE_OK;

@@ -419,7 +422,11 @@ CURLcode Curl_conn_connect(struct Curl_easy *data,
	}

	*done = cf->connected;
-	if(!*done) {
+	if(*done)
+	return CURLE_OK;
+
+	Curl_pollfds_init(&cpfds, a_few_on_stack, CF_CONN_NUM_POLLS_ON_STACK);
+	while(!*done) {
	if(Curl_conn_needs_flush(data, sockindex)) {
	DEBUGF(infof(data, "Curl_conn_connect(index=%d), flush", sockindex));
	result = Curl_conn_flush(data, sockindex);
@@ -427,7 +434,9 @@ CURLcode Curl_conn_connect(struct Curl_easy *data,
	return result;
	}

-	result = cf->cft->do_connect(cf, data, blocking, done);
+	result = cf->cft->do_connect(cf, data, done);
+	CURL_TRC_CF(data, cf, "Curl_conn_connect(block=%d) -> %d, done=%d",
+	blocking, result, *done);
	if(!result && *done) {
	/* Now that the complete filter chain is connected, let all filters
	* persist information at the connection. E.g. cf-socket sets the
@@ -436,12 +445,56 @@ CURLcode Curl_conn_connect(struct Curl_easy *data,
	conn_report_connect_stats(data, data->conn);
	data->conn->keepalive = Curl_now();
	Curl_verboseconnect(data, data->conn, sockindex);
+	goto out;
	}
	else if(result) {
+	CURL_TRC_CF(data, cf, "Curl_conn_connect(), filter returned %d",
+	result);
	conn_report_connect_stats(data, data->conn);
+	goto out;
+	}
+
+	if(!blocking)
+	goto out;
+	else {
+	/* check allowed time left */
+	const timediff_t timeout_ms = Curl_timeleft(data, NULL, TRUE);
+	curl_socket_t sockfd = Curl_conn_cf_get_socket(cf, data);
+	struct easy_pollset ps;
+	int rc;
+
+	if(timeout_ms < 0) {
+	/* no need to continue if time already is up */
+	failf(data, "connect timeout");
+	result = CURLE_OPERATION_TIMEDOUT;
+	goto out;
+	}
+
+	CURL_TRC_CF(data, cf, "Curl_conn_connect(block=1), do poll");
+	Curl_pollfds_reset(&cpfds);
+	memset(&ps, 0, sizeof(ps));
+	/* In general, we want to send after connect, wait on that. */
+	if(sockfd != CURL_SOCKET_BAD)
+	Curl_pollset_set_out_only(data, &ps, sockfd);
+	Curl_conn_adjust_pollset(data, &ps);
+	result = Curl_pollfds_add_ps(&cpfds, &ps);
+	if(result)
+	goto out;
+
+	rc = Curl_poll(cpfds.pfds, cpfds.n,
+	CURLMIN(timeout_ms, (cpfds.n ? 1000 : 10)));
+	CURL_TRC_CF(data, cf, "Curl_conn_connect(block=1), Curl_poll() -> %d",
+	rc);
+	if(rc < 0) {
+	result = CURLE_COULDNT_CONNECT;
+	goto out;
+	}
+	/* continue iterating */
	}
	}

+	out:
+	Curl_pollfds_cleanup(&cpfds);
	return result;
	}

lib/cfilters.h+2 -2

@@ -51,7 +51,7 @@ typedef CURLcode Curl_cft_shutdown(struct Curl_cfilter *cf,

	typedef CURLcode Curl_cft_connect(struct Curl_cfilter *cf,
	struct Curl_easy *data,
-	bool blocking, bool *done);
+	bool *done);

	/* Return the hostname and port the connection goes to.
	* This may change with the connection state of filters when tunneling
@@ -324,7 +324,7 @@ void Curl_conn_cf_discard_all(struct Curl_easy *data,

	CURLcode Curl_conn_cf_connect(struct Curl_cfilter *cf,
	struct Curl_easy *data,
-	bool blocking, bool *done);
+	bool *done);
	void Curl_conn_cf_close(struct Curl_cfilter cf, struct Curl_easy data);
	ssize_t Curl_conn_cf_send(struct Curl_cfilter cf, struct Curl_easy data,
	const void *buf, size_t len, bool eos,

lib/connect.c+4 -5

@@ -593,7 +593,7 @@ static CURLcode baller_connect(struct Curl_cfilter *cf,
	*connected = baller->connected;
	if(!baller->result && !*connected) {
	/* evaluate again */
-	baller->result = Curl_conn_cf_connect(baller->cf, data, 0, connected);
+	baller->result = Curl_conn_cf_connect(baller->cf, data, connected);

	if(!baller->result) {
	if(*connected) {
@@ -948,7 +948,7 @@ static void cf_he_adjust_pollset(struct Curl_cfilter *cf,

	static CURLcode cf_he_connect(struct Curl_cfilter *cf,
	struct Curl_easy *data,
-	bool blocking, bool *done)
+	bool *done)
	{
	struct cf_he_ctx *ctx = cf->ctx;
	CURLcode result = CURLE_OK;
@@ -958,7 +958,6 @@ static CURLcode cf_he_connect(struct Curl_cfilter *cf,
	return CURLE_OK;
	}

-	(void)blocking;
	DEBUGASSERT(ctx);
	*done = FALSE;

@@ -1263,7 +1262,7 @@ struct cf_setup_ctx {

	static CURLcode cf_setup_connect(struct Curl_cfilter *cf,
	struct Curl_easy *data,
-	bool blocking, bool *done)
+	bool *done)
	{
	struct cf_setup_ctx *ctx = cf->ctx;
	CURLcode result = CURLE_OK;
@@ -1276,7 +1275,7 @@ static CURLcode cf_setup_connect(struct Curl_cfilter *cf,
	/* connect current sub-chain */
	connect_sub_chain:
	if(cf->next && !cf->next->connected) {
-	result = Curl_conn_cf_connect(cf->next, data, blocking, done);
+	result = Curl_conn_cf_connect(cf->next, data, done);
	if(result \|\| !*done)
	return result;
	}

lib/ftp.c+1 -1

@@ -3603,7 +3603,7 @@ static CURLcode ftp_do_more(struct Curl_easy data, int completep)
	if(ftpc->wait_data_conn) {
	bool serv_conned;

-	result = Curl_conn_connect(data, SECONDARYSOCKET, TRUE, &serv_conned);
+	result = Curl_conn_connect(data, SECONDARYSOCKET, FALSE, &serv_conned);
	if(result)
	return result; /* Failed to accept data connection */

lib/http2.c+5 -5

@@ -2441,7 +2441,7 @@ static void cf_h2_adjust_pollset(struct Curl_cfilter *cf,

	static CURLcode cf_h2_connect(struct Curl_cfilter *cf,
	struct Curl_easy *data,
-	bool blocking, bool *done)
+	bool *done)
	{
	struct cf_h2_ctx *ctx = cf->ctx;
	CURLcode result = CURLE_OK;
@@ -2455,7 +2455,7 @@ static CURLcode cf_h2_connect(struct Curl_cfilter *cf,

	/* Connect the lower filters first */
	if(!cf->next->connected) {
-	result = Curl_conn_cf_connect(cf->next, data, blocking, done);
+	result = Curl_conn_cf_connect(cf->next, data, done);
	if(result \|\| !*done)
	return result;
	}
@@ -2827,7 +2827,7 @@ CURLcode Curl_http2_switch(struct Curl_easy *data)

	if(cf->next) {
	bool done;
-	return Curl_conn_cf_connect(cf, data, FALSE, &done);
+	return Curl_conn_cf_connect(cf, data, &done);
	}
	return CURLE_OK;
	}
@@ -2849,7 +2849,7 @@ CURLcode Curl_http2_switch_at(struct Curl_cfilter cf, struct Curl_easy data)

	if(cf_h2->next) {
	bool done;
-	return Curl_conn_cf_connect(cf_h2, data, FALSE, &done);
+	return Curl_conn_cf_connect(cf_h2, data, &done);
	}
	return CURLE_OK;
	}
@@ -2900,7 +2900,7 @@ CURLcode Curl_http2_upgrade(struct Curl_easy *data,

	if(cf->next) {
	bool done;
-	return Curl_conn_cf_connect(cf, data, FALSE, &done);
+	return Curl_conn_cf_connect(cf, data, &done);
	}
	return CURLE_OK;
	}

lib/http_proxy.c+2 -2

@@ -307,7 +307,7 @@ out:

	static CURLcode http_proxy_cf_connect(struct Curl_cfilter *cf,
	struct Curl_easy *data,
-	bool blocking, bool *done)
+	bool *done)
	{
	struct cf_proxy_ctx *ctx = cf->ctx;
	CURLcode result;
@@ -319,7 +319,7 @@ static CURLcode http_proxy_cf_connect(struct Curl_cfilter *cf,

	CURL_TRC_CF(data, cf, "connect");
	connect_sub:
-	result = cf->next->cft->do_connect(cf->next, data, blocking, done);
+	result = cf->next->cft->do_connect(cf->next, data, done);
	if(result \|\| !*done)
	return result;

lib/select.c+5 -0

@@ -410,6 +410,11 @@ void Curl_pollfds_init(struct curl_pollfds *cpfds,
	}
	}

+	void Curl_pollfds_reset(struct curl_pollfds *cpfds)
+	{
+	cpfds->n = 0;
+	}
+
	void Curl_pollfds_cleanup(struct curl_pollfds *cpfds)
	{
	DEBUGASSERT(cpfds);

lib/select.h+2 -0

@@ -122,6 +122,8 @@ void Curl_pollfds_init(struct curl_pollfds *cpfds,
	struct pollfd *static_pfds,
	unsigned int static_count);

+	void Curl_pollfds_reset(struct curl_pollfds *cpfds);
+
	void Curl_pollfds_cleanup(struct curl_pollfds *cpfds);

	CURLcode Curl_pollfds_add_ps(struct curl_pollfds *cpfds,

lib/socks.c+2 -2

@@ -1128,7 +1128,7 @@ static void socks_proxy_cf_free(struct Curl_cfilter *cf)
	*/
	static CURLcode socks_proxy_cf_connect(struct Curl_cfilter *cf,
	struct Curl_easy *data,
-	bool blocking, bool *done)
+	bool *done)
	{
	CURLcode result;
	struct connectdata *conn = cf->conn;
@@ -1140,7 +1140,7 @@ static CURLcode socks_proxy_cf_connect(struct Curl_cfilter *cf,
	return CURLE_OK;
	}

-	result = cf->next->cft->do_connect(cf->next, data, blocking, done);
+	result = cf->next->cft->do_connect(cf->next, data, done);
	if(result \|\| !*done)
	return result;

lib/vquic/curl_msh3.c+1 -2

@@ -877,13 +877,12 @@ static CURLcode cf_connect_start(struct Curl_cfilter *cf,

	static CURLcode cf_msh3_connect(struct Curl_cfilter *cf,
	struct Curl_easy *data,
-	bool blocking, bool *done)
+	bool *done)
	{
	struct cf_msh3_ctx *ctx = cf->ctx;
	struct cf_call_data save;
	CURLcode result = CURLE_OK;

-	(void)blocking;
	if(cf->connected) {
	*done = TRUE;
	return CURLE_OK;

lib/vquic/curl_ngtcp2.c+2 -2

@@ -2453,7 +2453,7 @@ static CURLcode cf_connect_start(struct Curl_cfilter *cf,

	static CURLcode cf_ngtcp2_connect(struct Curl_cfilter *cf,
	struct Curl_easy *data,
-	bool blocking, bool *done)
+	bool *done)
	{
	struct cf_ngtcp2_ctx *ctx = cf->ctx;
	CURLcode result = CURLE_OK;
@@ -2468,7 +2468,7 @@ static CURLcode cf_ngtcp2_connect(struct Curl_cfilter *cf,

	/* Connect the UDP filter first */
	if(!cf->next->connected) {
-	result = Curl_conn_cf_connect(cf->next, data, blocking, done);
+	result = Curl_conn_cf_connect(cf->next, data, done);
	if(result \|\| !*done)
	return result;
	}

lib/vquic/curl_osslq.c+2 -2

@@ -1718,7 +1718,7 @@ out:

	static CURLcode cf_osslq_connect(struct Curl_cfilter *cf,
	struct Curl_easy *data,
-	bool blocking, bool *done)
+	bool *done)
	{
	struct cf_osslq_ctx *ctx = cf->ctx;
	CURLcode result = CURLE_OK;
@@ -1733,7 +1733,7 @@ static CURLcode cf_osslq_connect(struct Curl_cfilter *cf,

	/* Connect the UDP filter first */
	if(!cf->next->connected) {
-	result = Curl_conn_cf_connect(cf->next, data, blocking, done);
+	result = Curl_conn_cf_connect(cf->next, data, done);
	if(result \|\| !*done)
	return result;
	}

lib/vquic/curl_quiche.c+2 -2

@@ -1378,7 +1378,7 @@ static CURLcode cf_quiche_verify_peer(struct Curl_cfilter *cf,

	static CURLcode cf_quiche_connect(struct Curl_cfilter *cf,
	struct Curl_easy *data,
-	bool blocking, bool *done)
+	bool *done)
	{
	struct cf_quiche_ctx *ctx = cf->ctx;
	CURLcode result = CURLE_OK;
@@ -1390,7 +1390,7 @@ static CURLcode cf_quiche_connect(struct Curl_cfilter *cf,

	/* Connect the UDP filter first */
	if(!cf->next->connected) {
-	result = Curl_conn_cf_connect(cf->next, data, blocking, done);
+	result = Curl_conn_cf_connect(cf->next, data, done);
	if(result \|\| !*done)
	return result;
	}

lib/vtls/bearssl.c+9 -84

@@ -911,18 +911,14 @@ static ssize_t bearssl_recv(struct Curl_cfilter cf, struct Curl_easy data,
	return applen;
	}

-	static CURLcode bearssl_connect_common(struct Curl_cfilter *cf,
-	struct Curl_easy *data,
-	bool nonblocking,
-	bool *done)
+	static CURLcode bearssl_connect(struct Curl_cfilter *cf,
+	struct Curl_easy *data,
+	bool *done)
	{
	CURLcode ret;
	struct ssl_connect_data *connssl = cf->ctx;
-	curl_socket_t sockfd = Curl_conn_cf_get_socket(cf, data);
-	timediff_t timeout_ms;
-	int what;

-	CURL_TRC_CF(data, cf, "connect_common(blocking=%d)", !nonblocking);
+	CURL_TRC_CF(data, cf, "connect()");
	/* check if the connection has already been established */
	if(ssl_connection_complete == connssl->state) {
	CURL_TRC_CF(data, cf, "connect_common, connected");
@@ -930,61 +926,18 @@ static CURLcode bearssl_connect_common(struct Curl_cfilter *cf,
	return CURLE_OK;
	}

+	*done = FALSE;
+	connssl->io_need = CURL_SSL_IO_NEED_NONE;
+
	if(ssl_connect_1 == connssl->connecting_state) {
	ret = bearssl_connect_step1(cf, data);
	if(ret)
	return ret;
	}

-	while(ssl_connect_2 == connssl->connecting_state) {
-	/* check allowed time left */
-	timeout_ms = Curl_timeleft(data, NULL, TRUE);
-
-	if(timeout_ms < 0) {
-	/* no need to continue if time already is up */
-	failf(data, "SSL connection timeout");
-	return CURLE_OPERATION_TIMEDOUT;
-	}
-
-	/* if ssl is expecting something, check if it is available. */
-	if(connssl->io_need) {
-	curl_socket_t writefd = (connssl->io_need & CURL_SSL_IO_NEED_SEND) ?
-	sockfd : CURL_SOCKET_BAD;
-	curl_socket_t readfd = (connssl->io_need & CURL_SSL_IO_NEED_RECV) ?
-	sockfd : CURL_SOCKET_BAD;
-
-	CURL_TRC_CF(data, cf, "connect_common, check socket");
-	what = Curl_socket_check(readfd, CURL_SOCKET_BAD, writefd,
-	nonblocking ? 0 : timeout_ms);
-	CURL_TRC_CF(data, cf, "connect_common, check socket -> %d", what);
-	if(what < 0) {
-	/* fatal error */
-	failf(data, "select/poll on SSL socket, errno: %d", SOCKERRNO);
-	return CURLE_SSL_CONNECT_ERROR;
-	}
-	else if(0 == what) {
-	if(nonblocking) {
-	*done = FALSE;
-	return CURLE_OK;
-	}
-	else {
-	/* timeout */
-	failf(data, "SSL connection timeout");
-	return CURLE_OPERATION_TIMEDOUT;
-	}
-	}
-	/* socket is readable or writable */
-	}
-
-	/* Run transaction, and return to the caller if it failed or if this
-	* connection is done nonblocking and this loop would execute again. This
-	* permits the owner of a multi handle to abort a connection attempt
-	* before step2 has completed while ensuring that a client using select()
-	* or epoll() will always have a valid fdset to wait on.
-	*/
-	connssl->io_need = CURL_SSL_IO_NEED_NONE;
+	if(ssl_connect_2 == connssl->connecting_state) {
	ret = bearssl_connect_step2(cf, data);
-	if(ret \|\| (nonblocking && (ssl_connect_2 == connssl->connecting_state)))
+	if(ret)
	return ret;
	}

@@ -998,11 +951,6 @@ static CURLcode bearssl_connect_common(struct Curl_cfilter *cf,
	connssl->state = ssl_connection_complete;
	*done = TRUE;
	}
-	else
-	*done = FALSE;
-
-	/* Reset our connect state machine */
-	connssl->connecting_state = ssl_connect_1;

	return CURLE_OK;
	}
@@ -1044,28 +992,6 @@ static CURLcode bearssl_random(struct Curl_easy *data UNUSED_PARAM,
	return CURLE_OK;
	}

-	static CURLcode bearssl_connect(struct Curl_cfilter *cf,
-	struct Curl_easy *data)
-	{
-	CURLcode ret;
-	bool done = FALSE;
-
-	ret = bearssl_connect_common(cf, data, FALSE, &done);
-	if(ret)
-	return ret;
-
-	DEBUGASSERT(done);
-
-	return CURLE_OK;
-	}
-
-	static CURLcode bearssl_connect_nonblocking(struct Curl_cfilter *cf,
-	struct Curl_easy *data,
-	bool *done)
-	{
-	return bearssl_connect_common(cf, data, TRUE, done);
-	}
-
	static void bearssl_get_internals(struct ssl_connect_data connssl,
	CURLINFO info UNUSED_PARAM)
	{
@@ -1161,7 +1087,6 @@ const struct Curl_ssl Curl_ssl_bearssl = {
	bearssl_random, /* random */
	NULL, /* cert_status_request */
	bearssl_connect, /* connect */
-	bearssl_connect_nonblocking, /* connect_nonblocking */
	Curl_ssl_adjust_pollset, /* adjust_pollset */
	bearssl_get_internals, /* get_internals */
	bearssl_close, /* close_one */

lib/vtls/gtls.c+65 -120

@@ -238,115 +238,68 @@ static void unload_file(gnutls_datum_t data)

	/* this function does a SSL/TLS (re-)handshake */
	static CURLcode handshake(struct Curl_cfilter *cf,
-	struct Curl_easy *data,
-	bool duringconnect,
-	bool nonblocking)
+	struct Curl_easy *data)
	{
	struct ssl_connect_data *connssl = cf->ctx;
	struct gtls_ssl_backend_data *backend =
	(struct gtls_ssl_backend_data *)connssl->backend;
	gnutls_session_t session;
-	curl_socket_t sockfd = Curl_conn_cf_get_socket(cf, data);
+	int rc;

	DEBUGASSERT(backend);
	session = backend->gtls.session;
-	connssl->connecting_state = ssl_connect_2;
-
-	for(;;) {
-	timediff_t timeout_ms;
-	int rc;
-
-	/* check allowed time left */
-	timeout_ms = Curl_timeleft(data, NULL, duringconnect);

-	if(timeout_ms < 0) {
-	/* no need to continue if time already is up */
-	failf(data, "SSL connection timeout");
-	return CURLE_OPERATION_TIMEDOUT;
-	}
-
-	/* if ssl is expecting something, check if it is available. */
-	if(connssl->io_need) {
-	int what;
-	curl_socket_t writefd = (connssl->io_need & CURL_SSL_IO_NEED_SEND) ?
-	sockfd : CURL_SOCKET_BAD;
-	curl_socket_t readfd = (connssl->io_need & CURL_SSL_IO_NEED_RECV) ?
-	sockfd : CURL_SOCKET_BAD;
-
-	what = Curl_socket_check(readfd, CURL_SOCKET_BAD, writefd,
-	nonblocking ? 0 :
-	timeout_ms ? timeout_ms : 1000);
-	if(what < 0) {
-	/* fatal error */
-	failf(data, "select/poll on SSL socket, errno: %d", SOCKERRNO);
-	return CURLE_SSL_CONNECT_ERROR;
-	}
-	else if(0 == what) {
-	if(nonblocking)
-	return CURLE_AGAIN;
-	else if(timeout_ms) {
-	/* timeout */
-	failf(data, "SSL connection timeout at %ld", (long)timeout_ms);
-	return CURLE_OPERATION_TIMEDOUT;
-	}
-	}
-	/* socket is readable or writable */
-	}
+	connssl->io_need = CURL_SSL_IO_NEED_NONE;
+	backend->gtls.io_result = CURLE_OK;
+	rc = gnutls_handshake(session);

-	connssl->io_need = CURL_SSL_IO_NEED_NONE;
-	backend->gtls.io_result = CURLE_OK;
-	rc = gnutls_handshake(session);
+	if(!backend->gtls.shared_creds->trust_setup) {
+	/* After having send off the ClientHello, we prepare the trust
+	* store to verify the coming certificate from the server */
+	CURLcode result = Curl_gtls_client_trust_setup(cf, data, &backend->gtls);
+	if(result)
+	return result;
+	}

-	if(!backend->gtls.shared_creds->trust_setup) {
-	/* After having send off the ClientHello, we prepare the trust
-	* store to verify the coming certificate from the server */
-	CURLcode result = Curl_gtls_client_trust_setup(cf, data, &backend->gtls);
-	if(result)
-	return result;
-	}
+	if((rc == GNUTLS_E_AGAIN) \|\| (rc == GNUTLS_E_INTERRUPTED)) {
+	connssl->io_need =
+	gnutls_record_get_direction(session) ?
+	CURL_SSL_IO_NEED_SEND : CURL_SSL_IO_NEED_RECV;
+	return CURLE_AGAIN;
+	}
+	else if((rc < 0) && !gnutls_error_is_fatal(rc)) {
+	const char *strerr = NULL;

-	if((rc == GNUTLS_E_AGAIN) \|\| (rc == GNUTLS_E_INTERRUPTED)) {
-	connssl->io_need =
-	gnutls_record_get_direction(session) ?
-	CURL_SSL_IO_NEED_SEND : CURL_SSL_IO_NEED_RECV;
-	continue;
+	if(rc == GNUTLS_E_WARNING_ALERT_RECEIVED) {
+	gnutls_alert_description_t alert = gnutls_alert_get(session);
+	strerr = gnutls_alert_get_name(alert);
	}
-	else if((rc < 0) && !gnutls_error_is_fatal(rc)) {
-	const char *strerr = NULL;

-	if(rc == GNUTLS_E_WARNING_ALERT_RECEIVED) {
-	gnutls_alert_description_t alert = gnutls_alert_get(session);
-	strerr = gnutls_alert_get_name(alert);
-	}
+	if(!strerr)
+	strerr = gnutls_strerror(rc);

-	if(!strerr)
-	strerr = gnutls_strerror(rc);
+	infof(data, "gnutls_handshake() warning: %s", strerr);
+	return CURLE_AGAIN;
+	}
+	else if((rc < 0) && backend->gtls.io_result) {
+	return backend->gtls.io_result;
+	}
+	else if(rc < 0) {
+	const char *strerr = NULL;

-	infof(data, "gnutls_handshake() warning: %s", strerr);
-	continue;
-	}
-	else if((rc < 0) && backend->gtls.io_result) {
-	return backend->gtls.io_result;
+	if(rc == GNUTLS_E_FATAL_ALERT_RECEIVED) {
+	gnutls_alert_description_t alert = gnutls_alert_get(session);
+	strerr = gnutls_alert_get_name(alert);
	}
-	else if(rc < 0) {
-	const char *strerr = NULL;

-	if(rc == GNUTLS_E_FATAL_ALERT_RECEIVED) {
-	gnutls_alert_description_t alert = gnutls_alert_get(session);
-	strerr = gnutls_alert_get_name(alert);
-	}
-
-	if(!strerr)
-	strerr = gnutls_strerror(rc);
+	if(!strerr)
+	strerr = gnutls_strerror(rc);

-	failf(data, "GnuTLS, handshake failed: %s", strerr);
-	return CURLE_SSL_CONNECT_ERROR;
-	}
-
-	/* Reset our connect state machine */
-	connssl->connecting_state = ssl_connect_1;
-	return CURLE_OK;
+	failf(data, "GnuTLS, handshake failed: %s", strerr);
+	return CURLE_SSL_CONNECT_ERROR;
	}
+
+	return CURLE_OK;
	}

	static gnutls_x509_crt_fmt_t gnutls_do_file_type(const char *type)
@@ -1258,7 +1211,6 @@ gtls_connect_step1(struct Curl_cfilter cf, struct Curl_easy data)
	CURLcode result;

	DEBUGASSERT(backend);
-	DEBUGASSERT(ssl_connect_1 == connssl->connecting_state);

	if(connssl->state == ssl_connection_complete)
	/* to make us tolerant against being called more than once for the
@@ -1901,17 +1853,22 @@ out:
	'ssl_connect_2' (doing handshake with the server), and
	'ssl_connect_3' (verifying and getting stats).
	*/
-	static CURLcode
-	gtls_connect_common(struct Curl_cfilter *cf,
-	struct Curl_easy *data,
-	bool nonblocking,
-	bool *done) {
+	static CURLcode gtls_connect_common(struct Curl_cfilter *cf,
+	struct Curl_easy *data,
+	bool *done) {
	struct ssl_connect_data *connssl = cf->ctx;
	struct gtls_ssl_backend_data *backend =
	(struct gtls_ssl_backend_data *)connssl->backend;
	CURLcode result = CURLE_OK;

	DEBUGASSERT(backend);
+	/* check if the connection has already been established */
+	if(ssl_connection_complete == connssl->state) {
+	*done = TRUE;
+	return CURLE_OK;
+	}
+
+	*done = FALSE;

	/* Initiate the connection, if not already done */
	if(connssl->connecting_state == ssl_connect_1) {
@@ -1936,7 +1893,7 @@ gtls_connect_common(struct Curl_cfilter *cf,
	DEBUGASSERT((connssl->earlydata_state == ssl_earlydata_none) \|\|
	(connssl->earlydata_state == ssl_earlydata_sent));

-	result = handshake(cf, data, TRUE, nonblocking);
+	result = handshake(cf, data);
	if(result)
	goto out;
	connssl->connecting_state = ssl_connect_3;
@@ -1951,7 +1908,6 @@ gtls_connect_common(struct Curl_cfilter *cf,
	goto out;

	connssl->state = ssl_connection_complete;
-	connssl->connecting_state = ssl_connect_1;

	rc = gnutls_alpn_get_selected_protocol(backend->gtls.session, &proto);
	if(rc) { /* No ALPN from server */
@@ -1982,6 +1938,12 @@ gtls_connect_common(struct Curl_cfilter *cf,
	connssl->earlydata_skip = 0;
	}
	}
+	connssl->connecting_state = ssl_connect_done;
+	}
+
+	if(ssl_connect_done == connssl->connecting_state) {
+	connssl->state = ssl_connection_complete;
+	*done = TRUE;
	}

	out:
@@ -1994,9 +1956,9 @@ out:
	return result;
	}

-	static CURLcode gtls_connect_nonblocking(struct Curl_cfilter *cf,
-	struct Curl_easy *data,
-	bool *done)
+	static CURLcode gtls_connect(struct Curl_cfilter *cf,
+	struct Curl_easy *data,
+	bool *done)
	{
	struct ssl_connect_data *connssl = cf->ctx;
	if(connssl->state == ssl_connection_deferred) {
@@ -2004,22 +1966,7 @@ static CURLcode gtls_connect_nonblocking(struct Curl_cfilter *cf,
	*done = TRUE;
	return CURLE_OK;
	}
-	return gtls_connect_common(cf, data, TRUE, done);
-	}
-
-	static CURLcode gtls_connect(struct Curl_cfilter *cf,
-	struct Curl_easy *data)
-	{
-	CURLcode result;
-	bool done = FALSE;
-
-	result = gtls_connect_common(cf, data, FALSE, &done);
-	if(result)
-	return result;
-
-	DEBUGASSERT(done);
-
-	return CURLE_OK;
+	return gtls_connect_common(cf, data, done);
	}

	static CURLcode gtls_connect_deferred(struct Curl_cfilter *cf,
@@ -2039,7 +1986,7 @@ static CURLcode gtls_connect_deferred(struct Curl_cfilter *cf,
	return result;
	}

-	return gtls_connect_common(cf, data, TRUE, done);
+	return gtls_connect_common(cf, data, done);
	}

	static bool gtls_data_pending(struct Curl_cfilter *cf,
@@ -2272,9 +2219,8 @@ static ssize_t gtls_recv(struct Curl_cfilter *cf,
	if(ret == GNUTLS_E_REHANDSHAKE) {
	/* BLOCKING call, this is bad but a work-around for now. Fixing this "the
	proper way" takes a whole lot of work. */
-	CURLcode result = handshake(cf, data, FALSE, FALSE);
+	CURLcode result = handshake(cf, data);
	if(result)
-	/* handshake() writes error message on its own */
	*curlcode = result;
	else
	curlcode = CURLE_AGAIN; / then return as if this was a wouldblock */
@@ -2356,7 +2302,6 @@ const struct Curl_ssl Curl_ssl_gnutls = {
	gtls_random, /* random */
	gtls_cert_status_request, /* cert_status_request */
	gtls_connect, /* connect */
-	gtls_connect_nonblocking, /* connect_nonblocking */
	Curl_ssl_adjust_pollset, /* adjust_pollset */
	gtls_get_internals, /* get_internals */
	gtls_close, /* close_one */

lib/vtls/mbedtls.c+9 -95

@@ -1440,16 +1440,12 @@ static CURLcode mbedtls_random(struct Curl_easy *data,
	#endif
	}

-	static CURLcode
-	mbed_connect_common(struct Curl_cfilter cf, struct Curl_easy data,
-	bool nonblocking,
-	bool *done)
+	static CURLcode mbedtls_connect(struct Curl_cfilter *cf,
+	struct Curl_easy *data,
+	bool *done)
	{
	CURLcode retcode;
	struct ssl_connect_data *connssl = cf->ctx;
-	curl_socket_t sockfd = Curl_conn_cf_get_socket(cf, data);
-	timediff_t timeout_ms;
-	int what;

	/* check if the connection has already been established */
	if(ssl_connection_complete == connssl->state) {
@@ -1457,73 +1453,20 @@ mbed_connect_common(struct Curl_cfilter cf, struct Curl_easy data,
	return CURLE_OK;
	}

-	if(ssl_connect_1 == connssl->connecting_state) {
-	/* Find out how much more time we are allowed */
-	timeout_ms = Curl_timeleft(data, NULL, TRUE);
+	*done = FALSE;
+	connssl->io_need = CURL_SSL_IO_NEED_NONE;

-	if(timeout_ms < 0) {
-	/* no need to continue if time already is up */
-	failf(data, "SSL connection timeout");
-	return CURLE_OPERATION_TIMEDOUT;
-	}
+	if(ssl_connect_1 == connssl->connecting_state) {
	retcode = mbed_connect_step1(cf, data);
	if(retcode)
	return retcode;
	}

-	while(ssl_connect_2 == connssl->connecting_state) {
-
-	/* check allowed time left */
-	timeout_ms = Curl_timeleft(data, NULL, TRUE);
-
-	if(timeout_ms < 0) {
-	/* no need to continue if time already is up */
-	failf(data, "SSL connection timeout");
-	return CURLE_OPERATION_TIMEDOUT;
-	}
-
-	/* if ssl is expecting something, check if it is available. */
-	if(connssl->io_need) {
-	curl_socket_t writefd = (connssl->io_need & CURL_SSL_IO_NEED_SEND) ?
-	sockfd : CURL_SOCKET_BAD;
-	curl_socket_t readfd = (connssl->io_need & CURL_SSL_IO_NEED_RECV) ?
-	sockfd : CURL_SOCKET_BAD;
-
-	what = Curl_socket_check(readfd, CURL_SOCKET_BAD, writefd,
-	nonblocking ? 0 : timeout_ms);
-	if(what < 0) {
-	/* fatal error */
-	failf(data, "select/poll on SSL socket, errno: %d", SOCKERRNO);
-	return CURLE_SSL_CONNECT_ERROR;
-	}
-	else if(0 == what) {
-	if(nonblocking) {
-	*done = FALSE;
-	return CURLE_OK;
-	}
-	else {
-	/* timeout */
-	failf(data, "SSL connection timeout");
-	return CURLE_OPERATION_TIMEDOUT;
-	}
-	}
-	/* socket is readable or writable */
-	}
-
-	/* Run transaction, and return to the caller if it failed or if
-	* this connection is part of a multi handle and this loop would
-	* execute again. This permits the owner of a multi handle to
-	* abort a connection attempt before step2 has completed while
-	* ensuring that a client using select() or epoll() will always
-	* have a valid fdset to wait on.
-	*/
-	connssl->io_need = CURL_SSL_IO_NEED_NONE;
+	if(ssl_connect_2 == connssl->connecting_state) {
	retcode = mbed_connect_step2(cf, data);
-	if(retcode \|\|
-	(nonblocking && (ssl_connect_2 == connssl->connecting_state)))
+	if(retcode)
	return retcode;
-
-	} /* repeat step2 until all transactions are done. */
+	}

	if(ssl_connect_3 == connssl->connecting_state) {
	/* For tls1.3 we get notified about new sessions */
@@ -1548,34 +1491,6 @@ mbed_connect_common(struct Curl_cfilter cf, struct Curl_easy data,
	connssl->state = ssl_connection_complete;
	*done = TRUE;
	}
-	else
-	*done = FALSE;
-
-	/* Reset our connect state machine */
-	connssl->connecting_state = ssl_connect_1;
-
-	return CURLE_OK;
-	}
-
-	static CURLcode mbedtls_connect_nonblocking(struct Curl_cfilter *cf,
-	struct Curl_easy *data,
-	bool *done)
-	{
-	return mbed_connect_common(cf, data, TRUE, done);
-	}
-
-
-	static CURLcode mbedtls_connect(struct Curl_cfilter *cf,
-	struct Curl_easy *data)
-	{
-	CURLcode retcode;
-	bool done = FALSE;
-
-	retcode = mbed_connect_common(cf, data, FALSE, &done);
-	if(retcode)
-	return retcode;
-
-	DEBUGASSERT(done);

	return CURLE_OK;
	}
@@ -1682,7 +1597,6 @@ const struct Curl_ssl Curl_ssl_mbedtls = {
	mbedtls_random, /* random */
	NULL, /* cert_status_request */
	mbedtls_connect, /* connect */
-	mbedtls_connect_nonblocking, /* connect_nonblocking */
	Curl_ssl_adjust_pollset, /* adjust_pollset */
	mbedtls_get_internals, /* get_internals */
	mbedtls_close, /* close_one */

lib/vtls/openssl.c+9 -89

@@ -4919,85 +4919,33 @@ static CURLcode ossl_connect_step3(struct Curl_cfilter *cf,
	return result;
	}

-	static CURLcode ossl_connect_common(struct Curl_cfilter *cf,
-	struct Curl_easy *data,
-	bool nonblocking,
-	bool *done)
+	static CURLcode ossl_connect(struct Curl_cfilter *cf,
+	struct Curl_easy *data,
+	bool *done)
	{
	CURLcode result = CURLE_OK;
	struct ssl_connect_data *connssl = cf->ctx;
-	curl_socket_t sockfd = Curl_conn_cf_get_socket(cf, data);
-	int what;

-	connssl->io_need = CURL_SSL_IO_NEED_NONE;
	/* check if the connection has already been established */
	if(ssl_connection_complete == connssl->state) {
	*done = TRUE;
	return CURLE_OK;
	}

-	if(ssl_connect_1 == connssl->connecting_state) {
-	/* Find out how much more time we are allowed */
-	const timediff_t timeout_ms = Curl_timeleft(data, NULL, TRUE);
-
-	if(timeout_ms < 0) {
-	/* no need to continue if time is already up */
-	failf(data, "SSL connection timeout");
-	return CURLE_OPERATION_TIMEDOUT;
-	}
+	*done = FALSE;
+	connssl->io_need = CURL_SSL_IO_NEED_NONE;

+	if(ssl_connect_1 == connssl->connecting_state) {
	result = ossl_connect_step1(cf, data);
	if(result)
	goto out;
	}

-	while(ssl_connect_2 == connssl->connecting_state) {
-
-	/* check allowed time left */
-	const timediff_t timeout_ms = Curl_timeleft(data, NULL, TRUE);
-
-	if(timeout_ms < 0) {
-	/* no need to continue if time already is up */
-	failf(data, "SSL connection timeout");
-	result = CURLE_OPERATION_TIMEDOUT;
-	goto out;
-	}
-
-	/* if ssl is expecting something, check if it is available. */
-	if(!nonblocking && connssl->io_need) {
-	curl_socket_t writefd = (connssl->io_need & CURL_SSL_IO_NEED_SEND) ?
-	sockfd : CURL_SOCKET_BAD;
-	curl_socket_t readfd = (connssl->io_need & CURL_SSL_IO_NEED_RECV) ?
-	sockfd : CURL_SOCKET_BAD;
-
-	what = Curl_socket_check(readfd, CURL_SOCKET_BAD, writefd,
-	timeout_ms);
-	if(what < 0) {
-	/* fatal error */
-	failf(data, "select/poll on SSL socket, errno: %d", SOCKERRNO);
-	result = CURLE_SSL_CONNECT_ERROR;
-	goto out;
-	}
-	if(0 == what) {
-	/* timeout */
-	failf(data, "SSL connection timeout");
-	result = CURLE_OPERATION_TIMEDOUT;
-	goto out;
-	}
-	/* socket is readable or writable */
-	}
-
-	/* Run transaction, and return to the caller if it failed or if this
-	* connection is done nonblocking and this loop would execute again. This
-	* permits the owner of a multi handle to abort a connection attempt
-	* before step2 has completed while ensuring that a client using select()
-	* or epoll() will always have a valid fdset to wait on.
-	*/
+	if(ssl_connect_2 == connssl->connecting_state) {
	result = ossl_connect_step2(cf, data);
-	if(result \|\| (nonblocking && (ssl_connect_2 == connssl->connecting_state)))
+	if(result)
	goto out;
-
-	} /* repeat step2 until all transactions are done. */
+	}

	if(ssl_connect_3 == connssl->connecting_state) {
	result = ossl_connect_step3(cf, data);
@@ -5009,38 +4957,11 @@ static CURLcode ossl_connect_common(struct Curl_cfilter *cf,
	connssl->state = ssl_connection_complete;
	*done = TRUE;
	}
-	else
-	*done = FALSE;
-
-	/* Reset our connect state machine */
-	connssl->connecting_state = ssl_connect_1;

	out:
	return result;
	}

-	static CURLcode ossl_connect_nonblocking(struct Curl_cfilter *cf,
-	struct Curl_easy *data,
-	bool *done)
-	{
-	return ossl_connect_common(cf, data, TRUE, done);
-	}
-
-	static CURLcode ossl_connect(struct Curl_cfilter *cf,
-	struct Curl_easy *data)
-	{
-	CURLcode result;
-	bool done = FALSE;
-
-	result = ossl_connect_common(cf, data, FALSE, &done);
-	if(result)
-	return result;
-
-	DEBUGASSERT(done);
-
-	return CURLE_OK;
-	}
-
	static bool ossl_data_pending(struct Curl_cfilter *cf,
	const struct Curl_easy *data)
	{
@@ -5500,7 +5421,6 @@ const struct Curl_ssl Curl_ssl_openssl = {
	ossl_random, /* random */
	ossl_cert_status_request, /* cert_status_request */
	ossl_connect, /* connect */
-	ossl_connect_nonblocking, /* connect_nonblocking */
	Curl_ssl_adjust_pollset, /* adjust_pollset */
	ossl_get_internals, /* get_internals */
	ossl_close, /* close_one */

lib/vtls/rustls.c+12 -74

@@ -779,48 +779,36 @@ cr_set_negotiated_alpn(struct Curl_cfilter cf, struct Curl_easy data,

	/* Given an established network connection, do a TLS handshake.
	*
-	* If `blocking` is true, this function will block until the handshake is
-	* complete. Otherwise it will return as soon as I/O would block.
-	*
-	* For the non-blocking I/O case, this function will set `*done` to true
-	* once the handshake is complete. This function never reads the value of
-	* `done`.
+	* This function will set `*done` to true once the handshake is complete.
+	* This function never reads the value of `done`.
	*/
	static CURLcode
-	cr_connect_common(struct Curl_cfilter *cf,
-	struct Curl_easy *data,
-	bool blocking,
-	bool *done)
+	cr_connect(struct Curl_cfilter *cf,
+	struct Curl_easy data, bool done)
	{
	struct ssl_connect_data *const connssl = cf->ctx;
-	curl_socket_t sockfd = Curl_conn_cf_get_socket(cf, data);
	struct rustls_ssl_backend_data *const backend =
	(struct rustls_ssl_backend_data *)connssl->backend;
	struct rustls_connection *rconn = NULL;
	CURLcode tmperr = CURLE_OK;
	int result;
-	int what;
	bool wants_read;
	bool wants_write;
-	curl_socket_t writefd;
-	curl_socket_t readfd;
-	timediff_t timeout_ms;
-	timediff_t socket_check_timeout;

	DEBUGASSERT(backend);

-	CURL_TRC_CF(data, cf, "cr_connect_common, state=%d", connssl->state);
+	CURL_TRC_CF(data, cf, "cr_connect, state=%d", connssl->state);
	*done = FALSE;
+
	if(!backend->conn) {
	result = cr_init_backend(cf, data,
	(struct rustls_ssl_backend_data *)connssl->backend);
-	CURL_TRC_CF(data, cf, "cr_connect_common, init backend -> %d", result);
+	CURL_TRC_CF(data, cf, "cr_connect, init backend -> %d", result);
	if(result != CURLE_OK) {
	return result;
	}
	connssl->state = ssl_connection_negotiating;
	}
-
	rconn = backend->conn;

	/* Read/write data until the handshake is done or the socket would block. */
@@ -868,50 +856,14 @@ cr_connect_common(struct Curl_cfilter *cf,
	wants_write = rustls_connection_wants_write(rconn) \|\|
	backend->plain_out_buffered;
	DEBUGASSERT(wants_read \|\| wants_write);
-	writefd = wants_write ? sockfd : CURL_SOCKET_BAD;
-	readfd = wants_read ? sockfd : CURL_SOCKET_BAD;
-
-	/* check allowed time left */
-	timeout_ms = Curl_timeleft(data, NULL, TRUE);
-
-	if(timeout_ms < 0) {
-	/* no need to continue if time already is up */
-	failf(data, "rustls: operation timed out before socket check");
-	return CURLE_OPERATION_TIMEDOUT;
-	}
-
-	socket_check_timeout = blocking ? timeout_ms : 0;
-
-	what = Curl_socket_check(readfd, CURL_SOCKET_BAD, writefd,
-	socket_check_timeout);
-	if(what < 0) {
-	/* fatal error */
-	failf(data, "select/poll on SSL socket, errno: %d", SOCKERRNO);
-	return CURLE_SSL_CONNECT_ERROR;
-	}
-	if(blocking && 0 == what) {
-	failf(data, "rustls: connection timeout after %" FMT_TIMEDIFF_T " ms",
-	socket_check_timeout);
-	return CURLE_OPERATION_TIMEDOUT;
-	}
-	if(0 == what) {
-	CURL_TRC_CF(data, cf, "Curl_socket_check: %s would block",
-	wants_read && wants_write ? "writing and reading" :
-	wants_write ? "writing" : "reading");
-	if(wants_write)
-	connssl->io_need \|= CURL_SSL_IO_NEED_SEND;
-	if(wants_read)
-	connssl->io_need \|= CURL_SSL_IO_NEED_RECV;
-	return CURLE_OK;
-	}
-	/* socket is readable or writable */

	if(wants_write) {
	CURL_TRC_CF(data, cf, "rustls_connection wants us to write_tls.");
	cr_send(cf, data, NULL, 0, &tmperr);
	if(tmperr == CURLE_AGAIN) {
	CURL_TRC_CF(data, cf, "writing would block");
-	/* fall through */
+	connssl->io_need = CURL_SSL_IO_NEED_SEND;
+	return CURLE_OK;
	}
	else if(tmperr != CURLE_OK) {
	return tmperr;
@@ -923,7 +875,8 @@ cr_connect_common(struct Curl_cfilter *cf,
	if(tls_recv_more(cf, data, &tmperr) < 0) {
	if(tmperr == CURLE_AGAIN) {
	CURL_TRC_CF(data, cf, "reading would block");
-	/* fall through */
+	connssl->io_need = CURL_SSL_IO_NEED_RECV;
+	return CURLE_OK;
	}
	else if(tmperr == CURLE_RECV_ERROR) {
	return CURLE_SSL_CONNECT_ERROR;
@@ -940,20 +893,6 @@ cr_connect_common(struct Curl_cfilter *cf,
	DEBUGASSERT(FALSE);
	}

-	static CURLcode
-	cr_connect_nonblocking(struct Curl_cfilter *cf,
-	struct Curl_easy data, bool done)
-	{
-	return cr_connect_common(cf, data, false, done);
-	}
-
-	static CURLcode
-	cr_connect_blocking(struct Curl_cfilter cf, struct Curl_easy data)
-	{
-	bool done; /* unused */
-	return cr_connect_common(cf, data, true, &done);
-	}
-
	static void *
	cr_get_internals(struct ssl_connect_data *connssl,
	CURLINFO info UNUSED_PARAM)
@@ -1083,8 +1022,7 @@ const struct Curl_ssl Curl_ssl_rustls = {
	cr_data_pending, /* data_pending */
	cr_random, /* random */
	NULL, /* cert_status_request */
-	cr_connect_blocking, /* connect */
-	cr_connect_nonblocking, /* connect_nonblocking */
+	cr_connect, /* connect */
	Curl_ssl_adjust_pollset, /* adjust_pollset */
	cr_get_internals, /* get_internals */
	cr_close, /* close_one */

lib/vtls/schannel.c+10 -96

@@ -1648,16 +1648,12 @@ schannel_connect_step3(struct Curl_cfilter cf, struct Curl_easy data)
	return CURLE_OK;
	}

-	static CURLcode
-	schannel_connect_common(struct Curl_cfilter *cf,
-	struct Curl_easy *data,
-	bool nonblocking, bool *done)
+	static CURLcode schannel_connect(struct Curl_cfilter *cf,
+	struct Curl_easy *data,
+	bool *done)
	{
-	CURLcode result;
	struct ssl_connect_data *connssl = cf->ctx;
-	curl_socket_t sockfd = Curl_conn_cf_get_socket(cf, data);
-	timediff_t timeout_ms;
-	int what;
+	CURLcode result;

	/* check if the connection has already been established */
	if(ssl_connection_complete == connssl->state) {
@@ -1665,73 +1661,19 @@ schannel_connect_common(struct Curl_cfilter *cf,
	return CURLE_OK;
	}

-	if(ssl_connect_1 == connssl->connecting_state) {
-	/* check out how much more time we are allowed */
-	timeout_ms = Curl_timeleft(data, NULL, TRUE);
-
-	if(timeout_ms < 0) {
-	/* no need to continue if time already is up */
-	failf(data, "SSL/TLS connection timeout");
-	return CURLE_OPERATION_TIMEDOUT;
-	}
+	*done = FALSE;

+	if(ssl_connect_1 == connssl->connecting_state) {
	result = schannel_connect_step1(cf, data);
	if(result)
	return result;
	}

-	while(ssl_connect_2 == connssl->connecting_state) {
-
-	/* check out how much more time we are allowed */
-	timeout_ms = Curl_timeleft(data, NULL, TRUE);
-
-	if(timeout_ms < 0) {
-	/* no need to continue if time already is up */
-	failf(data, "SSL/TLS connection timeout");
-	return CURLE_OPERATION_TIMEDOUT;
-	}
-
-	/* if ssl is expecting something, check if it is available. */
-	if(connssl->io_need) {
-
-	curl_socket_t writefd = (connssl->io_need & CURL_SSL_IO_NEED_SEND) ?
-	sockfd : CURL_SOCKET_BAD;
-	curl_socket_t readfd = (connssl->io_need & CURL_SSL_IO_NEED_RECV) ?
-	sockfd : CURL_SOCKET_BAD;
-
-	what = Curl_socket_check(readfd, CURL_SOCKET_BAD, writefd,
-	nonblocking ? 0 : timeout_ms);
-	if(what < 0) {
-	/* fatal error */
-	failf(data, "select/poll on SSL/TLS socket, errno: %d", SOCKERRNO);
-	return CURLE_SSL_CONNECT_ERROR;
-	}
-	else if(0 == what) {
-	if(nonblocking) {
-	*done = FALSE;
-	return CURLE_OK;
-	}
-	else {
-	/* timeout */
-	failf(data, "SSL/TLS connection timeout");
-	return CURLE_OPERATION_TIMEDOUT;
-	}
-	}
-	/* socket is readable or writable */
-	}
-
-	/* Run transaction, and return to the caller if it failed or if
-	* this connection is part of a multi handle and this loop would
-	* execute again. This permits the owner of a multi handle to
-	* abort a connection attempt before step2 has completed while
-	* ensuring that a client using select() or epoll() will always
-	* have a valid fdset to wait on.
-	*/
+	if(ssl_connect_2 == connssl->connecting_state) {
	result = schannel_connect_step2(cf, data);
-	if(result \|\| (nonblocking && (ssl_connect_2 == connssl->connecting_state)))
+	if(result)
	return result;
-
-	} /* repeat step2 until all transactions are done. */
+	}

	if(ssl_connect_3 == connssl->connecting_state) {
	result = schannel_connect_step3(cf, data);
@@ -1758,11 +1700,6 @@ schannel_connect_common(struct Curl_cfilter *cf,

	*done = TRUE;
	}
-	else
-	*done = FALSE;
-
-	/* reset our connection state machine */
-	connssl->connecting_state = ssl_connect_1;

	return CURLE_OK;
	}
@@ -2135,7 +2072,7 @@ schannel_recv(struct Curl_cfilter cf, struct Curl_easy data,
	connssl->connecting_state = ssl_connect_2;
	connssl->io_need = CURL_SSL_IO_NEED_SEND;
	backend->recv_renegotiating = TRUE;
-	*err = schannel_connect_common(cf, data, FALSE, &done);
+	*err = schannel_connect(cf, data, &done);
	backend->recv_renegotiating = FALSE;
	if(*err) {
	infof(data, "schannel: renegotiation failed");
@@ -2246,28 +2183,6 @@ cleanup:
	return *err ? -1 : 0;
	}

-	static CURLcode schannel_connect_nonblocking(struct Curl_cfilter *cf,
-	struct Curl_easy *data,
-	bool *done)
-	{
-	return schannel_connect_common(cf, data, TRUE, done);
-	}
-
-	static CURLcode schannel_connect(struct Curl_cfilter *cf,
-	struct Curl_easy *data)
-	{
-	CURLcode result;
-	bool done = FALSE;
-
-	result = schannel_connect_common(cf, data, FALSE, &done);
-	if(result)
-	return result;
-
-	DEBUGASSERT(done);
-
-	return CURLE_OK;
-	}
-
	static bool schannel_data_pending(struct Curl_cfilter *cf,
	const struct Curl_easy *data)
	{
@@ -2806,7 +2721,6 @@ const struct Curl_ssl Curl_ssl_schannel = {
	schannel_random, /* random */
	NULL, /* cert_status_request */
	schannel_connect, /* connect */
-	schannel_connect_nonblocking, /* connect_nonblocking */
	Curl_ssl_adjust_pollset, /* adjust_pollset */
	schannel_get_internals, /* get_internals */
	schannel_close, /* close_one */

lib/vtls/sectransp.c+9 -94

@@ -2287,15 +2287,12 @@ static CURLcode sectransp_connect_step3(struct Curl_cfilter *cf,
	return CURLE_OK;
	}

-	static CURLcode
-	sectransp_connect_common(struct Curl_cfilter cf, struct Curl_easy data,
-	bool nonblocking,
-	bool *done)
+	static CURLcode sectransp_connect(struct Curl_cfilter *cf,
+	struct Curl_easy *data,
+	bool *done)
	{
	CURLcode result;
	struct ssl_connect_data *connssl = cf->ctx;
-	curl_socket_t sockfd = Curl_conn_cf_get_socket(cf, data);
-	int what;

	/* check if the connection has already been established */
	if(ssl_connection_complete == connssl->state) {
@@ -2303,73 +2300,20 @@ sectransp_connect_common(struct Curl_cfilter cf, struct Curl_easy data,
	return CURLE_OK;
	}

-	if(ssl_connect_1 == connssl->connecting_state) {
-	/* Find out how much more time we are allowed */
-	const timediff_t timeout_ms = Curl_timeleft(data, NULL, TRUE);
-
-	if(timeout_ms < 0) {
-	/* no need to continue if time already is up */
-	failf(data, "SSL connection timeout");
-	return CURLE_OPERATION_TIMEDOUT;
-	}
+	*done = FALSE;
+	connssl->io_need = CURL_SSL_IO_NEED_NONE;

+	if(ssl_connect_1 == connssl->connecting_state) {
	result = sectransp_connect_step1(cf, data);
	if(result)
	return result;
	}

-	while(ssl_connect_2 == connssl->connecting_state) {
-
-	/* check allowed time left */
-	const timediff_t timeout_ms = Curl_timeleft(data, NULL, TRUE);
-
-	if(timeout_ms < 0) {
-	/* no need to continue if time already is up */
-	failf(data, "SSL connection timeout");
-	return CURLE_OPERATION_TIMEDOUT;
-	}
-
-	/* if ssl is expecting something, check if it is available. */
-	if(connssl->io_need) {
-
-	curl_socket_t writefd = (connssl->io_need & CURL_SSL_IO_NEED_SEND) ?
-	sockfd : CURL_SOCKET_BAD;
-	curl_socket_t readfd = (connssl->io_need & CURL_SSL_IO_NEED_RECV) ?
-	sockfd : CURL_SOCKET_BAD;
-
-	what = Curl_socket_check(readfd, CURL_SOCKET_BAD, writefd,
-	nonblocking ? 0 : timeout_ms);
-	if(what < 0) {
-	/* fatal error */
-	failf(data, "select/poll on SSL socket, errno: %d", SOCKERRNO);
-	return CURLE_SSL_CONNECT_ERROR;
-	}
-	else if(0 == what) {
-	if(nonblocking) {
-	*done = FALSE;
-	return CURLE_OK;
-	}
-	else {
-	/* timeout */
-	failf(data, "SSL connection timeout");
-	return CURLE_OPERATION_TIMEDOUT;
-	}
-	}
-	/* socket is readable or writable */
-	}
-
-	/* Run transaction, and return to the caller if it failed or if this
-	* connection is done nonblocking and this loop would execute again. This
-	* permits the owner of a multi handle to abort a connection attempt
-	* before step2 has completed while ensuring that a client using select()
-	* or epoll() will always have a valid fdset to wait on.
-	*/
+	if(ssl_connect_2 == connssl->connecting_state) {
	result = sectransp_connect_step2(cf, data);
-	if(result \|\| (nonblocking && (ssl_connect_2 == connssl->connecting_state)))
+	if(result)
	return result;
-
-	} /* repeat step2 until all transactions are done. */
-
+	}

	if(ssl_connect_3 == connssl->connecting_state) {
	result = sectransp_connect_step3(cf, data);
@@ -2382,34 +2326,6 @@ sectransp_connect_common(struct Curl_cfilter cf, struct Curl_easy data,
	connssl->state = ssl_connection_complete;
	*done = TRUE;
	}
-	else
-	*done = FALSE;
-
-	/* Reset our connect state machine */
-	connssl->connecting_state = ssl_connect_1;
-
-	return CURLE_OK;
-	}
-
-	static CURLcode sectransp_connect_nonblocking(struct Curl_cfilter *cf,
-	struct Curl_easy *data,
-	bool *done)
-	{
-	return sectransp_connect_common(cf, data, TRUE, done);
-	}
-
-	static CURLcode sectransp_connect(struct Curl_cfilter *cf,
-	struct Curl_easy *data)
-	{
-	CURLcode result;
-	bool done = FALSE;
-
-	result = sectransp_connect_common(cf, data, FALSE, &done);
-
-	if(result)
-	return result;
-
-	DEBUGASSERT(done);

	return CURLE_OK;
	}
@@ -2754,7 +2670,6 @@ const struct Curl_ssl Curl_ssl_sectransp = {
	sectransp_random, /* random */
	NULL, /* cert_status_request */
	sectransp_connect, /* connect */
-	sectransp_connect_nonblocking, /* connect_nonblocking */
	Curl_ssl_adjust_pollset, /* adjust_pollset */
	sectransp_get_internals, /* get_internals */
	sectransp_close, /* close_one */

lib/vtls/vtls.c+7 -44

@@ -485,29 +485,8 @@ static void cf_ctx_free(struct ssl_connect_data *ctx)
	}
	}

-	static CURLcode ssl_connect(struct Curl_cfilter cf, struct Curl_easy data)
-	{
-	struct ssl_connect_data *connssl = cf->ctx;
-	CURLcode result;
-
-	if(!ssl_prefs_check(data))
-	return CURLE_SSL_CONNECT_ERROR;
-
-	/* mark this is being ssl-enabled from here on. */
-	connssl->state = ssl_connection_negotiating;
-
-	result = connssl->ssl_impl->connect_blocking(cf, data);
-
-	if(!result) {
-	DEBUGASSERT(connssl->state == ssl_connection_complete);
-	}
-
-	return result;
-	}
-
	static CURLcode
-	ssl_connect_nonblocking(struct Curl_cfilter cf, struct Curl_easy data,
-	bool *done)
+	ssl_connect(struct Curl_cfilter cf, struct Curl_easy data, bool *done)
	{
	struct ssl_connect_data *connssl = cf->ctx;

@@ -515,7 +494,7 @@ ssl_connect_nonblocking(struct Curl_cfilter cf, struct Curl_easy data,
	return CURLE_SSL_CONNECT_ERROR;

	/* mark this is being ssl requested from here on. */
-	return connssl->ssl_impl->connect_nonblocking(cf, data, done);
+	return connssl->ssl_impl->do_connect(cf, data, done);
	}

	CURLcode Curl_ssl_get_channel_binding(struct Curl_easy *data, int sockindex,
@@ -923,20 +902,11 @@ static int multissl_init(void)
	}

	static CURLcode multissl_connect(struct Curl_cfilter *cf,
-	struct Curl_easy *data)
+	struct Curl_easy data, bool done)
	{
	if(multissl_setup(NULL))
	return CURLE_FAILED_INIT;
-	return Curl_ssl->connect_blocking(cf, data);
-	}
-
-	static CURLcode multissl_connect_nonblocking(struct Curl_cfilter *cf,
-	struct Curl_easy *data,
-	bool *done)
-	{
-	if(multissl_setup(NULL))
-	return CURLE_FAILED_INIT;
-	return Curl_ssl->connect_nonblocking(cf, data, done);
+	return Curl_ssl->do_connect(cf, data, done);
	}

	static void multissl_adjust_pollset(struct Curl_cfilter *cf,
@@ -995,7 +965,6 @@ static const struct Curl_ssl Curl_ssl_multi = {
	NULL, /* random */
	NULL, /* cert_status_request */
	multissl_connect, /* connect */
-	multissl_connect_nonblocking, /* connect_nonblocking */
	multissl_adjust_pollset, /* adjust_pollset */
	multissl_get_internals, /* get_internals */
	multissl_close, /* close_one */
@@ -1343,7 +1312,7 @@ static void ssl_cf_close(struct Curl_cfilter *cf,

	static CURLcode ssl_cf_connect(struct Curl_cfilter *cf,
	struct Curl_easy *data,
-	bool blocking, bool *done)
+	bool *done)
	{
	struct ssl_connect_data *connssl = cf->ctx;
	struct cf_call_data save;
@@ -1360,7 +1329,7 @@ static CURLcode ssl_cf_connect(struct Curl_cfilter *cf,
	}

	if(!cf->next->connected) {
-	result = cf->next->cft->do_connect(cf->next, data, blocking, done);
+	result = cf->next->cft->do_connect(cf->next, data, done);
	if(result \|\| !*done)
	return result;
	}
@@ -1380,13 +1349,7 @@ static CURLcode ssl_cf_connect(struct Curl_cfilter *cf,
	goto out;
	}

-	if(blocking) {
-	result = ssl_connect(cf, data);
-	*done = (result == CURLE_OK);
-	}
-	else {
-	result = ssl_connect_nonblocking(cf, data, done);
-	}
+	result = ssl_connect(cf, data, done);

	if(!result && *done) {
	cf->connected = TRUE;

lib/vtls/vtls_int.h+2 -5

@@ -157,11 +157,8 @@ struct Curl_ssl {
	size_t length);
	bool (*cert_status_request)(void);

-	CURLcode (connect_blocking)(struct Curl_cfilter cf,
-	struct Curl_easy *data);
-	CURLcode (connect_nonblocking)(struct Curl_cfilter cf,
-	struct Curl_easy *data,
-	bool *done);
+	CURLcode (do_connect)(struct Curl_cfilter cf, struct Curl_easy *data,
+	bool *done);

	/* During handshake/shutdown, adjust the pollset to include the socket
	* for POLLOUT or POLLIN as needed. Mandatory. */

lib/vtls/wolfssl.c+9 -91

@@ -1842,15 +1842,12 @@ static bool wolfssl_data_pending(struct Curl_cfilter *cf,
	return FALSE;
	}

-	static CURLcode
-	wolfssl_connect_common(struct Curl_cfilter *cf,
-	struct Curl_easy *data,
-	bool nonblocking,
-	bool *done)
+	static CURLcode wolfssl_connect(struct Curl_cfilter *cf,
+	struct Curl_easy *data,
+	bool *done)
	{
	CURLcode result;
	struct ssl_connect_data *connssl = cf->ctx;
-	curl_socket_t sockfd = Curl_conn_cf_get_socket(cf, data);

	/* check if the connection has already been established */
	if(ssl_connection_complete == connssl->state) {
@@ -1858,70 +1855,20 @@ wolfssl_connect_common(struct Curl_cfilter *cf,
	return CURLE_OK;
	}

-	if(ssl_connect_1 == connssl->connecting_state) {
-	/* Find out how much more time we are allowed */
-	const timediff_t timeout_ms = Curl_timeleft(data, NULL, TRUE);
-
-	if(timeout_ms < 0) {
-	/* no need to continue if time already is up */
-	failf(data, "SSL connection timeout");
-	return CURLE_OPERATION_TIMEDOUT;
-	}
+	*done = FALSE;
+	connssl->io_need = CURL_SSL_IO_NEED_NONE;

+	if(ssl_connect_1 == connssl->connecting_state) {
	result = wolfssl_connect_step1(cf, data);
	if(result)
	return result;
	}

-	while(ssl_connect_2 == connssl->connecting_state) {
-
-	/* check allowed time left */
-	const timediff_t timeout_ms = Curl_timeleft(data, NULL, TRUE);
-
-	if(timeout_ms < 0) {
-	/* no need to continue if time already is up */
-	failf(data, "SSL connection timeout");
-	return CURLE_OPERATION_TIMEDOUT;
-	}
-
-	/* if ssl is expecting something, check if it is available. */
-	if(connssl->io_need) {
-	curl_socket_t writefd = (connssl->io_need & CURL_SSL_IO_NEED_SEND) ?
-	sockfd : CURL_SOCKET_BAD;
-	curl_socket_t readfd = (connssl->io_need & CURL_SSL_IO_NEED_RECV) ?
-	sockfd : CURL_SOCKET_BAD;
-	int what = Curl_socket_check(readfd, CURL_SOCKET_BAD, writefd,
-	nonblocking ? 0 : timeout_ms);
-	if(what < 0) {
-	/* fatal error */
-	failf(data, "select/poll on SSL socket, errno: %d", SOCKERRNO);
-	return CURLE_SSL_CONNECT_ERROR;
-	}
-	else if(0 == what) {
-	if(nonblocking) {
-	*done = FALSE;
-	return CURLE_OK;
-	}
-	else {
-	/* timeout */
-	failf(data, "SSL connection timeout");
-	return CURLE_OPERATION_TIMEDOUT;
-	}
-	}
-	/* socket is readable or writable */
-	}
-
-	/* Run transaction, and return to the caller if it failed or if
-	* this connection is part of a multi handle and this loop would
-	* execute again. This permits the owner of a multi handle to
-	* abort a connection attempt before step2 has completed while
-	* ensuring that a client using select() or epoll() will always
-	* have a valid fdset to wait on.
-	*/
+	if(ssl_connect_2 == connssl->connecting_state) {
	result = wolfssl_connect_step2(cf, data);
-	if(result \|\| (nonblocking && (ssl_connect_2 == connssl->connecting_state)))
+	if(result)
	return result;
-	} /* repeat step2 until all transactions are done. */
+	}

	if(ssl_connect_3 == connssl->connecting_state) {
	/* In other backends, this is where we verify the certificate, but
@@ -1933,39 +1880,11 @@ wolfssl_connect_common(struct Curl_cfilter *cf,
	connssl->state = ssl_connection_complete;
	*done = TRUE;
	}
-	else
-	*done = FALSE;
-
-	/* Reset our connect state machine */
-	connssl->connecting_state = ssl_connect_1;

	return CURLE_OK;
	}


-	static CURLcode wolfssl_connect_nonblocking(struct Curl_cfilter *cf,
-	struct Curl_easy *data,
-	bool *done)
-	{
-	return wolfssl_connect_common(cf, data, TRUE, done);
-	}
-
-
-	static CURLcode wolfssl_connect(struct Curl_cfilter *cf,
-	struct Curl_easy *data)
-	{
-	CURLcode result;
-	bool done = FALSE;
-
-	result = wolfssl_connect_common(cf, data, FALSE, &done);
-	if(result)
-	return result;
-
-	DEBUGASSERT(done);
-
-	return CURLE_OK;
-	}
-
	static CURLcode wolfssl_random(struct Curl_easy *data,
	unsigned char *entropy, size_t length)
	{
@@ -2037,7 +1956,6 @@ const struct Curl_ssl Curl_ssl_wolfssl = {
	wolfssl_random, /* random */
	NULL, /* cert_status_request */
	wolfssl_connect, /* connect */
-	wolfssl_connect_nonblocking, /* connect_nonblocking */
	Curl_ssl_adjust_pollset, /* adjust_pollset */
	wolfssl_get_internals, /* get_internals */
	wolfssl_close, /* close_one */

tests/unit/unit2600.c+1 -2

@@ -134,13 +134,12 @@ static void cf_test_destroy(struct Curl_cfilter cf, struct Curl_easy data)

	static CURLcode cf_test_connect(struct Curl_cfilter *cf,
	struct Curl_easy *data,
-	bool blocking, bool *done)
+	bool *done)
	{
	struct cf_test_ctx *ctx = cf->ctx;
	timediff_t duration_ms;

	(void)data;
-	(void)blocking;
	*done = FALSE;
	duration_ms = Curl_timediff(Curl_now(), ctx->started);
	if(duration_ms >= ctx->fail_delay_ms) {