c31041b17e
Stefan Eissing
2024-06-10
Subject
connection: shutdown TLS (for FTP) better
Binary
Architecture & Compiler Flags
—
Build Log
$ git checkout -f c31041b17e5ee60e7ecc2309daa8ababf7c7ad2d
Previous HEAD position was 374d178f14 multi: prepare multi_wait() for future shutdown usage
HEAD is now at c31041b17e connection: shutdown TLS (for FTP) better
$ git clean -fdx
Removing Makefile
Removing Makefile.in
Removing aclocal.m4
Removing autom4te.cache/
Removing compile
Removing config.guess
Removing config.log
Removing config.status
Removing config.sub
Removing configure
Removing curl-config
Removing depcomp
Removing docs/Makefile
Removing docs/Makefile.in
Removing docs/cmdline-opts/Makefile
Removing docs/cmdline-opts/Makefile.in
Removing docs/examples/.deps/
Removing docs/examples/Makefile
Removing docs/examples/Makefile.in
Removing docs/libcurl/Makefile
Removing docs/libcurl/Makefile.in
Removing docs/libcurl/opts/Makefile
Removing docs/libcurl/opts/Makefile.in
Removing include/Makefile
Removing include/Makefile.in
Removing include/curl/Makefile
Removing include/curl/Makefile.in
Removing install-sh
Removing lib/.deps/
Removing lib/.dirstamp
Removing lib/.libs/
Removing lib/Makefile
Removing lib/Makefile.in
Removing lib/base64.o
Removing lib/curl_config.h
Removing lib/curl_config.h.in
Removing lib/curl_multibyte.o
Removing lib/dynbuf.o
Removing lib/libcurl.la
Removing lib/libcurl.vers
Removing lib/libcurl_la-altsvc.lo
Removing lib/libcurl_la-altsvc.o
Removing lib/libcurl_la-amigaos.lo
Removing lib/libcurl_la-amigaos.o
Removing lib/libcurl_la-asyn-ares.lo
Removing lib/libcurl_la-asyn-ares.o
Removing lib/libcurl_la-asyn-thread.lo
Removing lib/libcurl_la-asyn-thread.o
Removing lib/libcurl_la-base64.lo
Removing lib/libcurl_la-base64.o
Removing lib/libcurl_la-bufq.lo
Removing lib/libcurl_la-bufq.o
Removing lib/libcurl_la-bufref.lo
Removing lib/libcurl_la-bufref.o
Removing lib/libcurl_la-c-hyper.lo
Removing lib/libcurl_la-c-hyper.o
Removing lib/libcurl_la-cf-h1-proxy.lo
Removing lib/libcurl_la-cf-h1-proxy.o
Removing lib/libcurl_la-cf-h2-proxy.lo
Removing lib/libcurl_la-cf-h2-proxy.o
Removing lib/libcurl_la-cf-haproxy.lo
Removing lib/libcurl_la-cf-haproxy.o
Removing lib/libcurl_la-cf-https-connect.lo
Removing lib/libcurl_la-cf-https-connect.o
Removing lib/libcurl_la-cf-socket.lo
Removing lib/libcurl_la-cf-socket.o
Removing lib/libcurl_la-cfilters.lo
Removing lib/libcurl_la-cfilters.o
Removing lib/libcurl_la-conncache.lo
Removing lib/libcurl_la-conncache.o
Removing lib/libcurl_la-connect.lo
Removing lib/libcurl_la-connect.o
Removing lib/libcurl_la-content_encoding.lo
Removing lib/libcurl_la-content_encoding.o
Removing lib/libcurl_la-cookie.lo
Removing lib/libcurl_la-cookie.o
Removing lib/libcurl_la-curl_addrinfo.lo
Removing lib/libcurl_la-curl_addrinfo.o
Removing lib/libcurl_la-curl_des.lo
Removing lib/libcurl_la-curl_des.o
Removing lib/libcurl_la-curl_endian.lo
Removing lib/libcurl_la-curl_endian.o
Removing lib/libcurl_la-curl_fnmatch.lo
Removing lib/libcurl_la-curl_fnmatch.o
Removing lib/libcurl_la-curl_get_line.lo
Removing lib/libcurl_la-curl_get_line.o
Removing lib/libcurl_la-curl_gethostname.lo
Removing lib/libcurl_la-curl_gethostname.o
Removing lib/libcurl_la-curl_gssapi.lo
Removing lib/libcurl_la-curl_gssapi.o
Removing lib/libcurl_la-curl_memrchr.lo
Removing lib/libcurl_la-curl_memrchr.o
Removing lib/libcurl_la-curl_multibyte.lo
Removing lib/libcurl_la-curl_multibyte.o
Removing lib/libcurl_la-curl_ntlm_core.lo
Removing lib/libcurl_la-curl_ntlm_core.o
Removing lib/libcurl_la-curl_path.lo
Removing lib/libcurl_la-curl_path.o
Removing lib/libcurl_la-curl_range.lo
Removing lib/libcurl_la-curl_range.o
Removing lib/libcurl_la-curl_rtmp.lo
Removing lib/libcurl_la-curl_rtmp.o
Removing lib/libcurl_la-curl_sasl.lo
Removing lib/libcurl_la-curl_sasl.o
Removing lib/libcurl_la-curl_sha512_256.lo
Removing lib/libcurl_la-curl_sha512_256.o
Removing lib/libcurl_la-curl_sspi.lo
Removing lib/libcurl_la-curl_sspi.o
Removing lib/libcurl_la-curl_threads.lo
Removing lib/libcurl_la-curl_threads.o
Removing lib/libcurl_la-curl_trc.lo
Removing lib/libcurl_la-curl_trc.o
Removing lib/libcurl_la-cw-out.lo
Removing lib/libcurl_la-cw-out.o
Removing lib/libcurl_la-dict.lo
Removing lib/libcurl_la-dict.o
Removing lib/libcurl_la-dllmain.lo
Removing lib/libcurl_la-dllmain.o
Removing lib/libcurl_la-doh.lo
Removing lib/libcurl_la-doh.o
Removing lib/libcurl_la-dynbuf.lo
Removing lib/libcurl_la-dynbuf.o
Removing lib/libcurl_la-dynhds.lo
Removing lib/libcurl_la-dynhds.o
Removing lib/libcurl_la-easy.lo
Removing lib/libcurl_la-easy.o
Removing lib/libcurl_la-easygetopt.lo
Removing lib/libcurl_la-easygetopt.o
Removing lib/libcurl_la-easyoptions.lo
Removing lib/libcurl_la-easyoptions.o
Removing lib/libcurl_la-escape.lo
Removing lib/libcurl_la-escape.o
Removing lib/libcurl_la-file.lo
Removing lib/libcurl_la-file.o
Removing lib/libcurl_la-fileinfo.lo
Removing lib/libcurl_la-fileinfo.o
Removing lib/libcurl_la-fopen.lo
Removing lib/libcurl_la-fopen.o
Removing lib/libcurl_la-formdata.lo
Removing lib/libcurl_la-formdata.o
Removing lib/libcurl_la-ftp.lo
Removing lib/libcurl_la-ftp.o
Removing lib/libcurl_la-ftplistparser.lo
Removing lib/libcurl_la-ftplistparser.o
Removing lib/libcurl_la-getenv.lo
Removing lib/libcurl_la-getenv.o
Removing lib/libcurl_la-getinfo.lo
Removing lib/libcurl_la-getinfo.o
Removing lib/libcurl_la-gopher.lo
Removing lib/libcurl_la-gopher.o
Removing lib/libcurl_la-hash.lo
Removing lib/libcurl_la-hash.o
Removing lib/libcurl_la-headers.lo
Removing lib/libcurl_la-headers.o
Removing lib/libcurl_la-hmac.lo
Removing lib/libcurl_la-hmac.o
Removing lib/libcurl_la-hostasyn.lo
Removing lib/libcurl_la-hostasyn.o
Removing lib/libcurl_la-hostip.lo
Removing lib/libcurl_la-hostip.o
Removing lib/libcurl_la-hostip4.lo
Removing lib/libcurl_la-hostip4.o
Removing lib/libcurl_la-hostip6.lo
Removing lib/libcurl_la-hostip6.o
Removing lib/libcurl_la-hostsyn.lo
Removing lib/libcurl_la-hostsyn.o
Removing lib/libcurl_la-hsts.lo
Removing lib/libcurl_la-hsts.o
Removing lib/libcurl_la-http.lo
Removing lib/libcurl_la-http.o
Removing lib/libcurl_la-http1.lo
Removing lib/libcurl_la-http1.o
Removing lib/libcurl_la-http2.lo
Removing lib/libcurl_la-http2.o
Removing lib/libcurl_la-http_aws_sigv4.lo
Removing lib/libcurl_la-http_aws_sigv4.o
Removing lib/libcurl_la-http_chunks.lo
Removing lib/libcurl_la-http_chunks.o
Removing lib/libcurl_la-http_digest.lo
Removing lib/libcurl_la-http_digest.o
Removing lib/libcurl_la-http_negotiate.lo
Removing lib/libcurl_la-http_negotiate.o
Removing lib/libcurl_la-http_ntlm.lo
Removing lib/libcurl_la-http_ntlm.o
Removing lib/libcurl_la-http_proxy.lo
Removing lib/libcurl_la-http_proxy.o
Removing lib/libcurl_la-idn.lo
Removing lib/libcurl_la-idn.o
Removing lib/libcurl_la-if2ip.lo
Removing lib/libcurl_la-if2ip.o
Removing lib/libcurl_la-imap.lo
Removing lib/libcurl_la-imap.o
Removing lib/libcurl_la-inet_ntop.lo
Removing lib/libcurl_la-inet_ntop.o
Removing lib/libcurl_la-inet_pton.lo
Removing lib/libcurl_la-inet_pton.o
Removing lib/libcurl_la-krb5.lo
Removing lib/libcurl_la-krb5.o
Removing lib/libcurl_la-ldap.lo
Removing lib/libcurl_la-ldap.o
Removing lib/libcurl_la-llist.lo
Removing lib/libcurl_la-llist.o
Removing lib/libcurl_la-macos.lo
Removing lib/libcurl_la-macos.o
Removing lib/libcurl_la-md4.lo
Removing lib/libcurl_la-md4.o
Removing lib/libcurl_la-md5.lo
Removing lib/libcurl_la-md5.o
Removing lib/libcurl_la-memdebug.lo
Removing lib/libcurl_la-memdebug.o
Removing lib/libcurl_la-mime.lo
Removing lib/libcurl_la-mime.o
Removing lib/libcurl_la-mprintf.lo
Removing lib/libcurl_la-mprintf.o
Removing lib/libcurl_la-mqtt.lo
Removing lib/libcurl_la-mqtt.o
Removing lib/libcurl_la-multi.lo
Removing lib/libcurl_la-multi.o
Removing lib/libcurl_la-netrc.lo
Removing lib/libcurl_la-netrc.o
Removing lib/libcurl_la-nonblock.lo
Removing lib/libcurl_la-nonblock.o
Removing lib/libcurl_la-noproxy.lo
Removing lib/libcurl_la-noproxy.o
Removing lib/libcurl_la-openldap.lo
Removing lib/libcurl_la-openldap.o
Removing lib/libcurl_la-parsedate.lo
Removing lib/libcurl_la-parsedate.o
Removing lib/libcurl_la-pingpong.lo
Removing lib/libcurl_la-pingpong.o
Removing lib/libcurl_la-pop3.lo
Removing lib/libcurl_la-pop3.o
Removing lib/libcurl_la-progress.lo
Removing lib/libcurl_la-progress.o
Removing lib/libcurl_la-psl.lo
Removing lib/libcurl_la-psl.o
Removing lib/libcurl_la-rand.lo
Removing lib/libcurl_la-rand.o
Removing lib/libcurl_la-rename.lo
Removing lib/libcurl_la-rename.o
Removing lib/libcurl_la-request.lo
Removing lib/libcurl_la-request.o
Removing lib/libcurl_la-rtsp.lo
Removing lib/libcurl_la-rtsp.o
Removing lib/libcurl_la-select.lo
Removing lib/libcurl_la-select.o
Removing lib/libcurl_la-sendf.lo
Removing lib/libcurl_la-sendf.o
Removing lib/libcurl_la-setopt.lo
Removing lib/libcurl_la-setopt.o
Removing lib/libcurl_la-sha256.lo
Removing lib/libcurl_la-sha256.o
Removing lib/libcurl_la-share.lo
Removing lib/libcurl_la-share.o
Removing lib/libcurl_la-slist.lo
Removing lib/libcurl_la-slist.o
Removing lib/libcurl_la-smb.lo
Removing lib/libcurl_la-smb.o
Removing lib/libcurl_la-smtp.lo
Removing lib/libcurl_la-smtp.o
Removing lib/libcurl_la-socketpair.lo
Removing lib/libcurl_la-socketpair.o
Removing lib/libcurl_la-socks.lo
Removing lib/libcurl_la-socks.o
Removing lib/libcurl_la-socks_gssapi.lo
Removing lib/libcurl_la-socks_gssapi.o
Removing lib/libcurl_la-socks_sspi.lo
Removing lib/libcurl_la-socks_sspi.o
Removing lib/libcurl_la-speedcheck.lo
Removing lib/libcurl_la-speedcheck.o
Removing lib/libcurl_la-splay.lo
Removing lib/libcurl_la-splay.o
Removing lib/libcurl_la-strcase.lo
Removing lib/libcurl_la-strcase.o
Removing lib/libcurl_la-strdup.lo
Removing lib/libcurl_la-strdup.o
Removing lib/libcurl_la-strerror.lo
Removing lib/libcurl_la-strerror.o
Removing lib/libcurl_la-strtok.lo
Removing lib/libcurl_la-strtok.o
Removing lib/libcurl_la-strtoofft.lo
Removing lib/libcurl_la-strtoofft.o
Removing lib/libcurl_la-system_win32.lo
Removing lib/libcurl_la-system_win32.o
Removing lib/libcurl_la-telnet.lo
Removing lib/libcurl_la-telnet.o
Removing lib/libcurl_la-tftp.lo
Removing lib/libcurl_la-tftp.o
Removing lib/libcurl_la-timediff.lo
Removing lib/libcurl_la-timediff.o
Removing lib/libcurl_la-timeval.lo
Removing lib/libcurl_la-timeval.o
Removing lib/libcurl_la-transfer.lo
Removing lib/libcurl_la-transfer.o
Removing lib/libcurl_la-url.lo
Removing lib/libcurl_la-url.o
Removing lib/libcurl_la-urlapi.lo
Removing lib/libcurl_la-urlapi.o
Removing lib/libcurl_la-version.lo
Removing lib/libcurl_la-version.o
Removing lib/libcurl_la-version_win32.lo
Removing lib/libcurl_la-version_win32.o
Removing lib/libcurl_la-warnless.lo
Removing lib/libcurl_la-warnless.o
Removing lib/libcurl_la-ws.lo
Removing lib/libcurl_la-ws.o
Removing lib/nonblock.o
Removing lib/stamp-h1
Removing lib/strtoofft.o
Removing lib/timediff.o
Removing lib/vauth/.deps/
Removing lib/vauth/.dirstamp
Removing lib/vauth/libcurl_la-cleartext.lo
Removing lib/vauth/libcurl_la-cleartext.o
Removing lib/vauth/libcurl_la-cram.lo
Removing lib/vauth/libcurl_la-cram.o
Removing lib/vauth/libcurl_la-digest.lo
Removing lib/vauth/libcurl_la-digest.o
Removing lib/vauth/libcurl_la-digest_sspi.lo
Removing lib/vauth/libcurl_la-digest_sspi.o
Removing lib/vauth/libcurl_la-gsasl.lo
Removing lib/vauth/libcurl_la-gsasl.o
Removing lib/vauth/libcurl_la-krb5_gssapi.lo
Removing lib/vauth/libcurl_la-krb5_gssapi.o
Removing lib/vauth/libcurl_la-krb5_sspi.lo
Removing lib/vauth/libcurl_la-krb5_sspi.o
Removing lib/vauth/libcurl_la-ntlm.lo
Removing lib/vauth/libcurl_la-ntlm.o
Removing lib/vauth/libcurl_la-ntlm_sspi.lo
Removing lib/vauth/libcurl_la-ntlm_sspi.o
Removing lib/vauth/libcurl_la-oauth2.lo
Removing lib/vauth/libcurl_la-oauth2.o
Removing lib/vauth/libcurl_la-spnego_gssapi.lo
Removing lib/vauth/libcurl_la-spnego_gssapi.o
Removing lib/vauth/libcurl_la-spnego_sspi.lo
Removing lib/vauth/libcurl_la-spnego_sspi.o
Removing lib/vauth/libcurl_la-vauth.lo
Removing lib/vauth/libcurl_la-vauth.o
Removing lib/version_win32.o
Removing lib/vquic/.deps/
Removing lib/vquic/.dirstamp
Removing lib/vquic/libcurl_la-curl_msh3.lo
Removing lib/vquic/libcurl_la-curl_msh3.o
Removing lib/vquic/libcurl_la-curl_ngtcp2.lo
Removing lib/vquic/libcurl_la-curl_ngtcp2.o
Removing lib/vquic/libcurl_la-curl_osslq.lo
Removing lib/vquic/libcurl_la-curl_osslq.o
Removing lib/vquic/libcurl_la-curl_quiche.lo
Removing lib/vquic/libcurl_la-curl_quiche.o
Removing lib/vquic/libcurl_la-vquic-tls.lo
Removing lib/vquic/libcurl_la-vquic-tls.o
Removing lib/vquic/libcurl_la-vquic.lo
Removing lib/vquic/libcurl_la-vquic.o
Removing lib/vssh/.deps/
Removing lib/vssh/.dirstamp
Removing lib/vssh/libcurl_la-libssh.lo
Removing lib/vssh/libcurl_la-libssh.o
Removing lib/vssh/libcurl_la-libssh2.lo
Removing lib/vssh/libcurl_la-libssh2.o
Removing lib/vssh/libcurl_la-wolfssh.lo
Removing lib/vssh/libcurl_la-wolfssh.o
Removing lib/vtls/.deps/
Removing lib/vtls/.dirstamp
Removing lib/vtls/libcurl_la-bearssl.lo
Removing lib/vtls/libcurl_la-bearssl.o
Removing lib/vtls/libcurl_la-cipher_suite.lo
Removing lib/vtls/libcurl_la-cipher_suite.o
Removing lib/vtls/libcurl_la-gtls.lo
Removing lib/vtls/libcurl_la-gtls.o
Removing lib/vtls/libcurl_la-hostcheck.lo
Removing lib/vtls/libcurl_la-hostcheck.o
Removing lib/vtls/libcurl_la-keylog.lo
Removing lib/vtls/libcurl_la-keylog.o
Removing lib/vtls/libcurl_la-mbedtls.lo
Removing lib/vtls/libcurl_la-mbedtls.o
Removing lib/vtls/libcurl_la-mbedtls_threadlock.lo
Removing lib/vtls/libcurl_la-mbedtls_threadlock.o
Removing lib/vtls/libcurl_la-openssl.lo
Removing lib/vtls/libcurl_la-openssl.o
Removing lib/vtls/libcurl_la-rustls.lo
Removing lib/vtls/libcurl_la-rustls.o
Removing lib/vtls/libcurl_la-schannel.lo
Removing lib/vtls/libcurl_la-schannel.o
Removing lib/vtls/libcurl_la-schannel_verify.lo
Removing lib/vtls/libcurl_la-schannel_verify.o
Removing lib/vtls/libcurl_la-sectransp.lo
Removing lib/vtls/libcurl_la-sectransp.o
Removing lib/vtls/libcurl_la-vtls.lo
Removing lib/vtls/libcurl_la-vtls.o
Removing lib/vtls/libcurl_la-wolfssl.lo
Removing lib/vtls/libcurl_la-wolfssl.o
Removing lib/vtls/libcurl_la-x509asn1.lo
Removing lib/vtls/libcurl_la-x509asn1.o
Removing lib/warnless.o
Removing libcurl.pc
Removing libtool
Removing ltmain.sh
Removing m4/libtool.m4
Removing m4/ltoptions.m4
Removing m4/ltsugar.m4
Removing m4/ltversion.m4
Removing m4/lt~obsolete.m4
Removing missing
Removing packages/Makefile
Removing packages/Makefile.in
Removing packages/vms/Makefile
Removing packages/vms/Makefile.in
Removing scripts/Makefile
Removing scripts/Makefile.in
Removing src/.deps/
Removing src/.libs/
Removing src/Makefile
Removing src/Makefile.in
Removing src/curl
Removing src/slist_wc.o
Removing src/terminal.o
Removing src/tool_binmode.o
Removing src/tool_bname.o
Removing src/tool_cb_dbg.o
Removing src/tool_cb_hdr.o
Removing src/tool_cb_prg.o
Removing src/tool_cb_rea.o
Removing src/tool_cb_see.o
Removing src/tool_cb_soc.o
Removing src/tool_cb_wrt.o
Removing src/tool_cfgable.o
Removing src/tool_dirhie.o
Removing src/tool_doswin.o
Removing src/tool_easysrc.o
Removing src/tool_filetime.o
Removing src/tool_findfile.o
Removing src/tool_formparse.o
Removing src/tool_getparam.o
Removing src/tool_getpass.o
Removing src/tool_help.o
Removing src/tool_helpers.o
Removing src/tool_hugehelp.c
Removing src/tool_hugehelp.o
Removing src/tool_ipfs.o
Removing src/tool_libinfo.o
Removing src/tool_listhelp.o
Removing src/tool_main.o
Removing src/tool_msgs.o
Removing src/tool_operate.o
Removing src/tool_operhlp.o
Removing src/tool_paramhlp.o
Removing src/tool_parsecfg.o
Removing src/tool_progress.o
Removing src/tool_setopt.o
Removing src/tool_sleep.o
Removing src/tool_stderr.o
Removing src/tool_strdup.o
Removing src/tool_urlglob.o
Removing src/tool_util.o
Removing src/tool_vms.o
Removing src/tool_writeout.o
Removing src/tool_writeout_json.o
Removing src/tool_xattr.o
Removing src/var.o
Removing tests/Makefile
Removing tests/Makefile.in
Removing tests/certs/Makefile
Removing tests/certs/Makefile.in
Removing tests/certs/scripts/Makefile
Removing tests/certs/scripts/Makefile.in
Removing tests/config
Removing tests/configurehelp.pm
Removing tests/data/Makefile
Removing tests/data/Makefile.in
Removing tests/http/Makefile
Removing tests/http/Makefile.in
Removing tests/http/clients/.deps/
Removing tests/http/clients/Makefile
Removing tests/http/clients/Makefile.in
Removing tests/http/config.ini
Removing tests/libtest/.deps/
Removing tests/libtest/Makefile
Removing tests/libtest/Makefile.in
Removing tests/server/.deps/
Removing tests/server/Makefile
Removing tests/server/Makefile.in
Removing tests/unit/.deps/
Removing tests/unit/Makefile
Removing tests/unit/Makefile.in
$ autoreconf -fi
libtoolize: putting auxiliary files in '.'.
libtoolize: copying file './ltmain.sh'
libtoolize: putting macros in AC_CONFIG_MACRO_DIRS, 'm4'.
libtoolize: copying file 'm4/libtool.m4'
libtoolize: copying file 'm4/ltoptions.m4'
libtoolize: copying file 'm4/ltsugar.m4'
libtoolize: copying file 'm4/ltversion.m4'
libtoolize: copying file 'm4/lt~obsolete.m4'
libtoolize: Remember to add 'LT_INIT' to configure.ac.
configure.ac:125: installing './compile'
configure.ac:437: installing './config.guess'
configure.ac:437: installing './config.sub'
configure.ac:125: installing './install-sh'
configure.ac:131: installing './missing'
docs/examples/Makefile.am: installing './depcomp'
$ bash -c find . -name config.guess -exec cp /usr/share/misc/config.guess {} \;
$ bash -c find . -name config.sub -exec cp /usr/share/misc/config.sub {} \;
$ chmod +x configure
$ ./configure --disable-shared --without-ssl --disable-docs
checking whether to enable maintainer-specific portions of Makefiles... no
checking whether make supports nested variables... yes
checking whether to enable debug build options... no
checking whether to enable compiler optimizer... (assumed) yes
checking whether to enable strict compiler warnings... no
checking whether to enable compiler warnings as errors... no
checking whether to enable curl debug memory tracking... no
checking whether to enable hiding of library internal symbols... yes
checking whether to enable c-ares for DNS lookups... no
checking whether to disable dependency on -lrt... (assumed no)
checking whether to enable HTTPSRR support... no
checking whether to enable ECH support... no
checking for path separator... :
checking for sed... /usr/bin/sed
checking for grep... /usr/bin/grep
checking that grep -E works... yes
checking for ar... /usr/bin/ar
checking for a BSD-compatible install... /usr/bin/install -c
checking for gcc... ccache gcc
checking whether the C compiler works... yes
checking for C compiler default output file name... a.out
checking for suffix of executables...
checking whether we are cross compiling... no
checking for suffix of object files... o
checking whether the compiler supports GNU C... yes
checking whether ccache gcc accepts -g... yes
checking for ccache gcc option to enable C11 features... none needed
checking whether ccache gcc understands -c and -o together... yes
checking how to run the C preprocessor... ccache gcc -E
checking for stdio.h... yes
checking for stdlib.h... yes
checking for string.h... yes
checking for inttypes.h... yes
checking for stdint.h... yes
checking for strings.h... yes
checking for sys/stat.h... yes
checking for sys/types.h... yes
checking for unistd.h... yes
checking for stdatomic.h... yes
checking if _Atomic is available... yes
checking for a sed that does not truncate output... (cached) /usr/bin/sed
checking for code coverage support... no
checking whether build environment is sane... yes
checking for a race-free mkdir -p... /usr/bin/mkdir -p
checking for gawk... gawk
checking whether make sets $(MAKE)... yes
checking whether make supports the include directive... yes (GNU style)
checking dependency style of ccache gcc... gcc3
checking curl version... 8.9.0-DEV
checking for httpd... no
checking for apache2... no
checking for apachectl... no
checking for apxs... no
configure: httpd/apache2 not in PATH, http tests disabled
configure: apxs not in PATH, http tests disabled
checking for nghttpx... no
checking for caddy... /usr/bin/caddy
checking build system type... x86_64-pc-linux-gnu
checking host system type... x86_64-pc-linux-gnu
checking for grep that handles long lines and -e... (cached) /usr/bin/grep
checking for egrep... /usr/bin/grep -E
checking if OS is AIX (to define _ALL_SOURCE)... no
checking if _THREAD_SAFE is already defined... no
checking if _THREAD_SAFE is actually needed... no
checking if _THREAD_SAFE is onwards defined... no
checking if _REENTRANT is already defined... no
checking if _REENTRANT is actually needed... no
checking if _REENTRANT is onwards defined... no
checking for special C compiler options needed for large files... no
checking for _FILE_OFFSET_BITS value needed for large files... no
checking how to print strings... printf
checking for a sed that does not truncate output... (cached) /usr/bin/sed
checking for fgrep... /usr/bin/grep -F
checking for ld used by ccache gcc... /usr/bin/ld
checking if the linker (/usr/bin/ld) is GNU ld... yes
checking for BSD- or MS-compatible name lister (nm)... /usr/bin/nm -B
checking the name lister (/usr/bin/nm -B) interface... BSD nm
checking whether ln -s works... yes
checking the maximum length of command line arguments... 1572864
checking how to convert x86_64-pc-linux-gnu file names to x86_64-pc-linux-gnu format... func_convert_file_noop
checking how to convert x86_64-pc-linux-gnu file names to toolchain format... func_convert_file_noop
checking for /usr/bin/ld option to reload object files... -r
checking for objdump... objdump
checking how to recognize dependent libraries... pass_all
checking for dlltool... no
checking how to associate runtime and link libraries... printf %s\n
checking for archiver @FILE support... @
checking for strip... strip
checking for ranlib... ranlib
checking command to parse /usr/bin/nm -B output from ccache gcc object... ok
checking for sysroot... no
checking for a working dd... /usr/bin/dd
checking how to truncate binary pipes... /usr/bin/dd bs=4096 count=1
checking for mt... mt
checking if mt is a manifest tool... no
checking for dlfcn.h... yes
checking for objdir... .libs
checking if ccache gcc supports -fno-rtti -fno-exceptions... no
checking for ccache gcc option to produce PIC... -fPIC -DPIC
checking if ccache gcc PIC flag -fPIC -DPIC works... yes
checking if ccache gcc static flag -static works... yes
checking if ccache gcc supports -c -o file.o... yes
checking if ccache gcc supports -c -o file.o... (cached) yes
checking whether the ccache gcc linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes
checking dynamic linker characteristics... GNU/Linux ld.so
checking how to hardcode library paths into programs... immediate
checking whether stripping libraries is possible... yes
checking if libtool supports shared libraries... yes
checking whether to build shared libraries... no
checking whether to build static libraries... yes
checking whether to build shared libraries with -version-info... yes
checking whether to build shared libraries with -no-undefined... no
checking whether to build shared libraries with -mimpure-text... no
checking whether to build shared libraries with PIC... yes
checking whether to build static libraries with PIC... yes
checking whether to build shared libraries only... no
checking whether to build static libraries only... yes
checking for windres... no
checking if cpp -P is needed... yes
checking if cpp -P works... yes
checking if compiler is DEC/Compaq/HP C... no
checking if compiler is HP-UX C... no
checking if compiler is IBM C... no
checking if compiler is Intel C... no
checking if compiler is clang... no
checking if compiler is GNU C... yes
checking compiler version... gcc '1100' (raw: '11')
checking if compiler is SunPro C... no
checking if compiler is Tiny C... no
checking whether build target is a native Windows one... no
checking if compiler accepts some basic options... yes
configure: compiler options added: -Werror-implicit-function-declaration
checking if compiler optimizer assumed setting might be used... yes
checking if compiler accepts optimizer enabling options... yes
configure: compiler options added: -O2
checking if compiler accepts strict warning options... yes
configure: compiler options added: -Wno-system-headers
checking if compiler halts on compilation errors... yes
checking if compiler halts on negative sized arrays... yes
checking if compiler halts on function prototype mismatch... yes
checking if compiler supports hiding library internal symbols... yes
checking whether build target supports WIN32 file API... no
checking whether build target supports WIN32 crypto API... no
checking for good-to-use Darwin CFLAGS... no
checking whether to link macOS CoreFoundation, CoreServices, and SystemConfiguration frameworks... no
checking to see if the compiler supports __builtin_available()... no
checking whether to support http... yes
checking whether to support ftp... yes
checking whether to support file... yes
checking whether to support ldap... yes
checking whether to support ldaps... yes
checking whether to support rtsp... yes
checking whether to support proxies... yes
checking whether to support dict... yes
checking whether to support telnet... yes
checking whether to support tftp... yes
checking whether to support pop3... yes
checking whether to support imap... yes
checking whether to support smb... yes
checking whether to support smtp... yes
checking whether to support gopher... yes
checking whether to support mqtt... no
checking whether to provide built-in manual... yes
checking whether to build documentation... no
checking whether to enable generation of C code... yes
checking whether to use libgcc... no
checking if X/Open network library is required... no
checking for gethostbyname... yes
checking whether build target is a native Windows one... (cached) no
checking for proto/bsdsocket.h... no
checking for connect in libraries... yes
checking for sys/types.h... (cached) yes
checking for sys/time.h... yes
checking for monotonic clock_gettime... yes
checking for clock_gettime in libraries... no additional lib required
checking if monotonic clock_gettime works... yes
checking for sys/types.h... (cached) yes
checking for sys/time.h... (cached) yes
checking for raw monotonic clock_gettime... yes
checking for pkg-config... /usr/bin/pkg-config
checking for zlib options with pkg-config... found
checking for zlib.h... yes
configure: found both libz and libz.h header
checking for BrotliDecoderDecompress in -lbrotlidec... no
checking for brotli/decode.h... no
checking for ZSTD_createDStream in -lzstd... no
checking for zstd.h... no
checking for lber.h... no
checking for ldap.h... no
checking for ldap_ssl.h... no
checking for LDAP libraries... cannot find LDAP libraries
checking whether to enable IPv6... yes
checking if struct sockaddr_in6 has sin6_scope_id member... yes
checking if argv can be written to... yes
checking if GSS-API support is requested... no
checking whether to enable Windows native SSL/TLS... no
checking whether to enable Secure Transport... no
checking whether to enable Amiga native SSL/TLS (AmiSSL v5)... no
checking for psl_builtin in -lpsl... yes
checking for libpsl.h... yes
checking for library containing gsasl_init... no
checking for RTMP_Init in -lrtmp... no
checking whether versioned symbols are wanted... no
checking whether to enable Windows native IDN (Windows native builds only)... no
checking whether to build with libidn2... (assumed) yes
checking for pkg-config... (cached) /usr/bin/pkg-config
checking for libidn2 options with pkg-config... no
configure: IDN_LIBS: "-lidn2"
configure: IDN_LDFLAGS: ""
configure: IDN_CPPFLAGS: ""
configure: IDN_DIR: ""
checking if idn2_lookup_ul can be linked... no
checking for idn2.h... no
checking for pkg-config... (cached) /usr/bin/pkg-config
checking for libnghttp2 options with pkg-config... no
checking for nghttp2_session_get_stream_local_window_size in -lnghttp2... no
checking for sys/types.h... (cached) yes
checking for sys/time.h... (cached) yes
checking for sys/select.h... yes
checking for sys/socket.h... yes
checking for sys/ioctl.h... yes
checking for unistd.h... (cached) yes
checking for stdlib.h... (cached) yes
checking for arpa/inet.h... yes
checking for net/if.h... yes
checking for netinet/in.h... yes
checking for netinet/in6.h... no
checking for sys/un.h... yes
checking for linux/tcp.h... yes
checking for netinet/tcp.h... yes
checking for netinet/udp.h... yes
checking for netdb.h... yes
checking for sys/sockio.h... no
checking for sys/stat.h... (cached) yes
checking for sys/param.h... yes
checking for termios.h... yes
checking for termio.h... yes
checking for fcntl.h... yes
checking for io.h... no
checking for pwd.h... yes
checking for utime.h... yes
checking for sys/utime.h... no
checking for sys/poll.h... yes
checking for poll.h... yes
checking for socket.h... no
checking for sys/resource.h... yes
checking for libgen.h... yes
checking for locale.h... yes
checking for stdbool.h... yes
checking for sys/filio.h... no
checking for sys/wait.h... yes
checking for sys/eventfd.h... yes
checking for setjmp.h... yes
checking for an ANSI C-conforming const... yes
checking for size_t... yes
checking for sys/types.h... (cached) yes
checking for sys/time.h... (cached) yes
checking for sys/socket.h... (cached) yes
checking for struct timeval... yes
checking run-time libs availability... fine
checking size of size_t... 8
checking size of long... 8
checking size of int... 4
checking size of time_t... 8
checking size of off_t... 8
checking size of curl_off_t... 8
checking size of curl_socket_t... 4
checking for long long... yes
checking for ssize_t... yes
checking for bool... yes
checking for sa_family_t... yes
checking for suseconds_t... yes
checking if time_t is unsigned... no
checking for in_addr_t... yes
checking for struct sockaddr_storage... yes
checking for sys/select.h... (cached) yes
checking for sys/socket.h... (cached) yes
checking for select... yes
checking for sys/types.h... (cached) yes
checking for sys/socket.h... (cached) yes
checking for recv... yes
checking for sys/types.h... (cached) yes
checking for sys/socket.h... (cached) yes
checking for send... yes
checking for sys/types.h... (cached) yes
checking for sys/socket.h... (cached) yes
checking for MSG_NOSIGNAL... yes
checking for sys/types.h... (cached) yes
checking for unistd.h... (cached) yes
checking if alarm can be linked... yes
checking if alarm is prototyped... yes
checking if alarm is compilable... yes
checking if alarm usage allowed... yes
checking if alarm might be used... yes
checking for sys/types.h... (cached) yes
checking for strings.h... (cached) yes
checking for sys/types.h... (cached) yes
checking for libgen.h... (cached) yes
checking if basename can be linked... yes
checking if basename is prototyped... yes
checking if basename is compilable... yes
checking if basename usage allowed... yes
checking if basename might be used... yes
checking for sys/types.h... (cached) yes
checking for socket.h... (cached) no
checking if closesocket can be linked... no
checking if closesocket might be used... no
checking for sys/types.h... (cached) yes
checking for sys/socket.h... (cached) yes
checking if CloseSocket can be linked... no
checking if CloseSocket might be used... no
checking for sys/types.h... (cached) yes
checking for unistd.h... (cached) yes
checking for fcntl.h... (cached) yes
checking if fcntl can be linked... yes
checking if fcntl is prototyped... yes
checking if fcntl is compilable... yes
checking if fcntl usage allowed... yes
checking if fcntl might be used... yes
checking if fcntl O_NONBLOCK is compilable... yes
checking if fcntl O_NONBLOCK usage allowed... yes
checking if fcntl O_NONBLOCK might be used... yes
checking whether build target is a native Windows one... (cached) no
checking for sys/types.h... (cached) yes
checking for netdb.h... (cached) yes
checking if freeaddrinfo can be linked... yes
checking if freeaddrinfo is prototyped... yes
checking if freeaddrinfo is compilable... yes
checking if freeaddrinfo usage allowed... yes
checking if freeaddrinfo might be used... yes
checking for sys/types.h... (cached) yes
checking for sys/xattr.h... yes
checking if fsetxattr can be linked... yes
checking if fsetxattr is prototyped... yes
checking if fsetxattr takes 5 args.... yes
checking if fsetxattr is compilable... yes
checking if fsetxattr usage allowed... yes
checking if fsetxattr might be used... yes
checking if ftruncate can be linked... yes
checking if ftruncate is prototyped... yes
checking if ftruncate is compilable... yes
checking if ftruncate usage allowed... yes
checking if ftruncate might be used... yes
checking for sys/types.h... (cached) yes
checking if getaddrinfo can be linked... yes
checking if getaddrinfo is prototyped... yes
checking if getaddrinfo is compilable... yes
checking if getaddrinfo seems to work... yes
checking if getaddrinfo usage allowed... yes
checking if getaddrinfo might be used... yes
checking if getaddrinfo is threadsafe... yes
checking if gethostbyname can be linked... yes
checking if gethostbyname is prototyped... yes
checking if gethostbyname is compilable... yes
checking if gethostbyname usage allowed... yes
checking if gethostbyname might be used... yes
checking if gethostbyname_r can be linked... yes
checking if gethostbyname_r is prototyped... yes
checking if gethostbyname_r takes 3 args.... no
checking if gethostbyname_r takes 5 args.... no
checking if gethostbyname_r takes 6 args.... yes
checking if gethostbyname_r is compilable... yes
checking if gethostbyname_r usage allowed... yes
checking if gethostbyname_r might be used... yes
checking if gethostname can be linked... yes
checking if gethostname is prototyped... yes
checking if gethostname is compilable... yes
checking for gethostname arg 2 data type... size_t
checking if gethostname usage allowed... yes
checking if gethostname might be used... yes
checking if getpeername can be linked... yes
checking if getpeername is prototyped... yes
checking if getpeername is compilable... yes
checking if getpeername usage allowed... yes
checking if getpeername might be used... yes
checking if getsockname can be linked... yes
checking if getsockname is prototyped... yes
checking if getsockname is compilable... yes
checking if getsockname usage allowed... yes
checking if getsockname might be used... yes
checking for net/if.h... (cached) yes
checking if if_nametoindex can be linked... yes
checking if if_nametoindex is prototyped... yes
checking if if_nametoindex is compilable... yes
checking if if_nametoindex usage allowed... yes
checking if if_nametoindex might be used... yes
checking for sys/types.h... (cached) yes
checking for sys/socket.h... (cached) yes
checking for netinet/in.h... (cached) yes
checking for ifaddrs.h... yes
checking if getifaddrs can be linked... yes
checking if getifaddrs is prototyped... yes
checking if getifaddrs is compilable... yes
checking if getifaddrs seems to work... yes
checking if getifaddrs usage allowed... yes
checking if getifaddrs might be used... yes
checking for sys/types.h... (cached) yes
checking for sys/time.h... (cached) yes
checking if gmtime_r can be linked... yes
checking if gmtime_r is prototyped... yes
checking if gmtime_r is compilable... yes
checking if gmtime_r seems to work... yes
checking if gmtime_r usage allowed... yes
checking if gmtime_r might be used... yes
checking for sys/types.h... (cached) yes
checking for sys/socket.h... (cached) yes
checking for netinet/in.h... (cached) yes
checking for arpa/inet.h... (cached) yes
checking if inet_ntop can be linked... yes
checking if inet_ntop is prototyped... yes
checking if inet_ntop is compilable... yes
checking if inet_ntop seems to work... yes
checking if inet_ntop usage allowed... yes
checking if inet_ntop might be used... yes
checking if inet_pton can be linked... yes
checking if inet_pton is prototyped... yes
checking if inet_pton is compilable... yes
checking if inet_pton seems to work... yes
checking if inet_pton usage allowed... yes
checking if inet_pton might be used... yes
checking for sys/types.h... (cached) yes
checking for unistd.h... (cached) yes
checking for sys/socket.h... (cached) yes
checking for sys/ioctl.h... (cached) yes
checking for stropts.h... no
checking if ioctl can be linked... yes
checking if ioctl is prototyped... yes
checking if ioctl is compilable... yes
checking if ioctl usage allowed... yes
checking if ioctl might be used... yes
checking if ioctl FIONBIO is compilable... yes
checking if ioctl FIONBIO usage allowed... yes
checking if ioctl FIONBIO might be used... yes
checking if ioctl SIOCGIFADDR is compilable... yes
checking if ioctl SIOCGIFADDR usage allowed... yes
checking if ioctl SIOCGIFADDR might be used... yes
checking if ioctlsocket can be linked... no
checking if ioctlsocket might be used... no
checking if IoctlSocket can be linked... no
checking if IoctlSocket might be used... no
checking if memrchr can be linked... yes
checking if memrchr is prototyped... no
checking if memrchr might be used... no
checking for sys/types.h... (cached) yes
checking for poll.h... (cached) yes
checking for sys/poll.h... (cached) yes
checking if poll can be linked... yes
checking if poll is prototyped... yes
checking if poll is compilable... yes
checking if poll seems to work... yes
checking if poll usage allowed... yes
checking if poll might be used... yes
checking for sys/types.h... (cached) yes
checking if sigaction can be linked... yes
checking if sigaction is prototyped... yes
checking if sigaction is compilable... yes
checking if sigaction usage allowed... yes
checking if sigaction might be used... yes
checking if siginterrupt can be linked... yes
checking if siginterrupt is prototyped... yes
checking if siginterrupt is compilable... yes
checking if siginterrupt usage allowed... yes
checking if siginterrupt might be used... yes
checking if signal can be linked... yes
checking if signal is prototyped... yes
checking if signal is compilable... yes
checking if signal usage allowed... yes
checking if signal might be used... yes
checking for sys/types.h... (cached) yes
checking if sigsetjmp can be linked... no
checking if sigsetjmp seems a macro... yes
checking if sigsetjmp is compilable... yes
checking if sigsetjmp usage allowed... yes
checking if sigsetjmp might be used... yes
checking if socket can be linked... yes
checking if socket is prototyped... yes
checking if socket is compilable... yes
checking if socket usage allowed... yes
checking if socket might be used... yes
checking if socketpair can be linked... yes
checking if socketpair is prototyped... yes
checking if socketpair is compilable... yes
checking if socketpair usage allowed... yes
checking if socketpair might be used... yes
checking if strcasecmp can be linked... yes
checking if strcasecmp is prototyped... yes
checking if strcasecmp is compilable... yes
checking if strcasecmp usage allowed... yes
checking if strcasecmp might be used... yes
checking if strcmpi can be linked... no
checking if strcmpi might be used... no
checking if strdup can be linked... yes
checking if strdup is prototyped... yes
checking if strdup is compilable... yes
checking if strdup usage allowed... yes
checking if strdup might be used... yes
checking if strerror_r can be linked... yes
checking if strerror_r is prototyped... yes
checking if strerror_r is compilable... yes
checking if strerror_r is glibc like... no
checking if strerror_r is POSIX like... yes
checking if strerror_r seems to work... yes
checking if strerror_r usage allowed... yes
checking if strerror_r might be used... yes
checking if stricmp can be linked... no
checking if stricmp might be used... no
checking if strtok_r can be linked... yes
checking if strtok_r is prototyped... yes
checking if strtok_r is compilable... yes
checking if strtok_r usage allowed... yes
checking if strtok_r might be used... yes
checking if strtoll can be linked... yes
checking if strtoll is prototyped... yes
checking if strtoll is compilable... yes
checking if strtoll usage allowed... yes
checking if strtoll might be used... yes
checking for ccache gcc options needed to detect all undeclared functions... none needed
checking whether getpwuid_r is declared... yes
checking for _fseeki64... no
checking for arc4random... no
checking for eventfd... yes
checking for fnmatch... yes
checking for fseeko... yes
checking for geteuid... yes
checking for getpass_r... no
checking for getppid... yes
checking for getpwuid... yes
checking for getpwuid_r... yes
checking for getrlimit... yes
checking for gettimeofday... yes
checking for if_nametoindex... yes
checking for mach_absolute_time... no
checking for pipe... yes
checking for sched_yield... yes
checking for sendmsg... yes
checking for setlocale... yes
checking for setmode... no
checking for setrlimit... yes
checking for snprintf... yes
checking for utime... yes
checking for utimes... yes
checking whether fseeko is declared... yes
checking how to set a socket into non-blocking mode... fcntl O_NONBLOCK
checking whether to enable the threaded resolver... yes
checking whether to use POSIX threads for threaded resolver... auto
checking for pthread.h... yes
checking for pthread_create... yes
checking for dirent.h... yes
checking for opendir... yes
checking convert -I options to -isystem... yes
checking whether to enable verbose strings... yes
checking whether to enable SSPI support (Windows native builds only)... no
checking whether to enable basic authentication method... yes
checking whether to enable bearer authentication method... yes
checking whether to enable digest authentication method... yes
checking whether to enable kerberos authentication method... yes
checking whether to enable negotiate authentication method... yes
checking whether to enable aws sig methods... yes
checking whether to support NTLM... yes
checking whether to enable TLS-SRP authentication... yes
checking whether to enable Unix domain sockets... auto
checking for struct sockaddr_un.sun_path... yes
checking whether to support cookies... yes
checking whether to support socketpair... yes
checking whether to support HTTP authentication... yes
checking whether to support DoH... yes
checking whether to support the MIME API... yes
checking whether to support binding connections locally... yes
checking whether to support the form API... yes
checking whether to support date parsing... yes
checking whether to support netrc parsing... yes
checking whether to support progress-meter... yes
checking whether to support DNS shuffling... yes
checking whether to support curl_easy_option*... yes
checking whether to support alt-svc... yes
checking whether to support headers-api... yes
configure: disables HSTS due to lack of SSL
checking whether to support WebSockets... no
checking whether hiding of library internal symbols will actually happen... yes
checking if this build supports HTTPS-proxy... no
checking that generated files are newer than configure... done
configure: creating ./config.status
config.status: creating Makefile
config.status: creating docs/Makefile
config.status: creating docs/examples/Makefile
config.status: creating docs/libcurl/Makefile
config.status: creating docs/libcurl/opts/Makefile
config.status: creating docs/cmdline-opts/Makefile
config.status: creating include/Makefile
config.status: creating include/curl/Makefile
config.status: creating src/Makefile
config.status: creating lib/Makefile
config.status: creating scripts/Makefile
config.status: creating lib/libcurl.vers
config.status: creating tests/Makefile
config.status: creating tests/config
config.status: creating tests/certs/Makefile
config.status: creating tests/certs/scripts/Makefile
config.status: creating tests/data/Makefile
config.status: creating tests/server/Makefile
config.status: creating tests/libtest/Makefile
config.status: creating tests/unit/Makefile
config.status: creating tests/http/config.ini
config.status: creating tests/http/Makefile
config.status: creating tests/http/clients/Makefile
config.status: creating packages/Makefile
config.status: creating packages/vms/Makefile
config.status: creating curl-config
config.status: creating libcurl.pc
config.status: creating lib/curl_config.h
config.status: executing depfiles commands
config.status: executing libtool commands
configure: Configured to build curl/libcurl:
Host setup: x86_64-pc-linux-gnu
Install prefix: /usr/local
Compiler: ccache gcc
CFLAGS: -Werror-implicit-function-declaration -O2 -Wno-system-headers
CPPFLAGS:
LDFLAGS:
LIBS: -lpsl -lz
curl version: 8.9.0-DEV
SSL: no (--with-{openssl,gnutls,mbedtls,wolfssl,schannel,secure-transport,amissl,bearssl,rustls} )
SSH: no (--with-{libssh,libssh2})
zlib: enabled
brotli: no (--with-brotli)
zstd: no (--with-zstd)
GSS-API: no (--with-gssapi)
GSASL: no (libgsasl not found)
TLS-SRP: no (--enable-tls-srp)
resolver: POSIX threaded
IPv6: enabled
Unix sockets: enabled
IDN: no (--with-{libidn2,winidn})
Build docs: no
Build libcurl: Shared=no, Static=yes
Built-in manual: no (--enable-manual)
--libcurl option: enabled (--disable-libcurl-option)
Verbose errors: enabled (--disable-verbose)
Code coverage: disabled
SSPI: no (--enable-sspi)
ca cert bundle: no
ca cert path:
ca fallback:
LDAP: no (--enable-ldap / --with-ldap-lib / --with-lber-lib)
LDAPS: no (--enable-ldaps)
RTSP: enabled
RTMP: no (--with-librtmp)
PSL: enabled
Alt-svc: enabled (--disable-alt-svc)
Headers API: enabled (--disable-headers-api)
HSTS: no (--enable-hsts)
HTTP1: enabled (internal)
HTTP2: no (--with-nghttp2)
HTTP3: no (--with-ngtcp2 --with-nghttp3, --with-quiche, --with-openssl-quic, --with-msh3)
ECH: no (--enable-ech)
WebSockets: no (--enable-websockets)
Protocols: DICT FILE FTP GOPHER HTTP IMAP IPFS IPNS MQTT POP3 RTSP SMTP TELNET TFTP
Features: AsynchDNS IPv6 Largefile PSL UnixSockets alt-svc libz threadsafe
configure: WARNING: Cannot find libraries for LDAP support: LDAP disabled
configure: WARNING: libgsasl was not found
configure: WARNING: Cannot find libraries for IDN support: IDN disabled
$ make -j3
Making all in lib
make[1]: Entering directory '/root/asi_db/builds/curl/_worktrees/w0/lib'
make all-am
make[2]: Entering directory '/root/asi_db/builds/curl/_worktrees/w0/lib'
CC libcurl_la-altsvc.lo
CC libcurl_la-amigaos.lo
CC libcurl_la-asyn-ares.lo
CC libcurl_la-asyn-thread.lo
CC libcurl_la-base64.lo
CC libcurl_la-bufq.lo
CC libcurl_la-bufref.lo
CC libcurl_la-c-hyper.lo
CC libcurl_la-cf-h1-proxy.lo
CC libcurl_la-cf-h2-proxy.lo
CC libcurl_la-cf-haproxy.lo
CC libcurl_la-cf-https-connect.lo
CC libcurl_la-cf-socket.lo
CC libcurl_la-cfilters.lo
CC libcurl_la-conncache.lo
CC libcurl_la-connect.lo
CC libcurl_la-content_encoding.lo
CC libcurl_la-cookie.lo
CC libcurl_la-curl_addrinfo.lo
CC libcurl_la-curl_des.lo
CC libcurl_la-curl_endian.lo
CC libcurl_la-curl_fnmatch.lo
CC libcurl_la-curl_get_line.lo
CC libcurl_la-curl_gethostname.lo
CC libcurl_la-curl_gssapi.lo
CC libcurl_la-curl_memrchr.lo
CC libcurl_la-curl_multibyte.lo
CC libcurl_la-curl_ntlm_core.lo
CC libcurl_la-curl_path.lo
CC libcurl_la-curl_range.lo
CC libcurl_la-curl_rtmp.lo
CC libcurl_la-curl_sasl.lo
CC libcurl_la-curl_sha512_256.lo
CC libcurl_la-curl_sspi.lo
CC libcurl_la-curl_threads.lo
CC libcurl_la-curl_trc.lo
CC libcurl_la-cw-out.lo
CC libcurl_la-dict.lo
CC libcurl_la-dllmain.lo
CC libcurl_la-doh.lo
CC libcurl_la-dynbuf.lo
CC libcurl_la-dynhds.lo
CC libcurl_la-easy.lo
CC libcurl_la-easygetopt.lo
CC libcurl_la-easyoptions.lo
CC libcurl_la-escape.lo
CC libcurl_la-file.lo
CC libcurl_la-fileinfo.lo
CC libcurl_la-fopen.lo
CC libcurl_la-formdata.lo
CC libcurl_la-ftp.lo
CC libcurl_la-ftplistparser.lo
CC libcurl_la-getenv.lo
CC libcurl_la-getinfo.lo
CC libcurl_la-gopher.lo
CC libcurl_la-hash.lo
CC libcurl_la-headers.lo
CC libcurl_la-hmac.lo
CC libcurl_la-hostasyn.lo
CC libcurl_la-hostip.lo
CC libcurl_la-hostip4.lo
CC libcurl_la-hostip6.lo
CC libcurl_la-hostsyn.lo
CC libcurl_la-hsts.lo
CC libcurl_la-http.lo
CC libcurl_la-http1.lo
CC libcurl_la-http2.lo
CC libcurl_la-http_aws_sigv4.lo
CC libcurl_la-http_chunks.lo
CC libcurl_la-http_digest.lo
CC libcurl_la-http_negotiate.lo
CC libcurl_la-http_ntlm.lo
CC libcurl_la-http_proxy.lo
CC libcurl_la-idn.lo
CC libcurl_la-if2ip.lo
CC libcurl_la-imap.lo
CC libcurl_la-inet_ntop.lo
CC libcurl_la-inet_pton.lo
CC libcurl_la-krb5.lo
CC libcurl_la-ldap.lo
CC libcurl_la-llist.lo
CC libcurl_la-macos.lo
CC libcurl_la-md4.lo
CC libcurl_la-md5.lo
CC libcurl_la-memdebug.lo
CC libcurl_la-mime.lo
CC libcurl_la-mprintf.lo
CC libcurl_la-mqtt.lo
CC libcurl_la-multi.lo
CC libcurl_la-netrc.lo
CC libcurl_la-nonblock.lo
CC libcurl_la-noproxy.lo
CC libcurl_la-openldap.lo
CC libcurl_la-parsedate.lo
CC libcurl_la-pingpong.lo
CC libcurl_la-pop3.lo
CC libcurl_la-progress.lo
CC libcurl_la-psl.lo
CC libcurl_la-rand.lo
CC libcurl_la-rename.lo
CC libcurl_la-request.lo
CC libcurl_la-rtsp.lo
CC libcurl_la-select.lo
CC libcurl_la-sendf.lo
CC libcurl_la-setopt.lo
CC libcurl_la-sha256.lo
CC libcurl_la-share.lo
CC libcurl_la-slist.lo
CC libcurl_la-smb.lo
CC libcurl_la-smtp.lo
CC libcurl_la-socketpair.lo
CC libcurl_la-socks.lo
CC libcurl_la-socks_gssapi.lo
CC libcurl_la-socks_sspi.lo
CC libcurl_la-speedcheck.lo
CC libcurl_la-splay.lo
CC libcurl_la-strcase.lo
CC libcurl_la-strdup.lo
CC libcurl_la-strerror.lo
CC libcurl_la-strtok.lo
CC libcurl_la-strtoofft.lo
CC libcurl_la-system_win32.lo
CC libcurl_la-telnet.lo
CC libcurl_la-tftp.lo
CC libcurl_la-timediff.lo
CC libcurl_la-timeval.lo
CC libcurl_la-transfer.lo
CC libcurl_la-url.lo
CC libcurl_la-urlapi.lo
CC libcurl_la-version.lo
CC libcurl_la-version_win32.lo
CC libcurl_la-warnless.lo
CC libcurl_la-ws.lo
CC vauth/libcurl_la-cleartext.lo
CC vauth/libcurl_la-cram.lo
CC vauth/libcurl_la-digest.lo
CC vauth/libcurl_la-digest_sspi.lo
CC vauth/libcurl_la-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-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-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'
make[2]: Entering directory '/root/asi_db/builds/curl/_worktrees/w0/src'
CC terminal.o
CC slist_wc.o
CC tool_binmode.o
CC tool_cb_dbg.o
CC tool_bname.o
CC tool_cb_hdr.o
CC tool_cb_prg.o
CC tool_cb_rea.o
CC tool_cb_see.o
CC tool_cb_soc.o
CC tool_cb_wrt.o
CC tool_cfgable.o
CC tool_doswin.o
CC tool_dirhie.o
CC tool_easysrc.o
CC tool_filetime.o
CC tool_findfile.o
CC tool_formparse.o
CC tool_getparam.o
CC tool_getpass.o
CC tool_help.o
CC tool_helpers.o
echo '#include "tool_hugehelp.h"' >> tool_hugehelp.c
CC tool_ipfs.o
CC tool_libinfo.o
CC tool_listhelp.o
CC tool_main.o
CC tool_msgs.o
CC tool_operate.o
CC tool_operhlp.o
CC tool_paramhlp.o
CC tool_parsecfg.o
CC tool_progress.o
CC tool_setopt.o
CC tool_sleep.o
CC tool_stderr.o
CC tool_strdup.o
CC tool_urlglob.o
CC tool_util.o
CC tool_vms.o
CC tool_writeout.o
CC tool_writeout_json.o
CC tool_xattr.o
CC var.o
CC tool_hugehelp.o
CC ../lib/base64.o
CC ../lib/curl_multibyte.o
CC ../lib/dynbuf.o
CC ../lib/nonblock.o
CC ../lib/strtoofft.o
CC ../lib/timediff.o
CC ../lib/version_win32.o
CC ../lib/warnless.o
CCLD curl
make[2]: Leaving directory '/root/asi_db/builds/curl/_worktrees/w0/src'
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 →
docs/KNOWN_BUGS +0 -26lib/cf-h1-proxy.c +1 -0lib/cf-h2-proxy.c +52 -4lib/cf-haproxy.c +1 -0lib/cf-https-connect.c +46 -1lib/cf-socket.c +28 -0lib/cfilters.c +100 -0lib/cfilters.h +27 -0lib/connect.c +80 -0lib/connect.h +12 -0lib/ftp.c +16 -7lib/http2.c +62 -9lib/http_proxy.c +1 -0lib/socks.c +1 -0lib/urldata.h +6 -1lib/vquic/curl_msh3.c +1 -0lib/vquic/curl_ngtcp2.c +1 -0lib/vquic/curl_osslq.c +1 -0lib/vquic/curl_quiche.c +1 -0lib/vtls/bearssl.c +41 -3lib/vtls/gtls.c +71 -91lib/vtls/gtls.h +1 -0lib/vtls/mbedtls.c +96 -10lib/vtls/openssl.c +97 -171lib/vtls/rustls.c +78 -9lib/vtls/schannel.c +37 -10lib/vtls/sectransp.c +93 -64lib/vtls/vtls.c +96 -11lib/vtls/vtls.h +2 -2lib/vtls/vtls_int.h +7 -6lib/vtls/wolfssl.c +98 -31tests/http/test_31_vsftpds.py +0 -3tests/unit/unit2600.c +1 -0
docs/KNOWN_BUGS+0 -26
| @@ -65,8 +65,6 @@ problems may have been fixed or changed somewhat since this was written. | |
| 7.2 Implicit FTPS upload timeout | |
| 7.3 FTP with NOBODY and FAILONERROR | |
| 7.4 FTP with ACCT | |
| - | 7.5 FTPS upload, FileZilla, GnuTLS and close_notify |
| - | 7.11 FTPS upload data loss with TLS 1.3 |
| 7.12 FTPS directory listing hangs on Windows with Schannel | |
| 9. SFTP and SCP | |
| @@ -410,30 +408,6 @@ problems may have been fixed or changed somewhat since this was written. | |
| thus fails to issue the correct command: | |
| https://curl.se/bug/view.cgi?id=635 | |
| - | 7.5 FTPS upload, FileZilla, GnuTLS and close_notify |
| - | |
| - | An issue where curl does not send the TLS alert close_notify, which triggers |
| - | the wrath of GnuTLS in FileZilla server, and a FTP reply 426 ECONNABORTED. |
| - | |
| - | https://github.com/curl/curl/issues/11383 |
| - | |
| - | 7.11 FTPS upload data loss with TLS 1.3 |
| - | |
| - | During FTPS upload curl does not attempt to read TLS handshake messages sent |
| - | after the initial handshake. OpenSSL servers running TLS 1.3 may send such a |
| - | message. When curl closes the upload connection if unread data has been |
| - | received (such as a TLS handshake message) then the TCP protocol sends an |
| - | RST to the server, which may cause the server to discard or truncate the |
| - | upload if it has not read all sent data yet, and then return an error to curl |
| - | on the control channel connection. |
| - | |
| - | Since 7.78.0 this is mostly fixed. curl will do a single read before closing |
| - | TLS connections (which causes the TLS library to read handshake messages), |
| - | however there is still possibility of an RST if more messages need to be read |
| - | or a message arrives after the read but before close (network race condition). |
| - | |
| - | https://github.com/curl/curl/issues/6149 |
| - | |
| 7.12 FTPS server compatibility on Windows with Schannel | |
| FTPS is not widely used with the Schannel TLS backend and so there may be more | |
lib/cf-h1-proxy.c+1 -0
| @@ -1077,6 +1077,7 @@ struct Curl_cftype Curl_cft_h1_proxy = { | |
| cf_h1_proxy_destroy, | |
| cf_h1_proxy_connect, | |
| cf_h1_proxy_close, | |
| + | Curl_cf_def_shutdown, |
| Curl_cf_http_proxy_get_host, | |
| cf_h1_proxy_adjust_pollset, | |
| Curl_cf_def_data_pending, | |
lib/cf-h2-proxy.c+52 -4
| @@ -181,7 +181,9 @@ struct cf_h2_proxy_ctx { | |
| int32_t goaway_error; | |
| int32_t last_stream_id; | |
| BIT(conn_closed); | |
| - | BIT(goaway); |
| + | BIT(rcvd_goaway); |
| + | BIT(sent_goaway); |
| + | BIT(shutdown); |
| BIT(nw_out_blocked); | |
| }; | |
| @@ -694,7 +696,7 @@ static int proxy_h2_on_frame_recv(nghttp2_session *session, | |
| } | |
| break; | |
| case NGHTTP2_GOAWAY: | |
| - | ctx->goaway = TRUE; |
| + | ctx->rcvd_goaway = TRUE; |
| break; | |
| default: | |
| break; | |
| @@ -1166,6 +1168,42 @@ static void cf_h2_proxy_destroy(struct Curl_cfilter *cf, | |
| } | |
| } | |
| + | static CURLcode cf_h2_proxy_shutdown(struct Curl_cfilter *cf, |
| + | struct Curl_easy *data, bool *done) |
| + | { |
| + | struct cf_h2_proxy_ctx *ctx = cf->ctx; |
| + | CURLcode result; |
| + | int rv; |
| + | |
| + | if(!cf->connected || !ctx->h2 || ctx->shutdown) { |
| + | *done = TRUE; |
| + | return CURLE_OK; |
| + | } |
| + | |
| + | if(!ctx->sent_goaway) { |
| + | rv = nghttp2_submit_goaway(ctx->h2, NGHTTP2_FLAG_NONE, |
| + | 0, 0, |
| + | (const uint8_t *)"shutown", sizeof("shutown")); |
| + | if(rv) { |
| + | failf(data, "nghttp2_submit_goaway() failed: %s(%d)", |
| + | nghttp2_strerror(rv), rv); |
| + | return CURLE_SEND_ERROR; |
| + | } |
| + | ctx->sent_goaway = TRUE; |
| + | } |
| + | /* GOAWAY submitted, process egress and ingress until nghttp2 is done. */ |
| + | result = CURLE_OK; |
| + | if(nghttp2_session_want_write(ctx->h2)) |
| + | result = proxy_h2_progress_egress(cf, data); |
| + | if(!result && nghttp2_session_want_read(ctx->h2)) |
| + | result = proxy_h2_progress_ingress(cf, data); |
| + | |
| + | *done = !result && !nghttp2_session_want_write(ctx->h2) && |
| + | !nghttp2_session_want_read(ctx->h2); |
| + | ctx->shutdown = (result || *done); |
| + | return result; |
| + | } |
| + | |
| static bool cf_h2_proxy_data_pending(struct Curl_cfilter *cf, | |
| const struct Curl_easy *data) | |
| { | |
| @@ -1182,12 +1220,12 @@ static void cf_h2_proxy_adjust_pollset(struct Curl_cfilter *cf, | |
| struct easy_pollset *ps) | |
| { | |
| struct cf_h2_proxy_ctx *ctx = cf->ctx; | |
| + | struct cf_call_data save; |
| curl_socket_t sock = Curl_conn_cf_get_socket(cf, data); | |
| bool want_recv, want_send; | |
| Curl_pollset_check(data, ps, sock, &want_recv, &want_send); | |
| if(ctx->h2 && (want_recv || want_send)) { | |
| - | struct cf_call_data save; |
| bool c_exhaust, s_exhaust; | |
| CF_DATA_SAVE(save, cf, data); | |
| @@ -1202,6 +1240,14 @@ static void cf_h2_proxy_adjust_pollset(struct Curl_cfilter *cf, | |
| Curl_pollset_set(data, ps, sock, want_recv, want_send); | |
| CF_DATA_RESTORE(cf, save); | |
| } | |
| + | else if(ctx->sent_goaway && !ctx->shutdown) { |
| + | /* shutdown in progress */ |
| + | CF_DATA_SAVE(save, cf, data); |
| + | want_send = nghttp2_session_want_write(ctx->h2); |
| + | want_recv = nghttp2_session_want_read(ctx->h2); |
| + | Curl_pollset_set(data, ps, sock, want_recv, want_send); |
| + | CF_DATA_RESTORE(cf, save); |
| + | } |
| } | |
| static ssize_t h2_handle_tunnel_close(struct Curl_cfilter *cf, | |
| @@ -1259,7 +1305,8 @@ static ssize_t tunnel_recv(struct Curl_cfilter *cf, struct Curl_easy *data, | |
| } | |
| else if(ctx->tunnel.reset || | |
| (ctx->conn_closed && Curl_bufq_is_empty(&ctx->inbufq)) || | |
| - | (ctx->goaway && ctx->last_stream_id < ctx->tunnel.stream_id)) { |
| + | (ctx->rcvd_goaway && |
| + | ctx->last_stream_id < ctx->tunnel.stream_id)) { |
| *err = CURLE_RECV_ERROR; | |
| nread = -1; | |
| } | |
| @@ -1537,6 +1584,7 @@ struct Curl_cftype Curl_cft_h2_proxy = { | |
| cf_h2_proxy_destroy, | |
| cf_h2_proxy_connect, | |
| cf_h2_proxy_close, | |
| + | cf_h2_proxy_shutdown, |
| Curl_cf_http_proxy_get_host, | |
| cf_h2_proxy_adjust_pollset, | |
| cf_h2_proxy_data_pending, | |
lib/cf-haproxy.c+1 -0
| @@ -194,6 +194,7 @@ struct Curl_cftype Curl_cft_haproxy = { | |
| cf_haproxy_destroy, | |
| cf_haproxy_connect, | |
| cf_haproxy_close, | |
| + | Curl_cf_def_shutdown, |
| Curl_cf_def_get_host, | |
| cf_haproxy_adjust_pollset, | |
| Curl_cf_def_data_pending, | |
lib/cf-https-connect.c+46 -1
| @@ -55,7 +55,8 @@ struct cf_hc_baller { | |
| CURLcode result; | |
| struct curltime started; | |
| int reply_ms; | |
| - | bool enabled; |
| + | BIT(enabled); |
| + | BIT(shutdown); |
| }; | |
| static void cf_hc_baller_reset(struct cf_hc_baller *b, | |
| @@ -322,6 +323,49 @@ out: | |
| return result; | |
| } | |
| + | static CURLcode cf_hc_shutdown(struct Curl_cfilter *cf, |
| + | struct Curl_easy *data, bool *done) |
| + | { |
| + | struct cf_hc_ctx *ctx = cf->ctx; |
| + | struct cf_hc_baller *ballers[2]; |
| + | size_t i; |
| + | CURLcode result = CURLE_OK; |
| + | |
| + | DEBUGASSERT(data); |
| + | if(cf->connected) { |
| + | *done = TRUE; |
| + | return CURLE_OK; |
| + | } |
| + | |
| + | /* shutdown all ballers that have not done so already. If one fails, |
| + | * continue shutting down others until all are shutdown. */ |
| + | ballers[0] = &ctx->h3_baller; |
| + | ballers[1] = &ctx->h21_baller; |
| + | for(i = 0; i < sizeof(ballers)/sizeof(ballers[0]); i++) { |
| + | struct cf_hc_baller *b = ballers[i]; |
| + | bool bdone = FALSE; |
| + | if(!cf_hc_baller_is_active(b) || b->shutdown) |
| + | continue; |
| + | b->result = b->cf->cft->do_shutdown(b->cf, data, &bdone); |
| + | if(b->result || bdone) |
| + | b->shutdown = TRUE; /* treat a failed shutdown as done */ |
| + | } |
| + | |
| + | *done = TRUE; |
| + | for(i = 0; i < sizeof(ballers)/sizeof(ballers[0]); i++) { |
| + | if(ballers[i] && !ballers[i]->shutdown) |
| + | *done = FALSE; |
| + | } |
| + | if(*done) { |
| + | for(i = 0; i < sizeof(ballers)/sizeof(ballers[0]); i++) { |
| + | if(ballers[i] && ballers[i]->result) |
| + | result = ballers[i]->result; |
| + | } |
| + | } |
| + | CURL_TRC_CF(data, cf, "shutdown -> %d, done=%d", result, *done); |
| + | return result; |
| + | } |
| + | |
| static void cf_hc_adjust_pollset(struct Curl_cfilter *cf, | |
| struct Curl_easy *data, | |
| struct easy_pollset *ps) | |
| @@ -434,6 +478,7 @@ struct Curl_cftype Curl_cft_http_connect = { | |
| cf_hc_destroy, | |
| cf_hc_connect, | |
| cf_hc_close, | |
| + | cf_hc_shutdown, |
| Curl_cf_def_get_host, | |
| cf_hc_adjust_pollset, | |
| cf_hc_data_pending, | |
lib/cf-socket.c+28 -0
| @@ -1010,6 +1010,30 @@ static void cf_socket_close(struct Curl_cfilter *cf, struct Curl_easy *data) | |
| cf->connected = FALSE; | |
| } | |
| + | static CURLcode cf_socket_shutdown(struct Curl_cfilter *cf, |
| + | struct Curl_easy *data, |
| + | bool *done) |
| + | { |
| + | if(cf->connected) { |
| + | struct cf_socket_ctx *ctx = cf->ctx; |
| + | |
| + | CURL_TRC_CF(data, cf, "cf_socket_shutdown(%" CURL_FORMAT_SOCKET_T |
| + | ")", ctx->sock); |
| + | /* On TCP, and when the socket looks well and non-blocking mode |
| + | * can be enabled, receive dangling bytes before close to avoid |
| + | * entering RST states unnecessarily. */ |
| + | if(ctx->sock != CURL_SOCKET_BAD && |
| + | ctx->transport == TRNSPRT_TCP && |
| + | (curlx_nonblock(ctx->sock, TRUE) >= 0)) { |
| + | unsigned char buf[1024]; |
| + | (void)sread(ctx->sock, buf, sizeof(buf)); |
| + | } |
| + | cf_socket_close(cf, data); |
| + | } |
| + | *done = TRUE; |
| + | return CURLE_OK; |
| + | } |
| + | |
| static void cf_socket_destroy(struct Curl_cfilter *cf, struct Curl_easy *data) | |
| { | |
| struct cf_socket_ctx *ctx = cf->ctx; | |
| @@ -1729,6 +1753,7 @@ struct Curl_cftype Curl_cft_tcp = { | |
| cf_socket_destroy, | |
| cf_tcp_connect, | |
| cf_socket_close, | |
| + | cf_socket_shutdown, |
| cf_socket_get_host, | |
| cf_socket_adjust_pollset, | |
| cf_socket_data_pending, | |
| @@ -1872,6 +1897,7 @@ struct Curl_cftype Curl_cft_udp = { | |
| cf_socket_destroy, | |
| cf_udp_connect, | |
| cf_socket_close, | |
| + | cf_socket_shutdown, |
| cf_socket_get_host, | |
| cf_socket_adjust_pollset, | |
| cf_socket_data_pending, | |
| @@ -1923,6 +1949,7 @@ struct Curl_cftype Curl_cft_unix = { | |
| cf_socket_destroy, | |
| cf_tcp_connect, | |
| cf_socket_close, | |
| + | cf_socket_shutdown, |
| cf_socket_get_host, | |
| cf_socket_adjust_pollset, | |
| cf_socket_data_pending, | |
| @@ -1987,6 +2014,7 @@ struct Curl_cftype Curl_cft_tcp_accept = { | |
| cf_socket_destroy, | |
| cf_tcp_accept_connect, | |
| cf_socket_close, | |
| + | cf_socket_shutdown, |
| cf_socket_get_host, /* TODO: not accurate */ | |
| cf_socket_adjust_pollset, | |
| cf_socket_data_pending, | |
lib/cfilters.c+100 -0
| @@ -55,6 +55,15 @@ void Curl_cf_def_close(struct Curl_cfilter *cf, struct Curl_easy *data) | |
| } | |
| #endif | |
| + | CURLcode Curl_cf_def_shutdown(struct Curl_cfilter *cf, |
| + | struct Curl_easy *data, bool *done) |
| + | { |
| + | (void)cf; |
| + | (void)data; |
| + | *done = TRUE; |
| + | return CURLE_OK; |
| + | } |
| + | |
| static void conn_report_connect_stats(struct Curl_easy *data, | |
| struct connectdata *conn); | |
| @@ -168,6 +177,61 @@ void Curl_conn_close(struct Curl_easy *data, int index) | |
| } | |
| } | |
| + | CURLcode Curl_conn_shutdown_blocking(struct Curl_easy *data, int sockindex) |
| + | { |
| + | struct Curl_cfilter *cf; |
| + | CURLcode result = CURLE_OK; |
| + | |
| + | DEBUGASSERT(data->conn); |
| + | /* it is valid to call that without filters being present */ |
| + | cf = data->conn->cfilter[sockindex]; |
| + | if(cf) { |
| + | timediff_t timeout_ms; |
| + | bool done = FALSE; |
| + | int what; |
| + | |
| + | DEBUGF(infof(data, "shutdown start on%s connection", |
| + | sockindex? " secondary" : "")); |
| + | Curl_shutdown_start(data, sockindex, NULL); |
| + | while(cf) { |
| + | while(!done && !result) { |
| + | result = cf->cft->do_shutdown(cf, data, &done); |
| + | if(!result && !done) { |
| + | timeout_ms = Curl_shutdown_timeleft(data->conn, sockindex, NULL); |
| + | if(timeout_ms < 0) { |
| + | failf(data, "SSL shutdown timeout"); |
| + | result = CURLE_OPERATION_TIMEDOUT; |
| + | goto out; |
| + | } |
| + | |
| + | what = Curl_conn_cf_poll(cf, data, timeout_ms); |
| + | if(what < 0) { |
| + | /* fatal error */ |
| + | failf(data, "select/poll on SSL socket, errno: %d", SOCKERRNO); |
| + | result = CURLE_RECV_ERROR; |
| + | goto out; |
| + | } |
| + | else if(0 == what) { |
| + | failf(data, "SSL shutdown timeout"); |
| + | result = CURLE_OPERATION_TIMEDOUT; |
| + | goto out; |
| + | } |
| + | } |
| + | } |
| + | if(result) |
| + | break; |
| + | CURL_TRC_CF(data, cf, "shut down successfully"); |
| + | cf = cf->next; |
| + | done = FALSE; |
| + | } |
| + | Curl_shutdown_clear(data, sockindex); |
| + | DEBUGF(infof(data, "shutdown done on%s connection -> %d", |
| + | sockindex? " secondary" : "", result)); |
| + | } |
| + | out: |
| + | return result; |
| + | } |
| + | |
| ssize_t Curl_cf_recv(struct Curl_easy *data, int num, char *buf, | |
| size_t len, CURLcode *code) | |
| { | |
| @@ -464,6 +528,42 @@ void Curl_conn_adjust_pollset(struct Curl_easy *data, | |
| } | |
| } | |
| + | int Curl_conn_cf_poll(struct Curl_cfilter *cf, |
| + | struct Curl_easy *data, |
| + | timediff_t timeout_ms) |
| + | { |
| + | struct easy_pollset ps; |
| + | struct pollfd pfds[MAX_SOCKSPEREASYHANDLE]; |
| + | unsigned int i, npfds = 0; |
| + | |
| + | DEBUGASSERT(cf); |
| + | DEBUGASSERT(data); |
| + | DEBUGASSERT(data->conn); |
| + | memset(&ps, 0, sizeof(ps)); |
| + | memset(pfds, 0, sizeof(pfds)); |
| + | |
| + | Curl_conn_cf_adjust_pollset(cf, data, &ps); |
| + | DEBUGASSERT(ps.num <= MAX_SOCKSPEREASYHANDLE); |
| + | for(i = 0; i < ps.num; ++i) { |
| + | short events = 0; |
| + | if(ps.actions[i] & CURL_POLL_IN) { |
| + | events |= POLLIN; |
| + | } |
| + | if(ps.actions[i] & CURL_POLL_OUT) { |
| + | events |= POLLOUT; |
| + | } |
| + | if(events) { |
| + | pfds[npfds].fd = ps.sockets[i]; |
| + | pfds[npfds].events = events; |
| + | ++npfds; |
| + | } |
| + | } |
| + | |
| + | if(!npfds) |
| + | DEBUGF(infof(data, "no sockets to poll!")); |
| + | return Curl_poll(pfds, npfds, timeout_ms); |
| + | } |
| + | |
| void Curl_conn_get_host(struct Curl_easy *data, int sockindex, | |
| const char **phost, const char **pdisplay_host, | |
| int *pport) | |
lib/cfilters.h+27 -0
| @@ -24,6 +24,7 @@ | |
| * | |
| ***************************************************************************/ | |
| + | #include "timediff.h" |
| struct Curl_cfilter; | |
| struct Curl_easy; | |
| @@ -36,9 +37,17 @@ struct connectdata; | |
| typedef void Curl_cft_destroy_this(struct Curl_cfilter *cf, | |
| struct Curl_easy *data); | |
| + | /* Callback to close the connection immediately. */ |
| typedef void Curl_cft_close(struct Curl_cfilter *cf, | |
| struct Curl_easy *data); | |
| + | /* Callback to close the connection filter gracefully, non-blocking. |
| + | * Implementations MUST NOT chain calls to cf->next. |
| + | */ |
| + | typedef CURLcode Curl_cft_shutdown(struct Curl_cfilter *cf, |
| + | struct Curl_easy *data, |
| + | bool *done); |
| + | |
| typedef CURLcode Curl_cft_connect(struct Curl_cfilter *cf, | |
| struct Curl_easy *data, | |
| bool blocking, bool *done); | |
| @@ -194,6 +203,7 @@ struct Curl_cftype { | |
| Curl_cft_destroy_this *destroy; /* destroy resources of this cf */ | |
| Curl_cft_connect *do_connect; /* establish connection */ | |
| Curl_cft_close *do_close; /* close conn */ | |
| + | Curl_cft_shutdown *do_shutdown; /* shutdown conn */ |
| Curl_cft_get_host *get_host; /* host filter talks to */ | |
| Curl_cft_adjust_pollset *adjust_pollset; /* adjust transfer poll set */ | |
| Curl_cft_data_pending *has_data_pending;/* conn has data pending */ | |
| @@ -244,6 +254,8 @@ CURLcode Curl_cf_def_conn_keep_alive(struct Curl_cfilter *cf, | |
| CURLcode Curl_cf_def_query(struct Curl_cfilter *cf, | |
| struct Curl_easy *data, | |
| int query, int *pres1, void *pres2); | |
| + | CURLcode Curl_cf_def_shutdown(struct Curl_cfilter *cf, |
| + | struct Curl_easy *data, bool *done); |
| /** | |
| * Create a new filter instance, unattached to the filter chain. | |
| @@ -371,6 +383,12 @@ bool Curl_conn_is_multiplex(struct connectdata *conn, int sockindex); | |
| */ | |
| void Curl_conn_close(struct Curl_easy *data, int sockindex); | |
| + | /** |
| + | * Shutdown the connection at `sockindex` blocking with timeout |
| + | * from `data->set.shutdowntimeout`, default DEFAULT_SHUTDOWN_TIMEOUT_MS |
| + | */ |
| + | CURLcode Curl_conn_shutdown_blocking(struct Curl_easy *data, int sockindex); |
| + | |
| /** | |
| * Return if data is pending in some connection filter at chain | |
| * `sockindex` for connection `data->conn`. | |
| @@ -402,6 +420,15 @@ void Curl_conn_cf_adjust_pollset(struct Curl_cfilter *cf, | |
| void Curl_conn_adjust_pollset(struct Curl_easy *data, | |
| struct easy_pollset *ps); | |
| + | /** |
| + | * Curl_poll() the filter chain at `cf` with timeout `timeout_ms`. |
| + | * Returns 0 on timeout, negative on error or number of sockets |
| + | * with requested poll events. |
| + | */ |
| + | int Curl_conn_cf_poll(struct Curl_cfilter *cf, |
| + | struct Curl_easy *data, |
| + | timediff_t timeout_ms); |
| + | |
| /** | |
| * Receive data through the filter chain at `sockindex` for connection | |
| * `data->conn`. Copy at most `len` bytes into `buf`. Return the | |
lib/connect.c+80 -0
| @@ -142,6 +142,43 @@ timediff_t Curl_timeleft(struct Curl_easy *data, | |
| return (ctimeleft_ms < timeleft_ms)? ctimeleft_ms : timeleft_ms; | |
| } | |
| + | void Curl_shutdown_start(struct Curl_easy *data, int sockindex, |
| + | struct curltime *nowp) |
| + | { |
| + | struct curltime now; |
| + | |
| + | DEBUGASSERT(data->conn); |
| + | if(!nowp) { |
| + | now = Curl_now(); |
| + | nowp = &now; |
| + | } |
| + | data->conn->shutdown.start[sockindex] = *nowp; |
| + | data->conn->shutdown.timeout_ms = (data->set.shutdowntimeout > 0) ? |
| + | data->set.shutdowntimeout : DEFAULT_SHUTDOWN_TIMEOUT_MS; |
| + | } |
| + | |
| + | timediff_t Curl_shutdown_timeleft(struct connectdata *conn, int sockindex, |
| + | struct curltime *nowp) |
| + | { |
| + | struct curltime now; |
| + | |
| + | if(!conn->shutdown.start[sockindex].tv_sec || !conn->shutdown.timeout_ms) |
| + | return 0; /* not started or no limits */ |
| + | |
| + | if(!nowp) { |
| + | now = Curl_now(); |
| + | nowp = &now; |
| + | } |
| + | return conn->shutdown.timeout_ms - |
| + | Curl_timediff(*nowp, conn->shutdown.start[sockindex]); |
| + | } |
| + | |
| + | void Curl_shutdown_clear(struct Curl_easy *data, int sockindex) |
| + | { |
| + | struct curltime *pt = &data->conn->shutdown.start[sockindex]; |
| + | memset(pt, 0, sizeof(*pt)); |
| + | } |
| + | |
| /* Copies connection info into the transfer handle to make it available when | |
| the transfer handle is no longer associated with the connection. */ | |
| void Curl_persistconninfo(struct Curl_easy *data, struct connectdata *conn, | |
| @@ -358,6 +395,7 @@ struct eyeballer { | |
| BIT(has_started); /* attempts have started */ | |
| BIT(is_done); /* out of addresses/time */ | |
| BIT(connected); /* cf has connected */ | |
| + | BIT(shutdown); /* cf has shutdown */ |
| BIT(inconclusive); /* connect was not a hard failure, we | |
| * might talk to a restarting server */ | |
| }; | |
| @@ -857,6 +895,46 @@ static void cf_he_ctx_clear(struct Curl_cfilter *cf, struct Curl_easy *data) | |
| ctx->winner = NULL; | |
| } | |
| + | static CURLcode cf_he_shutdown(struct Curl_cfilter *cf, |
| + | struct Curl_easy *data, bool *done) |
| + | { |
| + | struct cf_he_ctx *ctx = cf->ctx; |
| + | size_t i; |
| + | CURLcode result = CURLE_OK; |
| + | |
| + | DEBUGASSERT(data); |
| + | if(cf->connected) { |
| + | *done = TRUE; |
| + | return CURLE_OK; |
| + | } |
| + | |
| + | /* shutdown all ballers that have not done so already. If one fails, |
| + | * continue shutting down others until all are shutdown. */ |
| + | for(i = 0; i < ARRAYSIZE(ctx->baller); i++) { |
| + | struct eyeballer *baller = ctx->baller[i]; |
| + | bool bdone = FALSE; |
| + | if(!baller || !baller->cf || baller->shutdown) |
| + | continue; |
| + | baller->result = baller->cf->cft->do_shutdown(baller->cf, data, &bdone); |
| + | if(baller->result || bdone) |
| + | baller->shutdown = TRUE; /* treat a failed shutdown as done */ |
| + | } |
| + | |
| + | *done = TRUE; |
| + | for(i = 0; i < ARRAYSIZE(ctx->baller); i++) { |
| + | if(ctx->baller[i] && !ctx->baller[i]->shutdown) |
| + | *done = FALSE; |
| + | } |
| + | if(*done) { |
| + | for(i = 0; i < ARRAYSIZE(ctx->baller); i++) { |
| + | if(ctx->baller[i] && ctx->baller[i]->result) |
| + | result = ctx->baller[i]->result; |
| + | } |
| + | } |
| + | CURL_TRC_CF(data, cf, "shutdown -> %d, done=%d", result, *done); |
| + | return result; |
| + | } |
| + | |
| static void cf_he_adjust_pollset(struct Curl_cfilter *cf, | |
| struct Curl_easy *data, | |
| struct easy_pollset *ps) | |
| @@ -1052,6 +1130,7 @@ struct Curl_cftype Curl_cft_happy_eyeballs = { | |
| cf_he_destroy, | |
| cf_he_connect, | |
| cf_he_close, | |
| + | cf_he_shutdown, |
| Curl_cf_def_get_host, | |
| cf_he_adjust_pollset, | |
| cf_he_data_pending, | |
| @@ -1316,6 +1395,7 @@ struct Curl_cftype Curl_cft_setup = { | |
| cf_setup_destroy, | |
| cf_setup_connect, | |
| cf_setup_close, | |
| + | Curl_cf_def_shutdown, |
| Curl_cf_def_get_host, | |
| Curl_cf_def_adjust_pollset, | |
| Curl_cf_def_data_pending, | |
lib/connect.h+12 -0
| @@ -40,6 +40,18 @@ timediff_t Curl_timeleft(struct Curl_easy *data, | |
| #define DEFAULT_CONNECT_TIMEOUT 300000 /* milliseconds == five minutes */ | |
| + | #define DEFAULT_SHUTDOWN_TIMEOUT_MS (2 * 1000) |
| + | |
| + | void Curl_shutdown_start(struct Curl_easy *data, int sockindex, |
| + | struct curltime *nowp); |
| + | |
| + | /* return how much time there's left to shutdown the connection at |
| + | * sockindex. */ |
| + | timediff_t Curl_shutdown_timeleft(struct connectdata *conn, int sockindex, |
| + | struct curltime *nowp); |
| + | |
| + | void Curl_shutdown_clear(struct Curl_easy *data, int sockindex); |
| + | |
| /* | |
| * Used to extract socket and connectdata struct for the most recent | |
| * transfer on the given Curl_easy. | |
lib/ftp.c+16 -7
| @@ -290,12 +290,15 @@ const struct Curl_handler Curl_handler_ftps = { | |
| }; | |
| #endif | |
| - | static void close_secondarysocket(struct Curl_easy *data, |
| - | struct connectdata *conn) |
| + | static void close_secondarysocket(struct Curl_easy *data, bool premature) |
| { | |
| + | if(!premature) { |
| + | CURL_TRC_FTP(data, "[%s] shutting down DATA connection", FTP_DSTATE(data)); |
| + | Curl_conn_shutdown_blocking(data, SECONDARYSOCKET); |
| + | } |
| CURL_TRC_FTP(data, "[%s] closing DATA connection", FTP_DSTATE(data)); | |
| Curl_conn_close(data, SECONDARYSOCKET); | |
| - | Curl_conn_cf_discard_all(data, conn, SECONDARYSOCKET); |
| + | Curl_conn_cf_discard_all(data, data->conn, SECONDARYSOCKET); |
| } | |
| /* | |
| @@ -475,7 +478,7 @@ static CURLcode AcceptServerConnect(struct Curl_easy *data) | |
| Curl_set_in_callback(data, false); | |
| if(error) { | |
| - | close_secondarysocket(data, conn); |
| + | close_secondarysocket(data, TRUE); |
| return CURLE_ABORTED_BY_CALLBACK; | |
| } | |
| } | |
| @@ -2980,7 +2983,13 @@ static CURLcode ftp_statemachine(struct Curl_easy *data, | |
| case FTP_CCC: | |
| if(ftpcode < 500) { | |
| /* First shut down the SSL layer (note: this call will block) */ | |
| - | result = Curl_ssl_cfilter_remove(data, FIRSTSOCKET); |
| + | /* This has only been tested on the proftpd server, and the mod_tls |
| + | * code sends a close notify alert without waiting for a close notify |
| + | * alert in response. Thus we wait for a close notify alert from the |
| + | * server, but we do not send one. Let's hope other servers do |
| + | * the same... */ |
| + | result = Curl_ssl_cfilter_remove(data, FIRSTSOCKET, |
| + | (data->set.ftp_ccc == CURLFTPSSL_CCC_ACTIVE)); |
| if(result) | |
| failf(data, "Failed to clear the command channel (CCC)"); | |
| @@ -3457,7 +3466,7 @@ static CURLcode ftp_done(struct Curl_easy *data, CURLcode status, | |
| } | |
| } | |
| - | close_secondarysocket(data, conn); |
| + | close_secondarysocket(data, result != CURLE_OK); |
| } | |
| if(!result && (ftp->transfer == PPTRANSFER_BODY) && ftpc->ctl_valid && | |
| @@ -4425,7 +4434,7 @@ static CURLcode ftp_dophase_done(struct Curl_easy *data, bool connected) | |
| CURLcode result = ftp_do_more(data, &completed); | |
| if(result) { | |
| - | close_secondarysocket(data, conn); |
| + | close_secondarysocket(data, TRUE); |
| return result; | |
| } | |
| } | |
lib/http2.c+62 -9
| @@ -133,11 +133,14 @@ struct cf_h2_ctx { | |
| struct Curl_hash streams; /* hash of `data->id` to `h2_stream_ctx` */ | |
| size_t drain_total; /* sum of all stream's UrlState drain */ | |
| uint32_t max_concurrent_streams; | |
| - | uint32_t goaway_error; |
| - | int32_t last_stream_id; |
| + | uint32_t goaway_error; /* goaway error code from server */ |
| + | int32_t remote_max_sid; /* max id processed by server */ |
| + | int32_t local_max_sid; /* max id processed by us */ |
| BIT(conn_closed); | |
| - | BIT(goaway); |
| + | BIT(rcvd_goaway); |
| + | BIT(sent_goaway); |
| BIT(enable_push); | |
| + | BIT(shutdown); |
| BIT(nw_out_blocked); | |
| }; | |
| @@ -437,7 +440,7 @@ static CURLcode cf_h2_ctx_init(struct Curl_cfilter *cf, | |
| Curl_bufq_initp(&ctx->outbufq, &ctx->stream_bufcp, H2_NW_SEND_CHUNKS, 0); | |
| Curl_dyn_init(&ctx->scratch, CURL_MAX_HTTP_HEADER); | |
| Curl_hash_offt_init(&ctx->streams, 63, h2_stream_hash_free); | |
| - | ctx->last_stream_id = 2147483647; |
| + | ctx->remote_max_sid = 2147483647; |
| rc = nghttp2_session_callbacks_new(&cbs); | |
| if(rc) { | |
| @@ -967,6 +970,10 @@ static int push_promise(struct Curl_cfilter *cf, | |
| rv = CURL_PUSH_DENY; | |
| goto fail; | |
| } | |
| + | |
| + | /* success, remember max stream id processed */ |
| + | if(newstream->id > ctx->local_max_sid) |
| + | ctx->local_max_sid = newstream->id; |
| } | |
| else { | |
| CURL_TRC_CF(data, cf, "Got PUSH_PROMISE, ignore it"); | |
| @@ -1252,12 +1259,12 @@ static int on_frame_recv(nghttp2_session *session, const nghttp2_frame *frame, | |
| break; | |
| } | |
| case NGHTTP2_GOAWAY: | |
| - | ctx->goaway = TRUE; |
| + | ctx->rcvd_goaway = TRUE; |
| ctx->goaway_error = frame->goaway.error_code; | |
| - | ctx->last_stream_id = frame->goaway.last_stream_id; |
| + | ctx->remote_max_sid = frame->goaway.last_stream_id; |
| if(data) { | |
| infof(data, "received GOAWAY, error=%u, last_stream=%u", | |
| - | ctx->goaway_error, ctx->last_stream_id); |
| + | ctx->goaway_error, ctx->remote_max_sid); |
| Curl_multi_connchanged(data->multi); | |
| } | |
| break; | |
| @@ -1878,7 +1885,7 @@ static ssize_t stream_recv(struct Curl_cfilter *cf, struct Curl_easy *data, | |
| } | |
| else if(stream->reset || | |
| (ctx->conn_closed && Curl_bufq_is_empty(&ctx->inbufq)) || | |
| - | (ctx->goaway && ctx->last_stream_id < stream->id)) { |
| + | (ctx->rcvd_goaway && ctx->remote_max_sid < stream->id)) { |
| CURL_TRC_CF(data, cf, "[%d] returning ERR", stream->id); | |
| *err = data->req.bytecount? CURLE_PARTIAL_FILE : CURLE_HTTP2; | |
| nread = -1; | |
| @@ -2358,6 +2365,7 @@ static void cf_h2_adjust_pollset(struct Curl_cfilter *cf, | |
| struct easy_pollset *ps) | |
| { | |
| struct cf_h2_ctx *ctx = cf->ctx; | |
| + | struct cf_call_data save; |
| curl_socket_t sock; | |
| bool want_recv, want_send; | |
| @@ -2368,7 +2376,6 @@ static void cf_h2_adjust_pollset(struct Curl_cfilter *cf, | |
| Curl_pollset_check(data, ps, sock, &want_recv, &want_send); | |
| if(want_recv || want_send) { | |
| struct h2_stream_ctx *stream = H2_STREAM_CTX(ctx, data); | |
| - | struct cf_call_data save; |
| bool c_exhaust, s_exhaust; | |
| CF_DATA_SAVE(save, cf, data); | |
| @@ -2383,6 +2390,14 @@ static void cf_h2_adjust_pollset(struct Curl_cfilter *cf, | |
| Curl_pollset_set(data, ps, sock, want_recv, want_send); | |
| CF_DATA_RESTORE(cf, save); | |
| } | |
| + | else if(ctx->sent_goaway && !ctx->shutdown) { |
| + | /* shutdown in progress */ |
| + | CF_DATA_SAVE(save, cf, data); |
| + | want_send = nghttp2_session_want_write(ctx->h2); |
| + | want_recv = nghttp2_session_want_read(ctx->h2); |
| + | Curl_pollset_set(data, ps, sock, want_recv, want_send); |
| + | CF_DATA_RESTORE(cf, save); |
| + | } |
| } | |
| static CURLcode cf_h2_connect(struct Curl_cfilter *cf, | |
| @@ -2446,6 +2461,7 @@ static void cf_h2_close(struct Curl_cfilter *cf, struct Curl_easy *data) | |
| CF_DATA_SAVE(save, cf, data); | |
| cf_h2_ctx_clear(ctx); | |
| CF_DATA_RESTORE(cf, save); | |
| + | cf->connected = FALSE; |
| } | |
| if(cf->next) | |
| cf->next->cft->do_close(cf->next, data); | |
| @@ -2462,6 +2478,42 @@ static void cf_h2_destroy(struct Curl_cfilter *cf, struct Curl_easy *data) | |
| } | |
| } | |
| + | static CURLcode cf_h2_shutdown(struct Curl_cfilter *cf, |
| + | struct Curl_easy *data, bool *done) |
| + | { |
| + | struct cf_h2_ctx *ctx = cf->ctx; |
| + | CURLcode result; |
| + | int rv; |
| + | |
| + | if(!cf->connected || !ctx->h2 || ctx->shutdown) { |
| + | *done = TRUE; |
| + | return CURLE_OK; |
| + | } |
| + | |
| + | if(!ctx->sent_goaway) { |
| + | rv = nghttp2_submit_goaway(ctx->h2, NGHTTP2_FLAG_NONE, |
| + | ctx->local_max_sid, 0, |
| + | (const uint8_t *)"shutown", sizeof("shutown")); |
| + | if(rv) { |
| + | failf(data, "nghttp2_submit_goaway() failed: %s(%d)", |
| + | nghttp2_strerror(rv), rv); |
| + | return CURLE_SEND_ERROR; |
| + | } |
| + | ctx->sent_goaway = TRUE; |
| + | } |
| + | /* GOAWAY submitted, process egress and ingress until nghttp2 is done. */ |
| + | result = CURLE_OK; |
| + | if(nghttp2_session_want_write(ctx->h2)) |
| + | result = h2_progress_egress(cf, data); |
| + | if(!result && nghttp2_session_want_read(ctx->h2)) |
| + | result = h2_progress_ingress(cf, data, 0); |
| + | |
| + | *done = !result && !nghttp2_session_want_write(ctx->h2) && |
| + | !nghttp2_session_want_read(ctx->h2); |
| + | ctx->shutdown = (result || *done); |
| + | return result; |
| + | } |
| + | |
| static CURLcode http2_data_pause(struct Curl_cfilter *cf, | |
| struct Curl_easy *data, | |
| bool pause) | |
| @@ -2632,6 +2684,7 @@ struct Curl_cftype Curl_cft_nghttp2 = { | |
| cf_h2_destroy, | |
| cf_h2_connect, | |
| cf_h2_close, | |
| + | cf_h2_shutdown, |
| Curl_cf_def_get_host, | |
| cf_h2_adjust_pollset, | |
| cf_h2_data_pending, | |
lib/http_proxy.c+1 -0
| @@ -298,6 +298,7 @@ struct Curl_cftype Curl_cft_http_proxy = { | |
| http_proxy_cf_destroy, | |
| http_proxy_cf_connect, | |
| http_proxy_cf_close, | |
| + | Curl_cf_def_shutdown, |
| Curl_cf_http_proxy_get_host, | |
| Curl_cf_def_adjust_pollset, | |
| Curl_cf_def_data_pending, | |
lib/socks.c+1 -0
| @@ -1249,6 +1249,7 @@ struct Curl_cftype Curl_cft_socks_proxy = { | |
| socks_proxy_cf_destroy, | |
| socks_proxy_cf_connect, | |
| socks_proxy_cf_close, | |
| + | Curl_cf_def_shutdown, |
| socks_cf_get_host, | |
| socks_cf_adjust_pollset, | |
| Curl_cf_def_data_pending, | |
lib/urldata.h+6 -1
| @@ -847,6 +847,10 @@ struct connectdata { | |
| Curl_recv *recv[2]; | |
| Curl_send *send[2]; | |
| struct Curl_cfilter *cfilter[2]; /* connection filters */ | |
| + | struct { |
| + | struct curltime start[2]; /* when filter shutdown started */ |
| + | unsigned int timeout_ms; /* 0 means no timeout */ |
| + | } shutdown; |
| struct ssl_primary_config ssl_config; | |
| #ifndef CURL_DISABLE_PROXY | |
| @@ -1614,9 +1618,10 @@ struct UserDefined { | |
| void *progress_client; /* pointer to pass to the progress callback */ | |
| void *ioctl_client; /* pointer to pass to the ioctl callback */ | |
| unsigned int timeout; /* ms, 0 means no timeout */ | |
| - | unsigned int connecttimeout; /* ms, 0 means no timeout */ |
| + | unsigned int connecttimeout; /* ms, 0 means default timeout */ |
| unsigned int happy_eyeballs_timeout; /* ms, 0 is a valid value */ | |
| unsigned int server_response_timeout; /* ms, 0 means no timeout */ | |
| + | unsigned int shutdowntimeout; /* ms, 0 means default timeout */ |
| long maxage_conn; /* in seconds, max idle time to allow a connection that | |
| is to be reused */ | |
| long maxlifetime_conn; /* in seconds, max time since creation to allow a | |
lib/vquic/curl_msh3.c+1 -0
| @@ -1038,6 +1038,7 @@ struct Curl_cftype Curl_cft_http3 = { | |
| cf_msh3_destroy, | |
| cf_msh3_connect, | |
| cf_msh3_close, | |
| + | Curl_cf_def_shutdown, |
| Curl_cf_def_get_host, | |
| cf_msh3_adjust_pollset, | |
| cf_msh3_data_pending, | |
lib/vquic/curl_ngtcp2.c+1 -0
| @@ -2438,6 +2438,7 @@ struct Curl_cftype Curl_cft_http3 = { | |
| cf_ngtcp2_destroy, | |
| cf_ngtcp2_connect, | |
| cf_ngtcp2_close, | |
| + | Curl_cf_def_shutdown, |
| Curl_cf_def_get_host, | |
| cf_ngtcp2_adjust_pollset, | |
| cf_ngtcp2_data_pending, | |
lib/vquic/curl_osslq.c+1 -0
| @@ -2252,6 +2252,7 @@ struct Curl_cftype Curl_cft_http3 = { | |
| cf_osslq_destroy, | |
| cf_osslq_connect, | |
| cf_osslq_close, | |
| + | Curl_cf_def_shutdown, |
| Curl_cf_def_get_host, | |
| cf_osslq_adjust_pollset, | |
| cf_osslq_data_pending, | |
lib/vquic/curl_quiche.c+1 -0
| @@ -1580,6 +1580,7 @@ struct Curl_cftype Curl_cft_http3 = { | |
| cf_quiche_destroy, | |
| cf_quiche_connect, | |
| cf_quiche_close, | |
| + | Curl_cf_def_shutdown, |
| Curl_cf_def_get_host, | |
| cf_quiche_adjust_pollset, | |
| cf_quiche_data_pending, | |
lib/vtls/bearssl.c+41 -3
| @@ -63,6 +63,7 @@ struct bearssl_ssl_backend_data { | |
| bool active; | |
| /* size of pending write, yet to be flushed */ | |
| size_t pending_write; | |
| + | BIT(sent_shutdown); |
| }; | |
| struct cafile_parser { | |
| @@ -1069,6 +1070,41 @@ static void *bearssl_get_internals(struct ssl_connect_data *connssl, | |
| return &backend->ctx; | |
| } | |
| + | static CURLcode bearssl_shutdown(struct Curl_cfilter *cf, |
| + | struct Curl_easy *data, |
| + | bool send_shutdown, bool *done) |
| + | { |
| + | struct ssl_connect_data *connssl = cf->ctx; |
| + | struct bearssl_ssl_backend_data *backend = |
| + | (struct bearssl_ssl_backend_data *)connssl->backend; |
| + | CURLcode result; |
| + | |
| + | DEBUGASSERT(backend); |
| + | if(!backend->active || connssl->shutdown) { |
| + | *done = TRUE; |
| + | return CURLE_OK; |
| + | } |
| + | |
| + | *done = FALSE; |
| + | if(!backend->sent_shutdown) { |
| + | (void)send_shutdown; /* unknown how to suppress our close notify */ |
| + | br_ssl_engine_close(&backend->ctx.eng); |
| + | backend->sent_shutdown = TRUE; |
| + | } |
| + | |
| + | result = bearssl_run_until(cf, data, BR_SSL_CLOSED); |
| + | if(result == CURLE_OK) { |
| + | *done = TRUE; |
| + | } |
| + | else if(result == CURLE_AGAIN) |
| + | result = CURLE_OK; |
| + | else |
| + | CURL_TRC_CF(data, cf, "shutdown error: %d", result); |
| + | |
| + | connssl->shutdown = (result || *done); |
| + | return result; |
| + | } |
| + | |
| static void bearssl_close(struct Curl_cfilter *cf, struct Curl_easy *data) | |
| { | |
| struct ssl_connect_data *connssl = cf->ctx; | |
| @@ -1079,9 +1115,11 @@ static void bearssl_close(struct Curl_cfilter *cf, struct Curl_easy *data) | |
| DEBUGASSERT(backend); | |
| if(backend->active) { | |
| + | if(!connssl->shutdown) { |
| + | bool done; |
| + | bearssl_shutdown(cf, data, TRUE, &done); |
| + | } |
| backend->active = FALSE; | |
| - | br_ssl_engine_close(&backend->ctx.eng); |
| - | (void)bearssl_run_until(cf, data, BR_SSL_CLOSED); |
| } | |
| if(backend->anchors) { | |
| for(i = 0; i < backend->anchors_len; ++i) | |
| @@ -1112,7 +1150,7 @@ const struct Curl_ssl Curl_ssl_bearssl = { | |
| Curl_none_cleanup, /* cleanup */ | |
| bearssl_version, /* version */ | |
| Curl_none_check_cxn, /* check_cxn */ | |
| - | Curl_none_shutdown, /* shutdown */ |
| + | bearssl_shutdown, /* shutdown */ |
| bearssl_data_pending, /* data_pending */ | |
| bearssl_random, /* random */ | |
| Curl_none_cert_status_request, /* cert_status_request */ | |
lib/vtls/gtls.c+71 -91
| @@ -1799,121 +1799,101 @@ static ssize_t gtls_send(struct Curl_cfilter *cf, | |
| return rc; | |
| } | |
| - | static void gtls_close(struct Curl_cfilter *cf, |
| - | struct Curl_easy *data) |
| + | /* |
| + | * This function is called to shut down the SSL layer but keep the |
| + | * socket open (CCC - Clear Command Channel) |
| + | */ |
| + | static CURLcode gtls_shutdown(struct Curl_cfilter *cf, |
| + | struct Curl_easy *data, |
| + | bool send_shutdown, bool *done) |
| { | |
| struct ssl_connect_data *connssl = cf->ctx; | |
| struct gtls_ssl_backend_data *backend = | |
| (struct gtls_ssl_backend_data *)connssl->backend; | |
| + | char buf[1024]; |
| + | CURLcode result = CURLE_OK; |
| + | ssize_t nread; |
| + | size_t i; |
| - | (void) data; |
| DEBUGASSERT(backend); | |
| - | CURL_TRC_CF(data, cf, "close"); |
| - | if(backend->gtls.session) { |
| - | char buf[32]; |
| - | /* Maybe the server has already sent a close notify alert. |
| - | Read it to avoid an RST on the TCP connection. */ |
| - | CURL_TRC_CF(data, cf, "close, try receive before bye"); |
| - | (void)gnutls_record_recv(backend->gtls.session, buf, sizeof(buf)); |
| - | CURL_TRC_CF(data, cf, "close, send bye"); |
| - | gnutls_bye(backend->gtls.session, GNUTLS_SHUT_RDWR); |
| - | /* try one last receive */ |
| - | CURL_TRC_CF(data, cf, "close, receive after bye"); |
| - | (void)gnutls_record_recv(backend->gtls.session, buf, sizeof(buf)); |
| - | gnutls_deinit(backend->gtls.session); |
| - | backend->gtls.session = NULL; |
| + | if(!backend->gtls.session || connssl->shutdown) { |
| + | *done = TRUE; |
| + | goto out; |
| } | |
| - | if(backend->gtls.shared_creds) { |
| - | Curl_gtls_shared_creds_free(&backend->gtls.shared_creds); |
| + | |
| + | connssl->io_need = CURL_SSL_IO_NEED_NONE; |
| + | *done = FALSE; |
| + | |
| + | if(!backend->gtls.sent_shutdown) { |
| + | /* do this only once */ |
| + | backend->gtls.sent_shutdown = TRUE; |
| + | if(send_shutdown) { |
| + | int ret = gnutls_bye(backend->gtls.session, GNUTLS_SHUT_RDWR); |
| + | if(ret != GNUTLS_E_SUCCESS) { |
| + | CURL_TRC_CF(data, cf, "SSL shutdown, gnutls_bye error: '%s'(%d)", |
| + | gnutls_strerror((int)ret), (int)ret); |
| + | result = CURLE_RECV_ERROR; |
| + | goto out; |
| + | } |
| + | } |
| } | |
| - | #ifdef USE_GNUTLS_SRP |
| - | if(backend->gtls.srp_client_cred) { |
| - | gnutls_srp_free_client_credentials(backend->gtls.srp_client_cred); |
| - | backend->gtls.srp_client_cred = NULL; |
| + | |
| + | /* SSL should now have started the shutdown from our side. Since it |
| + | * was not complete, we are lacking the close notify from the server. */ |
| + | for(i = 0; i < 10; ++i) { |
| + | nread = gnutls_record_recv(backend->gtls.session, buf, sizeof(buf)); |
| + | if(nread <= 0) |
| + | break; |
| } | |
| - | #endif |
| + | if(nread > 0) { |
| + | /* still data coming in? */ |
| + | } |
| + | else if(nread == 0) { |
| + | /* We got the close notify alert and are done. */ |
| + | *done = TRUE; |
| + | } |
| + | else if((nread == GNUTLS_E_AGAIN) || (nread == GNUTLS_E_INTERRUPTED)) { |
| + | connssl->io_need = gnutls_record_get_direction(backend->gtls.session)? |
| + | CURL_SSL_IO_NEED_SEND : CURL_SSL_IO_NEED_RECV; |
| + | } |
| + | else { |
| + | CURL_TRC_CF(data, cf, "SSL shutdown, error: '%s'(%d)", |
| + | gnutls_strerror((int)nread), (int)nread); |
| + | result = CURLE_RECV_ERROR; |
| + | } |
| + | |
| + | out: |
| + | connssl->shutdown = (result || *done); |
| + | return result; |
| } | |
| - | /* |
| - | * This function is called to shut down the SSL layer but keep the |
| - | * socket open (CCC - Clear Command Channel) |
| - | */ |
| - | static int gtls_shutdown(struct Curl_cfilter *cf, |
| - | struct Curl_easy *data) |
| + | static void gtls_close(struct Curl_cfilter *cf, |
| + | struct Curl_easy *data) |
| { | |
| struct ssl_connect_data *connssl = cf->ctx; | |
| struct gtls_ssl_backend_data *backend = | |
| (struct gtls_ssl_backend_data *)connssl->backend; | |
| - | int retval = 0; |
| + | (void) data; |
| DEBUGASSERT(backend); | |
| - | |
| - | #ifndef CURL_DISABLE_FTP |
| - | /* This has only been tested on the proftpd server, and the mod_tls code |
| - | sends a close notify alert without waiting for a close notify alert in |
| - | response. Thus we wait for a close notify alert from the server, but |
| - | we do not send one. Let's hope other servers do the same... */ |
| - | |
| - | if(data->set.ftp_ccc == CURLFTPSSL_CCC_ACTIVE) |
| - | gnutls_bye(backend->gtls.session, GNUTLS_SHUT_WR); |
| - | #endif |
| - | |
| + | CURL_TRC_CF(data, cf, "close"); |
| if(backend->gtls.session) { | |
| - | ssize_t result; |
| - | bool done = FALSE; |
| - | char buf[120]; |
| - | |
| - | while(!done && !connssl->peer_closed) { |
| - | int what = SOCKET_READABLE(Curl_conn_cf_get_socket(cf, data), |
| - | SSL_SHUTDOWN_TIMEOUT); |
| - | if(what > 0) { |
| - | /* Something to read, let's do it and hope that it is the close |
| - | notify alert from the server */ |
| - | result = gnutls_record_recv(backend->gtls.session, |
| - | buf, sizeof(buf)); |
| - | switch(result) { |
| - | case 0: |
| - | /* This is the expected response. There was no data but only |
| - | the close notify alert */ |
| - | done = TRUE; |
| - | break; |
| - | case GNUTLS_E_AGAIN: |
| - | case GNUTLS_E_INTERRUPTED: |
| - | infof(data, "GNUTLS_E_AGAIN || GNUTLS_E_INTERRUPTED"); |
| - | break; |
| - | default: |
| - | retval = -1; |
| - | done = TRUE; |
| - | break; |
| - | } |
| - | } |
| - | else if(0 == what) { |
| - | /* timeout */ |
| - | failf(data, "SSL shutdown timeout"); |
| - | done = TRUE; |
| - | } |
| - | else { |
| - | /* anything that gets here is fatally bad */ |
| - | failf(data, "select/poll on SSL socket, errno: %d", SOCKERRNO); |
| - | retval = -1; |
| - | done = TRUE; |
| - | } |
| + | if(!connssl->shutdown) { |
| + | bool done; |
| + | gtls_shutdown(cf, data, TRUE, &done); |
| } | |
| gnutls_deinit(backend->gtls.session); | |
| + | backend->gtls.session = NULL; |
| + | } |
| + | if(backend->gtls.shared_creds) { |
| + | Curl_gtls_shared_creds_free(&backend->gtls.shared_creds); |
| } | |
| - | |
| #ifdef USE_GNUTLS_SRP | |
| - | { |
| - | struct ssl_config_data *ssl_config = Curl_ssl_cf_get_config(cf, data); |
| - | if(ssl_config->primary.username) |
| - | gnutls_srp_free_client_credentials(backend->gtls.srp_client_cred); |
| + | if(backend->gtls.srp_client_cred) { |
| + | gnutls_srp_free_client_credentials(backend->gtls.srp_client_cred); |
| + | backend->gtls.srp_client_cred = NULL; |
| } | |
| #endif | |
| - | |
| - | backend->gtls.session = NULL; |
| - | Curl_gtls_shared_creds_free(&backend->gtls.shared_creds); |
| - | |
| - | return retval; |
| } | |
| static ssize_t gtls_recv(struct Curl_cfilter *cf, | |
lib/vtls/gtls.h+1 -0
| @@ -66,6 +66,7 @@ struct gtls_ctx { | |
| gnutls_srp_client_credentials_t srp_client_cred; | |
| #endif | |
| CURLcode io_result; /* result of last IO cfilter operation */ | |
| + | BIT(sent_shutdown); |
| }; | |
| typedef CURLcode Curl_gtls_ctx_setup_cb(struct Curl_cfilter *cf, | |
lib/vtls/mbedtls.c+96 -10
| @@ -111,6 +111,7 @@ struct mbed_ssl_backend_data { | |
| #endif | |
| int *ciphersuites; | |
| BIT(initialized); /* mbedtls_ssl_context is initialized */ | |
| + | BIT(sent_shutdown); |
| }; | |
| /* apply threading? */ | |
| @@ -1198,23 +1199,108 @@ static void mbedtls_close_all(struct Curl_easy *data) | |
| (void)data; | |
| } | |
| + | static CURLcode mbedtls_shutdown(struct Curl_cfilter *cf, |
| + | struct Curl_easy *data, |
| + | bool send_shutdown, bool *done) |
| + | { |
| + | struct ssl_connect_data *connssl = cf->ctx; |
| + | struct mbed_ssl_backend_data *backend = |
| + | (struct mbed_ssl_backend_data *)connssl->backend; |
| + | unsigned char buf[1024]; |
| + | CURLcode result = CURLE_OK; |
| + | int ret; |
| + | size_t i; |
| + | |
| + | DEBUGASSERT(backend); |
| + | |
| + | if(!backend->initialized || connssl->shutdown) { |
| + | *done = TRUE; |
| + | return CURLE_OK; |
| + | } |
| + | |
| + | connssl->io_need = CURL_SSL_IO_NEED_NONE; |
| + | *done = FALSE; |
| + | |
| + | if(!backend->sent_shutdown) { |
| + | /* do this only once */ |
| + | backend->sent_shutdown = TRUE; |
| + | if(send_shutdown) { |
| + | ret = mbedtls_ssl_close_notify(&backend->ssl); |
| + | switch(ret) { |
| + | case 0: /* we sent it, receive from the server */ |
| + | break; |
| + | case MBEDTLS_ERR_SSL_PEER_CLOSE_NOTIFY: /* server also closed */ |
| + | *done = TRUE; |
| + | goto out; |
| + | case MBEDTLS_ERR_SSL_WANT_READ: |
| + | connssl->io_need = CURL_SSL_IO_NEED_RECV; |
| + | goto out; |
| + | case MBEDTLS_ERR_SSL_WANT_WRITE: |
| + | connssl->io_need = CURL_SSL_IO_NEED_SEND; |
| + | goto out; |
| + | default: |
| + | CURL_TRC_CF(data, cf, "mbedtls_shutdown error -0x%04X", -ret); |
| + | result = CURLE_RECV_ERROR; |
| + | goto out; |
| + | } |
| + | } |
| + | } |
| + | |
| + | /* SSL should now have started the shutdown from our side. Since it |
| + | * was not complete, we are lacking the close notify from the server. */ |
| + | for(i = 0; i < 10; ++i) { |
| + | ret = mbedtls_ssl_read(&backend->ssl, buf, sizeof(buf)); |
| + | /* This seems to be a bug in mbedTLS TLSv1.3 where it reports |
| + | * WANT_READ, but has not encountered an EAGAIN. */ |
| + | if(ret == MBEDTLS_ERR_SSL_WANT_READ) |
| + | ret = mbedtls_ssl_read(&backend->ssl, buf, sizeof(buf)); |
| + | #ifdef TLS13_SUPPORT |
| + | if(ret == MBEDTLS_ERR_SSL_RECEIVED_NEW_SESSION_TICKET) |
| + | continue; |
| + | #endif |
| + | if(ret <= 0) |
| + | break; |
| + | } |
| + | |
| + | if(ret > 0) { |
| + | /* still data coming in? */ |
| + | CURL_TRC_CF(data, cf, "mbedtls_shutdown, still getting data"); |
| + | } |
| + | else if(ret == 0 || (ret == MBEDTLS_ERR_SSL_PEER_CLOSE_NOTIFY)) { |
| + | /* We got the close notify alert and are done. */ |
| + | CURL_TRC_CF(data, cf, "mbedtls_shutdown done"); |
| + | *done = TRUE; |
| + | } |
| + | else if(ret == MBEDTLS_ERR_SSL_WANT_READ) { |
| + | CURL_TRC_CF(data, cf, "mbedtls_shutdown, need RECV"); |
| + | connssl->io_need = CURL_SSL_IO_NEED_RECV; |
| + | } |
| + | else if(ret == MBEDTLS_ERR_SSL_WANT_WRITE) { |
| + | CURL_TRC_CF(data, cf, "mbedtls_shutdown, need SEND"); |
| + | connssl->io_need = CURL_SSL_IO_NEED_SEND; |
| + | } |
| + | else { |
| + | CURL_TRC_CF(data, cf, "mbedtls_shutdown error -0x%04X", -ret); |
| + | result = CURLE_RECV_ERROR; |
| + | } |
| + | |
| + | out: |
| + | connssl->shutdown = (result || *done); |
| + | return result; |
| + | } |
| + | |
| static void mbedtls_close(struct Curl_cfilter *cf, struct Curl_easy *data) | |
| { | |
| struct ssl_connect_data *connssl = cf->ctx; | |
| struct mbed_ssl_backend_data *backend = | |
| (struct mbed_ssl_backend_data *)connssl->backend; | |
| - | (void)data; |
| DEBUGASSERT(backend); | |
| if(backend->initialized) { | |
| - | char buf[32]; |
| - | int ret; |
| - | |
| - | /* Maybe the server has already sent a close notify alert. |
| - | Read it to avoid an RST on the TCP connection. */ |
| - | (void)mbedtls_ssl_read(&backend->ssl, (unsigned char *)buf, sizeof(buf)); |
| - | ret = mbedtls_ssl_close_notify(&backend->ssl); |
| - | CURL_TRC_CF(data, cf, "close_notify() -> %04x", -ret); |
| + | if(!connssl->shutdown) { |
| + | bool done; |
| + | mbedtls_shutdown(cf, data, TRUE, &done); |
| + | } |
| mbedtls_pk_free(&backend->pk); | |
| mbedtls_x509_crt_free(&backend->clicert); | |
| @@ -1535,7 +1621,7 @@ const struct Curl_ssl Curl_ssl_mbedtls = { | |
| mbedtls_cleanup, /* cleanup */ | |
| mbedtls_version, /* version */ | |
| Curl_none_check_cxn, /* check_cxn */ | |
| - | Curl_none_shutdown, /* shutdown */ |
| + | mbedtls_shutdown, /* shutdown */ |
| mbedtls_data_pending, /* data_pending */ | |
| mbedtls_random, /* random */ | |
| Curl_none_cert_status_request, /* cert_status_request */ | |
lib/vtls/openssl.c+97 -171
| @@ -1870,203 +1870,129 @@ static struct curl_slist *ossl_engines_list(struct Curl_easy *data) | |
| return list; | |
| } | |
| - | static void ossl_close(struct Curl_cfilter *cf, struct Curl_easy *data) |
| + | static CURLcode ossl_shutdown(struct Curl_cfilter *cf, |
| + | struct Curl_easy *data, |
| + | bool send_shutdown, bool *done) |
| { | |
| struct ssl_connect_data *connssl = cf->ctx; | |
| struct ossl_ctx *octx = (struct ossl_ctx *)connssl->backend; | |
| + | CURLcode result = CURLE_OK; |
| + | char buf[1024]; |
| + | int nread, err; |
| + | unsigned long sslerr; |
| - | (void)data; |
| DEBUGASSERT(octx); | |
| + | if(!octx->ssl || connssl->shutdown) { |
| + | *done = TRUE; |
| + | goto out; |
| + | } |
| - | if(octx->ssl) { |
| - | /* Send the TLS shutdown if we are still connected *and* if |
| - | * the peer did not already close the connection. */ |
| - | if(cf->next && cf->next->connected && !connssl->peer_closed) { |
| - | char buf[1024]; |
| - | int nread, err; |
| - | unsigned long sslerr; |
| - | |
| - | /* Maybe the server has already sent a close notify alert. |
| - | Read it to avoid an RST on the TCP connection. */ |
| - | ERR_clear_error(); |
| - | nread = SSL_read(octx->ssl, buf, (int)sizeof(buf)); |
| - | err = SSL_get_error(octx->ssl, nread); |
| - | if(!nread && err == SSL_ERROR_ZERO_RETURN) { |
| - | CURLcode result; |
| - | ssize_t n; |
| - | size_t blen = sizeof(buf); |
| - | CURL_TRC_CF(data, cf, "peer has shutdown TLS"); |
| - | /* SSL_read() will not longer touch the socket, let's receive |
| - | * directly from the next filter to see if the underlying |
| - | * connection has also been closed. */ |
| - | n = Curl_conn_cf_recv(cf->next, data, buf, blen, &result); |
| - | if(!n) { |
| - | connssl->peer_closed = TRUE; |
| - | CURL_TRC_CF(data, cf, "peer closed connection"); |
| - | } |
| - | } |
| - | ERR_clear_error(); |
| - | if(connssl->peer_closed) { |
| - | /* As the peer closed, we do not expect it to read anything more we |
| - | * may send. It may be harmful, leading to TCP RST and delaying |
| - | * a lingering close. Just leave. */ |
| - | CURL_TRC_CF(data, cf, "not from sending TLS shutdown on " |
| - | "connection closed by peer"); |
| - | } |
| - | else if(SSL_shutdown(octx->ssl) == 1) { |
| - | CURL_TRC_CF(data, cf, "SSL shutdown finished"); |
| + | connssl->io_need = CURL_SSL_IO_NEED_NONE; |
| + | *done = FALSE; |
| + | if(!(SSL_get_shutdown(octx->ssl) & SSL_SENT_SHUTDOWN)) { |
| + | /* We have not started the shutdown from our side yet. Check |
| + | * if the server already sent us one. */ |
| + | ERR_clear_error(); |
| + | nread = SSL_read(octx->ssl, buf, (int)sizeof(buf)); |
| + | err = SSL_get_error(octx->ssl, nread); |
| + | if(!nread && err == SSL_ERROR_ZERO_RETURN) { |
| + | bool input_pending; |
| + | /* Yes, it did. */ |
| + | if(!send_shutdown) { |
| + | connssl->shutdown = TRUE; |
| + | CURL_TRC_CF(data, cf, "SSL shutdown received, not sending"); |
| + | goto out; |
| } | |
| - | else { |
| - | nread = SSL_read(octx->ssl, buf, (int)sizeof(buf)); |
| - | err = SSL_get_error(octx->ssl, nread); |
| - | switch(err) { |
| - | case SSL_ERROR_NONE: /* this is not an error */ |
| - | case SSL_ERROR_ZERO_RETURN: /* no more data */ |
| - | CURL_TRC_CF(data, cf, "SSL shutdown, EOF from server"); |
| - | break; |
| - | case SSL_ERROR_WANT_READ: |
| - | /* SSL has send its notify and now wants to read the reply |
| - | * from the server. We are not really interested in that. */ |
| - | CURL_TRC_CF(data, cf, "SSL shutdown sent"); |
| - | break; |
| - | case SSL_ERROR_WANT_WRITE: |
| - | CURL_TRC_CF(data, cf, "SSL shutdown send blocked"); |
| - | break; |
| - | default: |
| - | sslerr = ERR_get_error(); |
| - | CURL_TRC_CF(data, cf, "SSL shutdown, error: '%s', errno %d", |
| - | (sslerr ? |
| - | ossl_strerror(sslerr, buf, sizeof(buf)) : |
| - | SSL_ERROR_to_str(err)), |
| - | SOCKERRNO); |
| - | break; |
| - | } |
| + | else if(!cf->next->cft->is_alive(cf->next, data, &input_pending)) { |
| + | /* Server closed the connection after its closy notify. It |
| + | * seems not interested to see our close notify, so do not |
| + | * send it. We are done. */ |
| + | connssl->peer_closed = TRUE; |
| + | connssl->shutdown = TRUE; |
| + | CURL_TRC_CF(data, cf, "peer closed connection"); |
| + | goto out; |
| } | |
| - | |
| - | ERR_clear_error(); |
| - | SSL_set_connect_state(octx->ssl); |
| } | |
| - | |
| - | SSL_free(octx->ssl); |
| - | octx->ssl = NULL; |
| } | |
| - | if(octx->ssl_ctx) { |
| - | SSL_CTX_free(octx->ssl_ctx); |
| - | octx->ssl_ctx = NULL; |
| - | octx->x509_store_setup = FALSE; |
| + | |
| + | if(send_shutdown && SSL_shutdown(octx->ssl) == 1) { |
| + | CURL_TRC_CF(data, cf, "SSL shutdown finished"); |
| + | *done = TRUE; |
| + | goto out; |
| } | |
| - | if(octx->bio_method) { |
| - | ossl_bio_cf_method_free(octx->bio_method); |
| - | octx->bio_method = NULL; |
| + | else { |
| + | size_t i; |
| + | /* SSL should now have started the shutdown from our side. Since it |
| + | * was not complete, we are lacking the close notify from the server. */ |
| + | for(i = 0; i < 10; ++i) { |
| + | ERR_clear_error(); |
| + | nread = SSL_read(octx->ssl, buf, (int)sizeof(buf)); |
| + | if(nread <= 0) |
| + | break; |
| + | } |
| + | err = SSL_get_error(octx->ssl, nread); |
| + | switch(err) { |
| + | case SSL_ERROR_ZERO_RETURN: /* no more data */ |
| + | CURL_TRC_CF(data, cf, "SSL shutdown received"); |
| + | *done = TRUE; |
| + | break; |
| + | case SSL_ERROR_NONE: /* just did not get anything */ |
| + | case SSL_ERROR_WANT_READ: |
| + | /* SSL has send its notify and now wants to read the reply |
| + | * from the server. We are not really interested in that. */ |
| + | CURL_TRC_CF(data, cf, "SSL shutdown sent, want receive"); |
| + | connssl->io_need = CURL_SSL_IO_NEED_RECV; |
| + | break; |
| + | case SSL_ERROR_WANT_WRITE: |
| + | CURL_TRC_CF(data, cf, "SSL shutdown send blocked"); |
| + | connssl->io_need = CURL_SSL_IO_NEED_SEND; |
| + | break; |
| + | default: |
| + | sslerr = ERR_get_error(); |
| + | CURL_TRC_CF(data, cf, "SSL shutdown, error: '%s', errno %d", |
| + | (sslerr ? |
| + | ossl_strerror(sslerr, buf, sizeof(buf)) : |
| + | SSL_ERROR_to_str(err)), |
| + | SOCKERRNO); |
| + | result = CURLE_RECV_ERROR; |
| + | break; |
| + | } |
| } | |
| + | |
| + | out: |
| + | connssl->shutdown = (result || *done); |
| + | return result; |
| } | |
| - | /* |
| - | * This function is called to shut down the SSL layer but keep the |
| - | * socket open (CCC - Clear Command Channel) |
| - | */ |
| - | static int ossl_shutdown(struct Curl_cfilter *cf, |
| - | struct Curl_easy *data) |
| + | static void ossl_close(struct Curl_cfilter *cf, struct Curl_easy *data) |
| { | |
| - | int retval = 0; |
| struct ssl_connect_data *connssl = cf->ctx; | |
| - | char buf[256]; /* We will use this for the OpenSSL error buffer, so it has |
| - | to be at least 256 bytes long. */ |
| - | unsigned long sslerror; |
| - | int nread; |
| - | int buffsize; |
| - | int err; |
| - | bool done = FALSE; |
| struct ossl_ctx *octx = (struct ossl_ctx *)connssl->backend; | |
| - | int loop = 10; |
| + | (void)data; |
| DEBUGASSERT(octx); | |
| - | #ifndef CURL_DISABLE_FTP |
| - | /* This has only been tested on the proftpd server, and the mod_tls code |
| - | sends a close notify alert without waiting for a close notify alert in |
| - | response. Thus we wait for a close notify alert from the server, but |
| - | we do not send one. Let's hope other servers do the same... */ |
| - | |
| - | if(data->set.ftp_ccc == CURLFTPSSL_CCC_ACTIVE) |
| - | (void)SSL_shutdown(octx->ssl); |
| - | #endif |
| - | |
| if(octx->ssl) { | |
| - | buffsize = (int)sizeof(buf); |
| - | while(!done && loop--) { |
| - | int what = SOCKET_READABLE(Curl_conn_cf_get_socket(cf, data), |
| - | SSL_SHUTDOWN_TIMEOUT); |
| - | if(what > 0) { |
| - | ERR_clear_error(); |
| - | |
| - | /* Something to read, let's do it and hope that it is the close |
| - | notify alert from the server */ |
| - | nread = SSL_read(octx->ssl, buf, buffsize); |
| - | err = SSL_get_error(octx->ssl, nread); |
| - | |
| - | switch(err) { |
| - | case SSL_ERROR_NONE: /* this is not an error */ |
| - | case SSL_ERROR_ZERO_RETURN: /* no more data */ |
| - | /* This is the expected response. There was no data but only |
| - | the close notify alert */ |
| - | done = TRUE; |
| - | break; |
| - | case SSL_ERROR_WANT_READ: |
| - | /* there's data pending, re-invoke SSL_read() */ |
| - | infof(data, "SSL_ERROR_WANT_READ"); |
| - | break; |
| - | case SSL_ERROR_WANT_WRITE: |
| - | /* SSL wants a write. Really odd. Let's bail out. */ |
| - | infof(data, "SSL_ERROR_WANT_WRITE"); |
| - | done = TRUE; |
| - | break; |
| - | default: |
| - | /* openssl/ssl.h says "look at error stack/return value/errno" */ |
| - | sslerror = ERR_get_error(); |
| - | failf(data, OSSL_PACKAGE " SSL_read on shutdown: %s, errno %d", |
| - | (sslerror ? |
| - | ossl_strerror(sslerror, buf, sizeof(buf)) : |
| - | SSL_ERROR_to_str(err)), |
| - | SOCKERRNO); |
| - | done = TRUE; |
| - | break; |
| - | } |
| - | } |
| - | else if(0 == what) { |
| - | /* timeout */ |
| - | failf(data, "SSL shutdown timeout"); |
| - | done = TRUE; |
| - | } |
| - | else { |
| - | /* anything that gets here is fatally bad */ |
| - | failf(data, "select/poll on SSL socket, errno: %d", SOCKERRNO); |
| - | retval = -1; |
| - | done = TRUE; |
| - | } |
| - | } /* while()-loop for the select() */ |
| - | |
| - | if(data->set.verbose) { |
| - | #ifdef HAVE_SSL_GET_SHUTDOWN |
| - | switch(SSL_get_shutdown(octx->ssl)) { |
| - | case SSL_SENT_SHUTDOWN: |
| - | infof(data, "SSL_get_shutdown() returned SSL_SENT_SHUTDOWN"); |
| - | break; |
| - | case SSL_RECEIVED_SHUTDOWN: |
| - | infof(data, "SSL_get_shutdown() returned SSL_RECEIVED_SHUTDOWN"); |
| - | break; |
| - | case SSL_SENT_SHUTDOWN|SSL_RECEIVED_SHUTDOWN: |
| - | infof(data, "SSL_get_shutdown() returned SSL_SENT_SHUTDOWN|" |
| - | "SSL_RECEIVED__SHUTDOWN"); |
| - | break; |
| - | } |
| - | #endif |
| + | /* Send the TLS shutdown if have not done so already and are still |
| + | * connected *and* if the peer did not already close the connection. */ |
| + | if(cf->connected && !connssl->shutdown && |
| + | cf->next && cf->next->connected && !connssl->peer_closed) { |
| + | bool done; |
| + | (void)ossl_shutdown(cf, data, TRUE, &done); |
| } | |
| SSL_free(octx->ssl); | |
| octx->ssl = NULL; | |
| } | |
| - | return retval; |
| + | if(octx->ssl_ctx) { |
| + | SSL_CTX_free(octx->ssl_ctx); |
| + | octx->ssl_ctx = NULL; |
| + | octx->x509_store_setup = FALSE; |
| + | } |
| + | if(octx->bio_method) { |
| + | ossl_bio_cf_method_free(octx->bio_method); |
| + | octx->bio_method = NULL; |
| + | } |
| } | |
| static void ossl_session_free(void *sessionid, size_t idsize) | |
lib/vtls/rustls.c+78 -9
| @@ -48,6 +48,7 @@ struct rustls_ssl_backend_data | |
| struct rustls_connection *conn; | |
| size_t plain_out_buffered; | |
| BIT(data_in_pending); | |
| + | BIT(sent_shutdown); |
| }; | |
| /* For a given rustls_result error code, return the best-matching CURLcode. */ | |
| @@ -727,22 +728,90 @@ cr_get_internals(struct ssl_connect_data *connssl, | |
| return &backend->conn; | |
| } | |
| + | static CURLcode |
| + | cr_shutdown(struct Curl_cfilter *cf, |
| + | struct Curl_easy *data, |
| + | bool send_shutdown, bool *done) |
| + | { |
| + | struct ssl_connect_data *connssl = cf->ctx; |
| + | struct rustls_ssl_backend_data *backend = |
| + | (struct rustls_ssl_backend_data *)connssl->backend; |
| + | CURLcode result = CURLE_OK; |
| + | ssize_t nwritten, nread; |
| + | char buf[1024]; |
| + | size_t i; |
| + | |
| + | DEBUGASSERT(backend); |
| + | if(!backend->conn || connssl->shutdown) { |
| + | *done = TRUE; |
| + | goto out; |
| + | } |
| + | |
| + | connssl->io_need = CURL_SSL_IO_NEED_NONE; |
| + | *done = FALSE; |
| + | |
| + | if(!backend->sent_shutdown) { |
| + | /* do this only once */ |
| + | backend->sent_shutdown = TRUE; |
| + | if(send_shutdown) { |
| + | rustls_connection_send_close_notify(backend->conn); |
| + | } |
| + | } |
| + | |
| + | nwritten = cr_send(cf, data, NULL, 0, &result); |
| + | if(nwritten < 0) { |
| + | if(result == CURLE_AGAIN) { |
| + | connssl->io_need = CURL_SSL_IO_NEED_SEND; |
| + | result = CURLE_OK; |
| + | goto out; |
| + | } |
| + | DEBUGASSERT(result); |
| + | CURL_TRC_CF(data, cf, "shutdown send failed: %d", result); |
| + | goto out; |
| + | } |
| + | |
| + | for(i = 0; i < 10; ++i) { |
| + | nread = cr_recv(cf, data, buf, (int)sizeof(buf), &result); |
| + | if(nread <= 0) |
| + | break; |
| + | } |
| + | |
| + | if(nread > 0) { |
| + | /* still data coming in? */ |
| + | } |
| + | else if(nread == 0) { |
| + | /* We got the close notify alert and are done. */ |
| + | *done = TRUE; |
| + | } |
| + | else if(result == CURLE_AGAIN) { |
| + | connssl->io_need = CURL_SSL_IO_NEED_RECV; |
| + | result = CURLE_OK; |
| + | } |
| + | else { |
| + | DEBUGASSERT(result); |
| + | CURL_TRC_CF(data, cf, "shutdown, error: %d", result); |
| + | } |
| + | |
| + | out: |
| + | connssl->shutdown = (result || *done); |
| + | return result; |
| + | } |
| + | |
| static void | |
| cr_close(struct Curl_cfilter *cf, struct Curl_easy *data) | |
| { | |
| struct ssl_connect_data *connssl = cf->ctx; | |
| struct rustls_ssl_backend_data *backend = | |
| (struct rustls_ssl_backend_data *)connssl->backend; | |
| - | CURLcode tmperr = CURLE_OK; |
| - | ssize_t n = 0; |
| DEBUGASSERT(backend); | |
| - | if(backend->conn && !connssl->peer_closed) { |
| - | CURL_TRC_CF(data, cf, "closing connection, send notify"); |
| - | rustls_connection_send_close_notify(backend->conn); |
| - | n = cr_send(cf, data, NULL, 0, &tmperr); |
| - | if(n < 0) { |
| - | failf(data, "rustls: error sending close_notify: %d", tmperr); |
| + | if(backend->conn) { |
| + | /* Send the TLS shutdown if have not done so already and are still |
| + | * connected *and* if the peer did not already close the connection. */ |
| + | if(cf->connected && !connssl->shutdown && |
| + | cf->next && cf->next->connected && !connssl->peer_closed) { |
| + | bool done; |
| + | (void)cr_shutdown(cf, data, TRUE, &done); |
| } | |
| rustls_connection_free(backend->conn); | |
| @@ -770,7 +839,7 @@ const struct Curl_ssl Curl_ssl_rustls = { | |
| Curl_none_cleanup, /* cleanup */ | |
| cr_version, /* version */ | |
| Curl_none_check_cxn, /* check_cxn */ | |
| - | Curl_none_shutdown, /* shutdown */ |
| + | cr_shutdown, /* shutdown */ |
| cr_data_pending, /* data_pending */ | |
| Curl_none_random, /* random */ | |
| Curl_none_cert_status_request, /* cert_status_request */ | |
lib/vtls/schannel.c+37 -10
| @@ -2470,8 +2470,9 @@ static bool schannel_data_pending(struct Curl_cfilter *cf, | |
| /* shut down the SSL connection and clean up related memory. | |
| this function can be called multiple times on the same connection including | |
| if the SSL connection failed (eg connection made but failed handshake). */ | |
| - | static int schannel_shutdown(struct Curl_cfilter *cf, |
| - | struct Curl_easy *data) |
| + | static CURLcode schannel_shutdown(struct Curl_cfilter *cf, |
| + | struct Curl_easy *data, |
| + | bool send_shutdown, bool *done) |
| { | |
| /* See https://msdn.microsoft.com/en-us/library/windows/desktop/aa380138.aspx | |
| * Shutting Down an Schannel Connection | |
| @@ -2479,10 +2480,20 @@ static int schannel_shutdown(struct Curl_cfilter *cf, | |
| struct ssl_connect_data *connssl = cf->ctx; | |
| struct schannel_ssl_backend_data *backend = | |
| (struct schannel_ssl_backend_data *)connssl->backend; | |
| + | CURLcode result = CURLE_OK; |
| + | |
| + | if(connssl->shutdown) { |
| + | *done = TRUE; |
| + | return CURLE_OK; |
| + | } |
| DEBUGASSERT(data); | |
| DEBUGASSERT(backend); | |
| + | /* Not supported in schannel */ |
| + | (void)send_shutdown; |
| + | |
| + | *done = FALSE; |
| if(backend->ctxt) { | |
| infof(data, "schannel: shutting down SSL/TLS connection with %s port %d", | |
| connssl->peer.hostname, connssl->peer.port); | |
| @@ -2494,7 +2505,6 @@ static int schannel_shutdown(struct Curl_cfilter *cf, | |
| SECURITY_STATUS sspi_status; | |
| SecBuffer outbuf; | |
| SecBufferDesc outbuf_desc; | |
| - | CURLcode result; |
| DWORD dwshut = SCHANNEL_SHUTDOWN; | |
| InitSecBuffer(&Buffer, SECBUFFER_TOKEN, &dwshut, sizeof(dwshut)); | |
| @@ -2507,6 +2517,8 @@ static int schannel_shutdown(struct Curl_cfilter *cf, | |
| char buffer[STRERROR_LEN]; | |
| failf(data, "schannel: ApplyControlToken failure: %s", | |
| Curl_sspi_strerror(sspi_status, buffer, sizeof(buffer))); | |
| + | result = CURLE_SEND_ERROR; |
| + | goto out; |
| } | |
| /* setup output buffer */ | |
| @@ -2536,10 +2548,32 @@ static int schannel_shutdown(struct Curl_cfilter *cf, | |
| if((result != CURLE_OK) || (outbuf.cbBuffer != (size_t) written)) { | |
| infof(data, "schannel: failed to send close msg: %s" | |
| " (bytes written: %zd)", curl_easy_strerror(result), written); | |
| + | result = CURLE_SEND_ERROR; |
| } | |
| } | |
| } | |
| + | out: |
| + | connssl->shutdown = (result || *done); |
| + | return result; |
| + | } |
| + | |
| + | static void schannel_close(struct Curl_cfilter *cf, struct Curl_easy *data) |
| + | { |
| + | struct ssl_connect_data *connssl = cf->ctx; |
| + | struct schannel_ssl_backend_data *backend = |
| + | (struct schannel_ssl_backend_data *)connssl->backend; |
| + | |
| + | DEBUGASSERT(data); |
| + | DEBUGASSERT(backend); |
| + | |
| + | if(backend->cred && backend->ctxt && |
| + | cf->connected && !connssl->shutdown && |
| + | cf->next && cf->next->connected && !connssl->peer_closed) { |
| + | bool done; |
| + | (void)schannel_shutdown(cf, data, TRUE, &done); |
| + | } |
| + | |
| /* free SSPI Schannel API security context handle */ | |
| if(backend->ctxt) { | |
| DEBUGF(infof(data, "schannel: clear security context handle")); | |
| @@ -2569,13 +2603,6 @@ static int schannel_shutdown(struct Curl_cfilter *cf, | |
| backend->decdata_length = 0; | |
| backend->decdata_offset = 0; | |
| } | |
| - | |
| - | return CURLE_OK; |
| - | } |
| - | |
| - | static void schannel_close(struct Curl_cfilter *cf, struct Curl_easy *data) |
| - | { |
| - | schannel_shutdown(cf, data); |
| } | |
| static int schannel_init(void) | |
lib/vtls/sectransp.c+93 -64
| @@ -153,6 +153,7 @@ struct st_ssl_backend_data { | |
| SSLContextRef ssl_ctx; | |
| bool ssl_direction; /* true if writing, false if reading */ | |
| size_t ssl_write_buffered_length; | |
| + | BIT(sent_shutdown); |
| }; | |
| /* Create the list of default ciphers to use by making an intersection of the | |
| @@ -2555,6 +2556,92 @@ static CURLcode sectransp_connect(struct Curl_cfilter *cf, | |
| return CURLE_OK; | |
| } | |
| + | static ssize_t sectransp_recv(struct Curl_cfilter *cf, |
| + | struct Curl_easy *data, |
| + | char *buf, |
| + | size_t buffersize, |
| + | CURLcode *curlcode); |
| + | |
| + | static CURLcode sectransp_shutdown(struct Curl_cfilter *cf, |
| + | struct Curl_easy *data, |
| + | bool send_shutdown, bool *done) |
| + | { |
| + | struct ssl_connect_data *connssl = cf->ctx; |
| + | struct st_ssl_backend_data *backend = |
| + | (struct st_ssl_backend_data *)connssl->backend; |
| + | CURLcode result = CURLE_OK; |
| + | ssize_t nread; |
| + | char buf[1024]; |
| + | size_t i; |
| + | |
| + | DEBUGASSERT(backend); |
| + | if(!backend->ssl_ctx || connssl->shutdown) { |
| + | *done = TRUE; |
| + | goto out; |
| + | } |
| + | |
| + | connssl->io_need = CURL_SSL_IO_NEED_NONE; |
| + | *done = FALSE; |
| + | |
| + | if(send_shutdown && !backend->sent_shutdown) { |
| + | OSStatus err; |
| + | |
| + | CURL_TRC_CF(data, cf, "shutdown, send close notify"); |
| + | err = SSLClose(backend->ssl_ctx); |
| + | switch(err) { |
| + | case noErr: |
| + | backend->sent_shutdown = TRUE; |
| + | break; |
| + | case errSSLWouldBlock: |
| + | connssl->io_need = CURL_SSL_IO_NEED_SEND; |
| + | result = CURLE_OK; |
| + | goto out; |
| + | default: |
| + | CURL_TRC_CF(data, cf, "shutdown, error: %d", (int)err); |
| + | result = CURLE_SEND_ERROR; |
| + | goto out; |
| + | } |
| + | } |
| + | |
| + | for(i = 0; i < 10; ++i) { |
| + | if(!backend->sent_shutdown) { |
| + | nread = sectransp_recv(cf, data, buf, (int)sizeof(buf), &result); |
| + | } |
| + | else { |
| + | /* We would like to read the close notify from the server using |
| + | * secure transport, however SSLRead() no longer works after we |
| + | * sent the notify from our side. So, we just read from the |
| + | * underlying filter and hope it will end. */ |
| + | nread = Curl_conn_cf_recv(cf->next, data, buf, sizeof(buf), &result); |
| + | } |
| + | CURL_TRC_CF(data, cf, "shutdown read -> %zd, %d", nread, result); |
| + | if(nread <= 0) |
| + | break; |
| + | } |
| + | |
| + | if(nread > 0) { |
| + | /* still data coming in? */ |
| + | connssl->io_need = CURL_SSL_IO_NEED_RECV; |
| + | } |
| + | else if(nread == 0) { |
| + | /* We got the close notify alert and are done. */ |
| + | CURL_TRC_CF(data, cf, "shutdown done"); |
| + | *done = TRUE; |
| + | } |
| + | else if(result == CURLE_AGAIN) { |
| + | connssl->io_need = CURL_SSL_IO_NEED_RECV; |
| + | result = CURLE_OK; |
| + | } |
| + | else { |
| + | DEBUGASSERT(result); |
| + | CURL_TRC_CF(data, cf, "shutdown, error: %d", result); |
| + | } |
| + | |
| + | out: |
| + | connssl->shutdown = (result || *done); |
| + | return result; |
| + | } |
| + | |
| static void sectransp_close(struct Curl_cfilter *cf, struct Curl_easy *data) | |
| { | |
| struct ssl_connect_data *connssl = cf->ctx; | |
| @@ -2567,7 +2654,12 @@ static void sectransp_close(struct Curl_cfilter *cf, struct Curl_easy *data) | |
| if(backend->ssl_ctx) { | |
| CURL_TRC_CF(data, cf, "close"); | |
| - | (void)SSLClose(backend->ssl_ctx); |
| + | if(cf->connected && !connssl->shutdown && |
| + | cf->next && cf->next->connected && !connssl->peer_closed) { |
| + | bool done; |
| + | (void)sectransp_shutdown(cf, data, TRUE, &done); |
| + | } |
| + | |
| #if CURL_BUILD_MAC_10_8 || CURL_BUILD_IOS | |
| if(SSLCreateContext) | |
| CFRelease(backend->ssl_ctx); | |
| @@ -2582,69 +2674,6 @@ static void sectransp_close(struct Curl_cfilter *cf, struct Curl_easy *data) | |
| } | |
| } | |
| - | static int sectransp_shutdown(struct Curl_cfilter *cf, |
| - | struct Curl_easy *data) |
| - | { |
| - | struct ssl_connect_data *connssl = cf->ctx; |
| - | struct st_ssl_backend_data *backend = |
| - | (struct st_ssl_backend_data *)connssl->backend; |
| - | ssize_t nread; |
| - | int what; |
| - | int rc; |
| - | char buf[120]; |
| - | int loop = 10; /* avoid getting stuck */ |
| - | CURLcode result; |
| - | |
| - | DEBUGASSERT(backend); |
| - | |
| - | if(!backend->ssl_ctx) |
| - | return 0; |
| - | |
| - | #ifndef CURL_DISABLE_FTP |
| - | if(data->set.ftp_ccc != CURLFTPSSL_CCC_ACTIVE) |
| - | return 0; |
| - | #endif |
| - | |
| - | sectransp_close(cf, data); |
| - | |
| - | rc = 0; |
| - | |
| - | what = SOCKET_READABLE(Curl_conn_cf_get_socket(cf, data), |
| - | SSL_SHUTDOWN_TIMEOUT); |
| - | |
| - | CURL_TRC_CF(data, cf, "shutdown"); |
| - | while(loop--) { |
| - | if(what < 0) { |
| - | /* anything that gets here is fatally bad */ |
| - | failf(data, "select/poll on SSL socket, errno: %d", SOCKERRNO); |
| - | rc = -1; |
| - | break; |
| - | } |
| - | |
| - | if(!what) { /* timeout */ |
| - | failf(data, "SSL shutdown timeout"); |
| - | break; |
| - | } |
| - | |
| - | /* Something to read, let's do it and hope that it is the close |
| - | notify alert from the server. No way to SSL_Read now, so use read(). */ |
| - | |
| - | nread = Curl_conn_cf_recv(cf->next, data, buf, sizeof(buf), &result); |
| - | |
| - | if(nread < 0) { |
| - | failf(data, "read: %s", curl_easy_strerror(result)); |
| - | rc = -1; |
| - | } |
| - | |
| - | if(nread <= 0) |
| - | break; |
| - | |
| - | what = SOCKET_READABLE(Curl_conn_cf_get_socket(cf, data), 0); |
| - | } |
| - | |
| - | return rc; |
| - | } |
| - | |
| static size_t sectransp_version(char *buffer, size_t size) | |
| { | |
| return msnprintf(buffer, size, "SecureTransport"); | |
lib/vtls/vtls.c+96 -11
| @@ -68,6 +68,8 @@ | |
| #include "curl_base64.h" | |
| #include "curl_printf.h" | |
| #include "inet_pton.h" | |
| + | #include "connect.h" |
| + | #include "select.h" |
| #include "strdup.h" | |
| /* The last #include files should be: */ | |
| @@ -1168,12 +1170,18 @@ int Curl_none_init(void) | |
| void Curl_none_cleanup(void) | |
| { } | |
| - | int Curl_none_shutdown(struct Curl_cfilter *cf UNUSED_PARAM, |
| - | struct Curl_easy *data UNUSED_PARAM) |
| + | CURLcode Curl_none_shutdown(struct Curl_cfilter *cf UNUSED_PARAM, |
| + | struct Curl_easy *data UNUSED_PARAM, |
| + | bool send_shutdown UNUSED_PARAM, |
| + | bool *done) |
| { | |
| (void)data; | |
| (void)cf; | |
| - | return 0; |
| + | (void)send_shutdown; |
| + | /* Every SSL backend should have a shutdown implementation. Until we |
| + | * have implemented that, we put this fake in place. */ |
| + | *done = TRUE; |
| + | return CURLE_OK; |
| } | |
| int Curl_none_check_cxn(struct Curl_cfilter *cf, struct Curl_easy *data) | |
| @@ -1745,17 +1753,34 @@ static ssize_t ssl_cf_recv(struct Curl_cfilter *cf, | |
| return nread; | |
| } | |
| - | static void ssl_cf_adjust_pollset(struct Curl_cfilter *cf, |
| - | struct Curl_easy *data, |
| - | struct easy_pollset *ps) |
| + | static CURLcode ssl_cf_shutdown(struct Curl_cfilter *cf, |
| + | struct Curl_easy *data, |
| + | bool *done) |
| { | |
| + | struct ssl_connect_data *connssl = cf->ctx; |
| struct cf_call_data save; | |
| + | CURLcode result = CURLE_OK; |
| - | if(!cf->connected) { |
| + | *done = TRUE; |
| + | if(!connssl->shutdown) { |
| CF_DATA_SAVE(save, cf, data); | |
| - | Curl_ssl->adjust_pollset(cf, data, ps); |
| + | result = Curl_ssl->shut_down(cf, data, TRUE, done); |
| + | CURL_TRC_CF(data, cf, "cf_shutdown -> %d, done=%d", result, *done); |
| CF_DATA_RESTORE(cf, save); | |
| + | connssl->shutdown = (result || *done); |
| } | |
| + | return result; |
| + | } |
| + | |
| + | static void ssl_cf_adjust_pollset(struct Curl_cfilter *cf, |
| + | struct Curl_easy *data, |
| + | struct easy_pollset *ps) |
| + | { |
| + | struct cf_call_data save; |
| + | |
| + | CF_DATA_SAVE(save, cf, data); |
| + | Curl_ssl->adjust_pollset(cf, data, ps); |
| + | CF_DATA_RESTORE(cf, save); |
| } | |
| static CURLcode ssl_cf_cntrl(struct Curl_cfilter *cf, | |
| @@ -1845,6 +1870,7 @@ struct Curl_cftype Curl_cft_ssl = { | |
| ssl_cf_destroy, | |
| ssl_cf_connect, | |
| ssl_cf_close, | |
| + | ssl_cf_shutdown, |
| Curl_cf_def_get_host, | |
| ssl_cf_adjust_pollset, | |
| ssl_cf_data_pending, | |
| @@ -1865,6 +1891,7 @@ struct Curl_cftype Curl_cft_ssl_proxy = { | |
| ssl_cf_destroy, | |
| ssl_cf_connect, | |
| ssl_cf_close, | |
| + | ssl_cf_shutdown, |
| Curl_cf_def_get_host, | |
| ssl_cf_adjust_pollset, | |
| ssl_cf_data_pending, | |
| @@ -2015,19 +2042,77 @@ void *Curl_ssl_get_internals(struct Curl_easy *data, int sockindex, | |
| return result; | |
| } | |
| + | static CURLcode vtls_shutdown_blocking(struct Curl_cfilter *cf, |
| + | struct Curl_easy *data, |
| + | bool send_shutdown, bool *done) |
| + | { |
| + | struct ssl_connect_data *connssl = cf->ctx; |
| + | struct cf_call_data save; |
| + | CURLcode result = CURLE_OK; |
| + | timediff_t timeout_ms; |
| + | int what, loop = 10; |
| + | |
| + | if(connssl->shutdown) { |
| + | *done = TRUE; |
| + | return CURLE_OK; |
| + | } |
| + | CF_DATA_SAVE(save, cf, data); |
| + | |
| + | *done = FALSE; |
| + | while(!result && !*done && loop--) { |
| + | timeout_ms = Curl_shutdown_timeleft(cf->conn, cf->sockindex, NULL); |
| + | |
| + | if(timeout_ms < 0) { |
| + | /* no need to continue if time is already up */ |
| + | failf(data, "SSL shutdown timeout"); |
| + | return CURLE_OPERATION_TIMEDOUT; |
| + | } |
| + | |
| + | result = Curl_ssl->shut_down(cf, data, send_shutdown, done); |
| + | if(result ||*done) |
| + | goto out; |
| + | |
| + | if(connssl->io_need) { |
| + | what = Curl_conn_cf_poll(cf, data, timeout_ms); |
| + | if(what < 0) { |
| + | /* fatal error */ |
| + | failf(data, "select/poll on SSL socket, errno: %d", SOCKERRNO); |
| + | result = CURLE_RECV_ERROR; |
| + | goto out; |
| + | } |
| + | else if(0 == what) { |
| + | /* timeout */ |
| + | failf(data, "SSL shutdown timeout"); |
| + | result = CURLE_OPERATION_TIMEDOUT; |
| + | goto out; |
| + | } |
| + | /* socket is readable or writable */ |
| + | } |
| + | } |
| + | out: |
| + | CF_DATA_RESTORE(cf, save); |
| + | connssl->shutdown = (result || *done); |
| + | return result; |
| + | } |
| + | |
| CURLcode Curl_ssl_cfilter_remove(struct Curl_easy *data, | |
| - | int sockindex) |
| + | int sockindex, bool send_shutdown) |
| { | |
| struct Curl_cfilter *cf, *head; | |
| CURLcode result = CURLE_OK; | |
| - | (void)data; |
| head = data->conn? data->conn->cfilter[sockindex] : NULL; | |
| for(cf = head; cf; cf = cf->next) { | |
| if(cf->cft == &Curl_cft_ssl) { | |
| - | if(Curl_ssl->shut_down(cf, data)) |
| + | bool done; |
| + | CURL_TRC_CF(data, cf, "shutdown and remove SSL, start"); |
| + | Curl_shutdown_start(data, sockindex, NULL); |
| + | result = vtls_shutdown_blocking(cf, data, send_shutdown, &done); |
| + | Curl_shutdown_clear(data, sockindex); |
| + | if(!result && !done) /* blocking failed? */ |
| result = CURLE_SSL_SHUTDOWN_FAILED; | |
| Curl_conn_cf_discard_sub(head, cf, data, FALSE); | |
| + | CURL_TRC_CF(data, cf, "shutdown and remove SSL, done -> %d", result); |
| break; | |
| } | |
| } | |
lib/vtls/vtls.h+2 -2
| @@ -191,7 +191,7 @@ CURLcode Curl_cf_ssl_insert_after(struct Curl_cfilter *cf_at, | |
| struct Curl_easy *data); | |
| CURLcode Curl_ssl_cfilter_remove(struct Curl_easy *data, | |
| - | int sockindex); |
| + | int sockindex, bool send_shutdown); |
| #ifndef CURL_DISABLE_PROXY | |
| CURLcode Curl_cf_ssl_proxy_insert_after(struct Curl_cfilter *cf_at, | |
| @@ -250,7 +250,7 @@ extern struct Curl_cftype Curl_cft_ssl_proxy; | |
| #define Curl_ssl_get_internals(a,b,c,d) NULL | |
| #define Curl_ssl_supports(a,b) FALSE | |
| #define Curl_ssl_cfilter_add(a,b,c) CURLE_NOT_BUILT_IN | |
| - | #define Curl_ssl_cfilter_remove(a,b) CURLE_OK |
| + | #define Curl_ssl_cfilter_remove(a,b,c) CURLE_OK |
| #define Curl_ssl_cf_get_config(a,b) NULL | |
| #define Curl_ssl_cf_get_primary_config(a) NULL | |
| #endif | |
lib/vtls/vtls_int.h+7 -6
| @@ -94,6 +94,7 @@ struct ssl_connect_data { | |
| int io_need; /* TLS signals special SEND/RECV needs */ | |
| BIT(use_alpn); /* if ALPN shall be used in handshake */ | |
| BIT(peer_closed); /* peer has closed connection */ | |
| + | BIT(shutdown); /* graceful close notify finished */ |
| }; | |
| @@ -118,8 +119,8 @@ struct Curl_ssl { | |
| size_t (*version)(char *buffer, size_t size); | |
| int (*check_cxn)(struct Curl_cfilter *cf, struct Curl_easy *data); | |
| - | int (*shut_down)(struct Curl_cfilter *cf, |
| - | struct Curl_easy *data); |
| + | CURLcode (*shut_down)(struct Curl_cfilter *cf, struct Curl_easy *data, |
| + | bool send_shutdown, bool *done); |
| bool (*data_pending)(struct Curl_cfilter *cf, | |
| const struct Curl_easy *data); | |
| @@ -134,9 +135,8 @@ struct Curl_ssl { | |
| struct Curl_easy *data, | |
| bool *done); | |
| - | /* During handshake, adjust the pollset to include the socket |
| - | * for POLLOUT or POLLIN as needed. |
| - | * Mandatory. */ |
| + | /* During handshake/shutdown, adjust the pollset to include the socket |
| + | * for POLLOUT or POLLIN as needed. Mandatory. */ |
| void (*adjust_pollset)(struct Curl_cfilter *cf, struct Curl_easy *data, | |
| struct easy_pollset *ps); | |
| void *(*get_internals)(struct ssl_connect_data *connssl, CURLINFO info); | |
| @@ -166,7 +166,8 @@ extern const struct Curl_ssl *Curl_ssl; | |
| int Curl_none_init(void); | |
| void Curl_none_cleanup(void); | |
| - | int Curl_none_shutdown(struct Curl_cfilter *cf, struct Curl_easy *data); |
| + | CURLcode Curl_none_shutdown(struct Curl_cfilter *cf, struct Curl_easy *data, |
| + | bool send_shutdown, bool *done); |
| int Curl_none_check_cxn(struct Curl_cfilter *cf, struct Curl_easy *data); | |
| CURLcode Curl_none_random(struct Curl_easy *data, unsigned char *entropy, | |
| size_t length); | |
lib/vtls/wolfssl.c+98 -31
| @@ -1341,6 +1341,99 @@ static ssize_t wolfssl_send(struct Curl_cfilter *cf, | |
| return rc; | |
| } | |
| + | static CURLcode wolfssl_shutdown(struct Curl_cfilter *cf, |
| + | struct Curl_easy *data, |
| + | bool send_shutdown, bool *done) |
| + | { |
| + | struct ssl_connect_data *connssl = cf->ctx; |
| + | struct wolfssl_ctx *wctx = (struct wolfssl_ctx *)connssl->backend; |
| + | CURLcode result = CURLE_OK; |
| + | char buf[1024]; |
| + | int nread, err; |
| + | |
| + | DEBUGASSERT(wctx); |
| + | if(!wctx->handle || connssl->shutdown) { |
| + | *done = TRUE; |
| + | goto out; |
| + | } |
| + | |
| + | connssl->io_need = CURL_SSL_IO_NEED_NONE; |
| + | *done = FALSE; |
| + | if(!(wolfSSL_get_shutdown(wctx->handle) & SSL_SENT_SHUTDOWN)) { |
| + | /* We have not started the shutdown from our side yet. Check |
| + | * if the server already sent us one. */ |
| + | ERR_clear_error(); |
| + | nread = wolfSSL_read(wctx->handle, buf, (int)sizeof(buf)); |
| + | err = wolfSSL_get_error(wctx->handle, nread); |
| + | if(!nread && err == SSL_ERROR_ZERO_RETURN) { |
| + | bool input_pending; |
| + | /* Yes, it did. */ |
| + | if(!send_shutdown) { |
| + | connssl->shutdown = TRUE; |
| + | CURL_TRC_CF(data, cf, "SSL shutdown received, not sending"); |
| + | goto out; |
| + | } |
| + | else if(!cf->next->cft->is_alive(cf->next, data, &input_pending)) { |
| + | /* Server closed the connection after its closy notify. It |
| + | * seems not interested to see our close notify, so do not |
| + | * send it. We are done. */ |
| + | connssl->peer_closed = TRUE; |
| + | connssl->shutdown = TRUE; |
| + | CURL_TRC_CF(data, cf, "peer closed connection"); |
| + | goto out; |
| + | } |
| + | } |
| + | } |
| + | |
| + | if(send_shutdown && wolfSSL_shutdown(wctx->handle) == 1) { |
| + | CURL_TRC_CF(data, cf, "SSL shutdown finished"); |
| + | *done = TRUE; |
| + | goto out; |
| + | } |
| + | else { |
| + | size_t i; |
| + | /* SSL should now have started the shutdown from our side. Since it |
| + | * was not complete, we are lacking the close notify from the server. */ |
| + | for(i = 0; i < 10; ++i) { |
| + | ERR_clear_error(); |
| + | nread = wolfSSL_read(wctx->handle, buf, (int)sizeof(buf)); |
| + | if(nread <= 0) |
| + | break; |
| + | } |
| + | err = wolfSSL_get_error(wctx->handle, nread); |
| + | switch(err) { |
| + | case SSL_ERROR_ZERO_RETURN: /* no more data */ |
| + | CURL_TRC_CF(data, cf, "SSL shutdown received"); |
| + | *done = TRUE; |
| + | break; |
| + | case SSL_ERROR_NONE: /* just did not get anything */ |
| + | case SSL_ERROR_WANT_READ: |
| + | /* SSL has send its notify and now wants to read the reply |
| + | * from the server. We are not really interested in that. */ |
| + | CURL_TRC_CF(data, cf, "SSL shutdown sent, want receive"); |
| + | connssl->io_need = CURL_SSL_IO_NEED_RECV; |
| + | break; |
| + | case SSL_ERROR_WANT_WRITE: |
| + | CURL_TRC_CF(data, cf, "SSL shutdown send blocked"); |
| + | connssl->io_need = CURL_SSL_IO_NEED_SEND; |
| + | break; |
| + | default: { |
| + | char error_buffer[WOLFSSL_MAX_ERROR_SZ]; |
| + | int detail = wolfSSL_get_error(wctx->handle, err); |
| + | CURL_TRC_CF(data, cf, "SSL shutdown, error: '%s'(%d)", |
| + | wolfSSL_ERR_error_string((unsigned long)err, error_buffer), |
| + | detail); |
| + | result = CURLE_RECV_ERROR; |
| + | break; |
| + | } |
| + | } |
| + | } |
| + | |
| + | out: |
| + | connssl->shutdown = (result || *done); |
| + | return result; |
| + | } |
| + | |
| static void wolfssl_close(struct Curl_cfilter *cf, struct Curl_easy *data) | |
| { | |
| struct ssl_connect_data *connssl = cf->ctx; | |
| @@ -1352,12 +1445,11 @@ static void wolfssl_close(struct Curl_cfilter *cf, struct Curl_easy *data) | |
| DEBUGASSERT(backend); | |
| if(backend->handle) { | |
| - | char buf[32]; |
| - | /* Maybe the server has already sent a close notify alert. |
| - | Read it to avoid an RST on the TCP connection. */ |
| - | (void)wolfSSL_read(backend->handle, buf, (int)sizeof(buf)); |
| - | if(!connssl->peer_closed) |
| - | (void)wolfSSL_shutdown(backend->handle); |
| + | if(cf->connected && !connssl->shutdown && |
| + | cf->next && cf->next->connected && !connssl->peer_closed) { |
| + | bool done; |
| + | (void)wolfssl_shutdown(cf, data, TRUE, &done); |
| + | } |
| wolfSSL_free(backend->handle); | |
| backend->handle = NULL; | |
| } | |
| @@ -1468,31 +1560,6 @@ static bool wolfssl_data_pending(struct Curl_cfilter *cf, | |
| return FALSE; | |
| } | |
| - | |
| - | /* |
| - | * This function is called to shut down the SSL layer but keep the |
| - | * socket open (CCC - Clear Command Channel) |
| - | */ |
| - | static int wolfssl_shutdown(struct Curl_cfilter *cf, |
| - | struct Curl_easy *data) |
| - | { |
| - | struct ssl_connect_data *ctx = cf->ctx; |
| - | struct wolfssl_ctx *backend; |
| - | int retval = 0; |
| - | |
| - | (void)data; |
| - | DEBUGASSERT(ctx && ctx->backend); |
| - | |
| - | backend = (struct wolfssl_ctx *)ctx->backend; |
| - | if(backend->handle) { |
| - | wolfSSL_ERR_clear_error(); |
| - | wolfSSL_free(backend->handle); |
| - | backend->handle = NULL; |
| - | } |
| - | return retval; |
| - | } |
| - | |
| - | |
| static CURLcode | |
| wolfssl_connect_common(struct Curl_cfilter *cf, | |
| struct Curl_easy *data, | |
tests/http/test_31_vsftpds.py+0 -3
| @@ -38,9 +38,6 @@ log = logging.getLogger(__name__) | |
| @pytest.mark.skipif(condition=not Env.has_vsftpd(), reason=f"missing vsftpd") | |
| - | # rustsl: transfers sometimes fail with "received corrupt message of type InvalidContentType" |
| - | # sporadic, never seen when filter tracing is on |
| - | @pytest.mark.skipif(condition=Env.curl_uses_lib('rustls-ffi'), reason=f"rustls unreliable here") |
| class TestVsFTPD: | |
| SUPPORTS_SSL = True | |
tests/unit/unit2600.c+1 -0
| @@ -159,6 +159,7 @@ static struct Curl_cftype cft_test = { | |
| cf_test_destroy, | |
| cf_test_connect, | |
| Curl_cf_def_close, | |
| + | Curl_cf_def_shutdown, |
| Curl_cf_def_get_host, | |
| Curl_cf_def_adjust_pollset, | |
| Curl_cf_def_data_pending, | |