← Commit list

ad051e1cbe

Stefan Eissing

2023-11-06

SUCCESS Duration: 126s

Subject

lib: client writer, part 2, accounting + logging

Binary

Download Binary (850 KB)

Architecture & Compiler Flags

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

—

Build Log

$ git checkout -f ad051e1cbec68b2456a22661bf0800d49d085294
Previous HEAD position was ba281e5c72 tool_operate: do not mix memory models
HEAD is now at ad051e1cbe lib: client writer, part 2, accounting + logging

$ 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/curl.1
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.plist
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_ntlm_wb.lo
Removing lib/libcurl_la-curl_ntlm_wb.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_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-dict.lo
Removing lib/libcurl_la-dict.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-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_quiche.lo
Removing lib/vquic/libcurl_la-curl_quiche.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-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/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_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_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 test-driver
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:123: installing './compile'
configure.ac:424: installing './config.guess'
configure.ac:424: installing './config.sub'
configure.ac:123: installing './install-sh'
configure.ac:129: installing './missing'
docs/examples/Makefile.am: installing './depcomp'
parallel-tests: installing './test-driver'

$ 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 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.5.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... no
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 for inline... inline
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 if compiler is LCC... no
checking if compiler is SGI MIPSpro C... no
checking if compiler is SGI MIPS C... no
checking if compiler is SunPro C... no
checking if compiler is Tiny C... 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 for windows.h... no
checking whether build target is a native Windows one... no
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 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 for windows.h... (cached) no
checking for winsock2.h... (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 library containing psl_builtin... -lpsl
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 pkg-config... (cached) /usr/bin/pkg-config
checking for fish options with pkg-config... 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 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 sys/types.h... (cached) yes
checking for poll.h... (cached) yes
checking for sys/poll.h... (cached) yes
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 for windows.h... (cached) no
checking for winsock2.h... (cached) no
checking for ws2tcpip.h... (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 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 deeper for _fseeki64... but still no
checking for arc4random... no
checking deeper for arc4random... but still no
checking for fchmod... yes
checking for fnmatch... yes
checking for fseeko... yes
checking for geteuid... yes
checking for getpass_r... no
checking deeper for getpass_r... but still 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 deeper for mach_absolute_time... but still no
checking for pipe... yes
checking for sched_yield... yes
checking for sendmsg... yes
checking for setlocale... yes
checking for setmode... no
checking deeper for setmode... but still 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 for perl... /usr/bin/perl
checking for gnroff... no
checking for nroff... /usr/bin/nroff
checking how to use *nroff to get plain text from man pages... -man
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 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 NTLM delegation to winbind's helper... no
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 lib/libcurl.plist
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.5.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 libcurl: Shared=no, Static=yes
Built-in manual: enabled
--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, --with-hyper)
HTTP3: no (--with-ngtcp2 --with-nghttp3, --with-quiche, --with-msh3)
ECH: no (--enable-ech)
WebSockets: no (--enable-websockets)
Protocols: DICT FILE FTP GOPHER HTTP IMAP MQTT POP3 RTSP SMTP TELNET TFTP
Features: AsynchDNS IPv6 Largefile PSL UnixSockets alt-svc libz threadsafe

configure: WARNING: unrecognized options: --disable-docs
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
configure: WARNING: unrecognized options: --disable-docs

$ 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-amigaos.lo
CC libcurl_la-asyn-ares.lo
CC libcurl_la-altsvc.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_ntlm_wb.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_sspi.lo
CC libcurl_la-curl_threads.lo
CC libcurl_la-curl_trc.lo
CC libcurl_la-dict.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_digest.lo
CC libcurl_la-http_chunks.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-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-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_quiche.lo
CC vquic/libcurl_la-vquic.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 src
make[1]: Entering directory '/root/asi_db/builds/curl/_worktrees/w0/src'
Making all in ../docs
make[2]: Entering directory '/root/asi_db/builds/curl/_worktrees/w0/docs'
Making all in .
make[3]: Entering directory '/root/asi_db/builds/curl/_worktrees/w0/docs'
if test "..x" != "..x" -a -e "./curl.1"; then \
/usr/bin/install -c -m 644 "./curl.1" /root/asi_db/builds/curl/_worktrees/w0/docs/curl.1 \
&& touch -r "./curl.1" /root/asi_db/builds/curl/_worktrees/w0/docs/curl.1; fi
cd cmdline-opts && make
make[4]: Entering directory '/root/asi_db/builds/curl/_worktrees/w0/docs/cmdline-opts'
GENERATE ../../docs/curl.1
make[4]: Leaving directory '/root/asi_db/builds/curl/_worktrees/w0/docs/cmdline-opts'
make[3]: Leaving directory '/root/asi_db/builds/curl/_worktrees/w0/docs'
Making all in cmdline-opts
make[3]: Entering directory '/root/asi_db/builds/curl/_worktrees/w0/docs/cmdline-opts'
make[3]: Nothing to be done for 'all'.
make[3]: Leaving directory '/root/asi_db/builds/curl/_worktrees/w0/docs/cmdline-opts'
make[2]: Leaving directory '/root/asi_db/builds/curl/_worktrees/w0/docs'
make[2]: Entering directory '/root/asi_db/builds/curl/_worktrees/w0/src'
CC slist_wc.o
CC tool_bname.o
CC tool_binmode.o
CC tool_cb_dbg.o
CC tool_cb_hdr.o
CC tool_cb_prg.o
CC tool_cb_rea.o
CC tool_cb_see.o
CC tool_cb_wrt.o
CC tool_cfgable.o
CC tool_dirhie.o
CC tool_doswin.o
CC tool_easysrc.o
CC tool_filetime.o
CC tool_findfile.o
CC tool_formparse.o
CC tool_getparam.o
CC tool_getpass.o
CC tool_help.o
CC tool_helpers.o
HUGE tool_hugehelp.c
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'
make[1]: Entering directory '/root/asi_db/builds/curl/_worktrees/w0'
make[1]: Nothing to be done for 'all-am'.
make[1]: Leaving directory '/root/asi_db/builds/curl/_worktrees/w0'

Commit Diff GitHub →

lib/c-hyper.c+18 -30

@@ -172,17 +172,15 @@ static int hyper_each_header(void *userdata,

	Curl_debug(data, CURLINFO_HEADER_IN, headp, len);

-	if(!data->state.hconnect \|\| !data->set.suppress_connect_headers) {
-	writetype = CLIENTWRITE_HEADER;
-	if(data->state.hconnect)
-	writetype \|= CLIENTWRITE_CONNECT;
-	if(data->req.httpcode/100 == 1)
-	writetype \|= CLIENTWRITE_1XX;
-	result = Curl_client_write(data, writetype, headp, len);
-	if(result) {
-	data->state.hresult = CURLE_ABORTED_BY_CALLBACK;
-	return HYPER_ITER_BREAK;
-	}
+	writetype = CLIENTWRITE_HEADER;
+	if(data->state.hconnect)
+	writetype \|= CLIENTWRITE_CONNECT;
+	if(data->req.httpcode/100 == 1)
+	writetype \|= CLIENTWRITE_1XX;
+	result = Curl_client_write(data, writetype, headp, len);
+	if(result) {
+	data->state.hresult = CURLE_ABORTED_BY_CALLBACK;
+	return HYPER_ITER_BREAK;
	}

	result = Curl_bump_headersize(data, len, FALSE);
@@ -201,7 +199,7 @@ static int hyper_body_chunk(void userdata, const hyper_buf chunk)
	struct SingleRequest *k = &data->req;
	CURLcode result = CURLE_OK;

-	if(0 == k->bodywrites++) {
+	if(0 == k->bodywrites) {
	bool done = FALSE;
	#if defined(USE_NTLM)
	struct connectdata *conn = data->conn;
@@ -241,11 +239,6 @@ static int hyper_body_chunk(void userdata, const hyper_buf chunk)
	return HYPER_ITER_BREAK;
	}
	}
-	if(k->ignorebody)
-	return HYPER_ITER_CONTINUE;
-	if(0 == len)
-	return HYPER_ITER_CONTINUE;
-	Curl_debug(data, CURLINFO_DATA_IN, buf, len);
	result = Curl_client_write(data, CLIENTWRITE_BODY, buf, len);

	if(result) {
@@ -253,12 +246,6 @@ static int hyper_body_chunk(void userdata, const hyper_buf chunk)
	return HYPER_ITER_BREAK;
	}

-	data->req.bytecount += len;
-	result = Curl_pgrsSetDownloadCounter(data, data->req.bytecount);
-	if(result) {
-	data->state.hresult = result;
-	return HYPER_ITER_BREAK;
-	}
	return HYPER_ITER_CONTINUE;
	}

@@ -310,13 +297,14 @@ static CURLcode status_line(struct Curl_easy *data,
	Curl_debug(data, CURLINFO_HEADER_IN, Curl_dyn_ptr(&data->state.headerb),
	len);

-	if(!data->state.hconnect \|\| !data->set.suppress_connect_headers) {
-	writetype = CLIENTWRITE_HEADER\|CLIENTWRITE_STATUS;
-	result = Curl_client_write(data, writetype,
-	Curl_dyn_ptr(&data->state.headerb), len);
-	if(result)
-	return result;
-	}
+	writetype = CLIENTWRITE_HEADER\|CLIENTWRITE_STATUS;
+	if(data->state.hconnect)
+	writetype \|= CLIENTWRITE_CONNECT;
+	result = Curl_client_write(data, writetype,
+	Curl_dyn_ptr(&data->state.headerb), len);
+	if(result)
+	return result;
+
	result = Curl_bump_headersize(data, len, FALSE);
	return result;
	}

lib/cf-h1-proxy.c+7 -10

@@ -374,7 +374,7 @@ static CURLcode recv_CONNECT_resp(struct Curl_cfilter *cf,
	curl_socket_t tunnelsocket = Curl_conn_cf_get_socket(cf, data);
	char *linep;
	size_t perline;
-	int error;
+	int error, writetype;

	#define SELECT_OK 0
	#define SELECT_ERROR 1
@@ -467,15 +467,12 @@ static CURLcode recv_CONNECT_resp(struct Curl_cfilter *cf,
	/* output debug if that is requested */
	Curl_debug(data, CURLINFO_HEADER_IN, linep, perline);

-	if(!data->set.suppress_connect_headers) {
-	/* send the header to the callback */
-	int writetype = CLIENTWRITE_HEADER \| CLIENTWRITE_CONNECT \|
-	(ts->headerlines == 1 ? CLIENTWRITE_STATUS : 0);
-
-	result = Curl_client_write(data, writetype, linep, perline);
-	if(result)
-	return result;
-	}
+	/* send the header to the callback */
+	writetype = CLIENTWRITE_HEADER \| CLIENTWRITE_CONNECT \|
+	(ts->headerlines == 1 ? CLIENTWRITE_STATUS : 0);
+	result = Curl_client_write(data, writetype, linep, perline);
+	if(result)
+	return result;

	result = Curl_bump_headersize(data, perline, TRUE);
	if(result)

lib/content_encoding.c+112 -130

@@ -63,6 +63,9 @@

	#ifndef CURL_DISABLE_HTTP

+	/* allow no more than 5 "chained" compression steps */
+	#define MAX_ENCODE_STACK 5
+
	#define DSIZ CURL_MAX_WRITE_SIZE /* buffer size for decompressed data */


@@ -95,7 +98,7 @@ typedef enum {

	/* Deflate and gzip writer. */
	struct zlib_writer {
-	struct contenc_writer super;
+	struct Curl_cwriter super;
	zlibInitState zlib_init; /* zlib init state */
	uInt trailerlen; /* Remaining trailer byte count. */
	z_stream z; /* State structure for zlib. */
@@ -171,7 +174,7 @@ static CURLcode process_trailer(struct Curl_easy *data,
	}

	static CURLcode inflate_stream(struct Curl_easy *data,
-	struct contenc_writer *writer,
+	struct Curl_cwriter *writer, int type,
	zlibInitState started)
	{
	struct zlib_writer zp = (struct zlib_writer ) writer;
@@ -196,7 +199,7 @@ static CURLcode inflate_stream(struct Curl_easy *data,
	return exit_zlib(data, z, &zp->zlib_init, CURLE_OUT_OF_MEMORY);

	/* because the buffer size is fixed, iteratively decompress and transfer to
-	the client via downstream_write function. */
+	the client via next_write function. */
	while(!done) {
	int status; /* zlib status */
	done = TRUE;
@@ -217,7 +220,7 @@ static CURLcode inflate_stream(struct Curl_easy *data,
	if(z->avail_out != DSIZ) {
	if(status == Z_OK \|\| status == Z_STREAM_END) {
	zp->zlib_init = started; /* Data started. */
-	result = Curl_unencode_write(data, writer->downstream, decomp,
+	result = Curl_cwriter_write(data, writer->next, type, decomp,
	DSIZ - z->avail_out);
	if(result) {
	exit_zlib(data, z, &zp->zlib_init, result);
@@ -274,8 +277,8 @@ static CURLcode inflate_stream(struct Curl_easy *data,


	/* Deflate handler. */
-	static CURLcode deflate_init_writer(struct Curl_easy *data,
-	struct contenc_writer *writer)
+	static CURLcode deflate_do_init(struct Curl_easy *data,
+	struct Curl_cwriter *writer)
	{
	struct zlib_writer zp = (struct zlib_writer ) writer;
	z_stream z = &zp->z; / zlib state structure */
@@ -290,13 +293,16 @@ static CURLcode deflate_init_writer(struct Curl_easy *data,
	return CURLE_OK;
	}

-	static CURLcode deflate_unencode_write(struct Curl_easy *data,
-	struct contenc_writer *writer,
+	static CURLcode deflate_do_write(struct Curl_easy *data,
+	struct Curl_cwriter *writer, int type,
	const char *buf, size_t nbytes)
	{
	struct zlib_writer zp = (struct zlib_writer ) writer;
	z_stream z = &zp->z; / zlib state structure */

+	if(!(type & CLIENTWRITE_BODY))
+	return Curl_cwriter_write(data, writer->next, type, buf, nbytes);
+
	/* Set the compressed input when this function is called */
	z->next_in = (Bytef *) buf;
	z->avail_in = (uInt) nbytes;
@@ -305,11 +311,11 @@ static CURLcode deflate_unencode_write(struct Curl_easy *data,
	return process_trailer(data, zp);

	/* Now uncompress the data */
-	return inflate_stream(data, writer, ZLIB_INFLATING);
+	return inflate_stream(data, writer, type, ZLIB_INFLATING);
	}

-	static void deflate_close_writer(struct Curl_easy *data,
-	struct contenc_writer *writer)
+	static void deflate_do_close(struct Curl_easy *data,
+	struct Curl_cwriter *writer)
	{
	struct zlib_writer zp = (struct zlib_writer ) writer;
	z_stream z = &zp->z; / zlib state structure */
@@ -317,19 +323,19 @@ static void deflate_close_writer(struct Curl_easy *data,
	exit_zlib(data, z, &zp->zlib_init, CURLE_OK);
	}

-	static const struct content_encoding deflate_encoding = {
+	static const struct Curl_cwtype deflate_encoding = {
	"deflate",
	NULL,
-	deflate_init_writer,
-	deflate_unencode_write,
-	deflate_close_writer,
+	deflate_do_init,
+	deflate_do_write,
+	deflate_do_close,
	sizeof(struct zlib_writer)
	};


	/* Gzip handler. */
-	static CURLcode gzip_init_writer(struct Curl_easy *data,
-	struct contenc_writer *writer)
+	static CURLcode gzip_do_init(struct Curl_easy *data,
+	struct Curl_cwriter *writer)
	{
	struct zlib_writer zp = (struct zlib_writer ) writer;
	z_stream z = &zp->z; / zlib state structure */
@@ -441,19 +447,22 @@ static enum {
	}
	#endif

-	static CURLcode gzip_unencode_write(struct Curl_easy *data,
-	struct contenc_writer *writer,
+	static CURLcode gzip_do_write(struct Curl_easy *data,
+	struct Curl_cwriter *writer, int type,
	const char *buf, size_t nbytes)
	{
	struct zlib_writer zp = (struct zlib_writer ) writer;
	z_stream z = &zp->z; / zlib state structure */

+	if(!(type & CLIENTWRITE_BODY))
+	return Curl_cwriter_write(data, writer->next, type, buf, nbytes);
+
	if(zp->zlib_init == ZLIB_INIT_GZIP) {
	/* Let zlib handle the gzip decompression entirely */
	z->next_in = (Bytef *) buf;
	z->avail_in = (uInt) nbytes;
	/* Now uncompress the data */
-	return inflate_stream(data, writer, ZLIB_INIT_GZIP);
+	return inflate_stream(data, writer, type, ZLIB_INIT_GZIP);
	}

	#ifndef OLD_ZLIB_SUPPORT
@@ -565,12 +574,12 @@ static CURLcode gzip_unencode_write(struct Curl_easy *data,
	}

	/* We've parsed the header, now uncompress the data */
-	return inflate_stream(data, writer, ZLIB_GZIP_INFLATING);
+	return inflate_stream(data, writer, type, ZLIB_GZIP_INFLATING);
	#endif
	}

-	static void gzip_close_writer(struct Curl_easy *data,
-	struct contenc_writer *writer)
+	static void gzip_do_close(struct Curl_easy *data,
+	struct Curl_cwriter *writer)
	{
	struct zlib_writer zp = (struct zlib_writer ) writer;
	z_stream z = &zp->z; / zlib state structure */
@@ -578,12 +587,12 @@ static void gzip_close_writer(struct Curl_easy *data,
	exit_zlib(data, z, &zp->zlib_init, CURLE_OK);
	}

-	static const struct content_encoding gzip_encoding = {
+	static const struct Curl_cwtype gzip_encoding = {
	"gzip",
	"x-gzip",
-	gzip_init_writer,
-	gzip_unencode_write,
-	gzip_close_writer,
+	gzip_do_init,
+	gzip_do_write,
+	gzip_do_close,
	sizeof(struct zlib_writer)
	};

@@ -593,7 +602,7 @@ static const struct content_encoding gzip_encoding = {
	#ifdef HAVE_BROTLI
	/* Brotli writer. */
	struct brotli_writer {
-	struct contenc_writer super;
+	struct Curl_cwriter super;
	BrotliDecoderState br; / State structure for brotli. */
	};

@@ -635,8 +644,8 @@ static CURLcode brotli_map_error(BrotliDecoderErrorCode be)
	return CURLE_WRITE_ERROR;
	}

-	static CURLcode brotli_init_writer(struct Curl_easy *data,
-	struct contenc_writer *writer)
+	static CURLcode brotli_do_init(struct Curl_easy *data,
+	struct Curl_cwriter *writer)
	{
	struct brotli_writer bp = (struct brotli_writer ) writer;
	(void) data;
@@ -645,8 +654,8 @@ static CURLcode brotli_init_writer(struct Curl_easy *data,
	return bp->br? CURLE_OK: CURLE_OUT_OF_MEMORY;
	}

-	static CURLcode brotli_unencode_write(struct Curl_easy *data,
-	struct contenc_writer *writer,
+	static CURLcode brotli_do_write(struct Curl_easy *data,
+	struct Curl_cwriter *writer, int type,
	const char *buf, size_t nbytes)
	{
	struct brotli_writer bp = (struct brotli_writer ) writer;
@@ -657,6 +666,9 @@ static CURLcode brotli_unencode_write(struct Curl_easy *data,
	CURLcode result = CURLE_OK;
	BrotliDecoderResult r = BROTLI_DECODER_RESULT_NEEDS_MORE_OUTPUT;

+	if(!(type & CLIENTWRITE_BODY))
+	return Curl_cwriter_write(data, writer->next, type, buf, nbytes);
+
	if(!bp->br)
	return CURLE_WRITE_ERROR; /* Stream already ended. */

@@ -670,7 +682,7 @@ static CURLcode brotli_unencode_write(struct Curl_easy *data,
	dstleft = DSIZ;
	r = BrotliDecoderDecompressStream(bp->br,
	&nbytes, &src, &dstleft, &dst, NULL);
-	result = Curl_unencode_write(data, writer->downstream,
+	result = Curl_cwriter_write(data, writer->next, type,
	decomp, DSIZ - dstleft);
	if(result)
	break;
@@ -693,8 +705,8 @@ static CURLcode brotli_unencode_write(struct Curl_easy *data,
	return result;
	}

-	static void brotli_close_writer(struct Curl_easy *data,
-	struct contenc_writer *writer)
+	static void brotli_do_close(struct Curl_easy *data,
+	struct Curl_cwriter *writer)
	{
	struct brotli_writer bp = (struct brotli_writer ) writer;

@@ -706,12 +718,12 @@ static void brotli_close_writer(struct Curl_easy *data,
	}
	}

-	static const struct content_encoding brotli_encoding = {
+	static const struct Curl_cwtype brotli_encoding = {
	"br",
	NULL,
-	brotli_init_writer,
-	brotli_unencode_write,
-	brotli_close_writer,
+	brotli_do_init,
+	brotli_do_write,
+	brotli_do_close,
	sizeof(struct brotli_writer)
	};
	#endif
@@ -720,13 +732,13 @@ static const struct content_encoding brotli_encoding = {
	#ifdef HAVE_ZSTD
	/* Zstd writer. */
	struct zstd_writer {
-	struct contenc_writer super;
+	struct Curl_cwriter super;
	ZSTD_DStream zds; / State structure for zstd. */
	void *decomp;
	};

-	static CURLcode zstd_init_writer(struct Curl_easy *data,
-	struct contenc_writer *writer)
+	static CURLcode zstd_do_init(struct Curl_easy *data,
+	struct Curl_cwriter *writer)
	{
	struct zstd_writer zp = (struct zstd_writer ) writer;

@@ -737,8 +749,8 @@ static CURLcode zstd_init_writer(struct Curl_easy *data,
	return zp->zds ? CURLE_OK : CURLE_OUT_OF_MEMORY;
	}

-	static CURLcode zstd_unencode_write(struct Curl_easy *data,
-	struct contenc_writer *writer,
+	static CURLcode zstd_do_write(struct Curl_easy *data,
+	struct Curl_cwriter *writer, int type,
	const char *buf, size_t nbytes)
	{
	CURLcode result = CURLE_OK;
@@ -747,6 +759,9 @@ static CURLcode zstd_unencode_write(struct Curl_easy *data,
	ZSTD_outBuffer out;
	size_t errorCode;

+	if(!(type & CLIENTWRITE_BODY))
+	return Curl_cwriter_write(data, writer->next, type, buf, nbytes);
+
	if(!zp->decomp) {
	zp->decomp = malloc(DSIZ);
	if(!zp->decomp)
@@ -766,7 +781,7 @@ static CURLcode zstd_unencode_write(struct Curl_easy *data,
	return CURLE_BAD_CONTENT_ENCODING;
	}
	if(out.pos > 0) {
-	result = Curl_unencode_write(data, writer->downstream,
+	result = Curl_cwriter_write(data, writer->next, type,
	zp->decomp, out.pos);
	if(result)
	break;
@@ -778,8 +793,8 @@ static CURLcode zstd_unencode_write(struct Curl_easy *data,
	return result;
	}

-	static void zstd_close_writer(struct Curl_easy *data,
-	struct contenc_writer *writer)
+	static void zstd_do_close(struct Curl_easy *data,
+	struct Curl_cwriter *writer)
	{
	struct zstd_writer zp = (struct zstd_writer ) writer;

@@ -795,52 +810,30 @@ static void zstd_close_writer(struct Curl_easy *data,
	}
	}

-	static const struct content_encoding zstd_encoding = {
+	static const struct Curl_cwtype zstd_encoding = {
	"zstd",
	NULL,
-	zstd_init_writer,
-	zstd_unencode_write,
-	zstd_close_writer,
+	zstd_do_init,
+	zstd_do_write,
+	zstd_do_close,
	sizeof(struct zstd_writer)
	};
	#endif


	/* Identity handler. */
-	static CURLcode identity_init_writer(struct Curl_easy *data,
-	struct contenc_writer *writer)
-	{
-	(void)data;
-	(void)writer;
-	return CURLE_OK;
-	}
-
-	static CURLcode identity_unencode_write(struct Curl_easy *data,
-	struct contenc_writer *writer,
-	const char *buf, size_t nbytes)
-	{
-	return Curl_unencode_write(data, writer->downstream, buf, nbytes);
-	}
-
-	static void identity_close_writer(struct Curl_easy *data,
-	struct contenc_writer *writer)
-	{
-	(void) data;
-	(void) writer;
-	}
-
-	static const struct content_encoding identity_encoding = {
+	static const struct Curl_cwtype identity_encoding = {
	"identity",
	"none",
-	identity_init_writer,
-	identity_unencode_write,
-	identity_close_writer,
-	sizeof(struct contenc_writer)
+	Curl_cwriter_def_init,
+	Curl_cwriter_def_write,
+	Curl_cwriter_def_close,
+	sizeof(struct Curl_cwriter)
	};


	/* supported content encodings table. */
-	static const struct content_encoding * const encodings[] = {
+	static const struct Curl_cwtype * const encodings[] = {
	&identity_encoding,
	#ifdef HAVE_LIBZ
	&deflate_encoding,
@@ -860,8 +853,8 @@ static const struct content_encoding * const encodings[] = {
	char *Curl_all_content_encodings(void)
	{
	size_t len = 0;
-	const struct content_encoding * const *cep;
-	const struct content_encoding *ce;
+	const struct Curl_cwtype * const *cep;
+	const struct Curl_cwtype *ce;
	char *ace;

	for(cep = encodings; *cep; cep++) {
@@ -893,16 +886,16 @@ char *Curl_all_content_encodings(void)


	/* Deferred error dummy writer. */
-	static CURLcode error_init_writer(struct Curl_easy *data,
-	struct contenc_writer *writer)
+	static CURLcode error_do_init(struct Curl_easy *data,
+	struct Curl_cwriter *writer)
	{
	(void)data;
	(void)writer;
	return CURLE_OK;
	}

-	static CURLcode error_unencode_write(struct Curl_easy *data,
-	struct contenc_writer *writer,
+	static CURLcode error_do_write(struct Curl_easy *data,
+	struct Curl_cwriter *writer, int type,
	const char *buf, size_t nbytes)
	{
	char *all = Curl_all_content_encodings();
@@ -911,6 +904,9 @@ static CURLcode error_unencode_write(struct Curl_easy *data,
	(void) buf;
	(void) nbytes;

+	if(!(type & CLIENTWRITE_BODY))
+	return Curl_cwriter_write(data, writer->next, type, buf, nbytes);
+
	if(!all)
	return CURLE_OUT_OF_MEMORY;
	failf(data, "Unrecognized content encoding type. "
@@ -919,43 +915,30 @@ static CURLcode error_unencode_write(struct Curl_easy *data,
	return CURLE_BAD_CONTENT_ENCODING;
	}

-	static void error_close_writer(struct Curl_easy *data,
-	struct contenc_writer *writer)
+	static void error_do_close(struct Curl_easy *data,
+	struct Curl_cwriter *writer)
	{
	(void) data;
	(void) writer;
	}

-	static const struct content_encoding error_encoding = {
-	NULL,
+	static const struct Curl_cwtype error_writer = {
+	"ce-error",
	NULL,
-	error_init_writer,
-	error_unencode_write,
-	error_close_writer,
-	sizeof(struct contenc_writer)
+	error_do_init,
+	error_do_write,
+	error_do_close,
+	sizeof(struct Curl_cwriter)
	};

-	/* Write data using an unencoding writer stack. "nbytes" is not
-	allowed to be 0. */
-	CURLcode Curl_unencode_write(struct Curl_easy *data,
-	struct contenc_writer *writer,
-	const char *buf, size_t nbytes)
-	{
-	if(!nbytes)
-	return CURLE_OK;
-	if(!writer)
-	return CURLE_WRITE_ERROR;
-	return writer->handler->unencode_write(data, writer, buf, nbytes);
-	}
-
	/* Find the content encoding by name. */
-	static const struct content_encoding find_encoding(const char name,
+	static const struct Curl_cwtype find_encoding(const char name,
	size_t len)
	{
-	const struct content_encoding * const *cep;
+	const struct Curl_cwtype * const *cep;

	for(cep = encodings; *cep; cep++) {
-	const struct content_encoding ce = cep;
+	const struct Curl_cwtype ce = cep;
	if((strncasecompare(name, ce->name, len) && !ce->name[len]) \|\|
	(ce->alias && strncasecompare(name, ce->alias, len) && !ce->alias[len]))
	return ce;
@@ -969,7 +952,8 @@ CURLcode Curl_build_unencoding_stack(struct Curl_easy *data,
	const char *enclist, int is_transfer)
	{
	struct SingleRequest *k = &data->req;
-	unsigned int order = is_transfer? 2: 1;
+	Curl_cwriter_phase phase = is_transfer?
+	CURL_CW_TRANSFER_DECODE:CURL_CW_CONTENT_DECODE;
	CURLcode result;

	do {
@@ -992,23 +976,32 @@ CURLcode Curl_build_unencoding_stack(struct Curl_easy *data,
	Curl_httpchunk_init(data); /* init our chunky engine. */
	}
	else if(namelen) {
-	const struct content_encoding *encoding;
-	struct contenc_writer *writer;
-	if(is_transfer && !data->set.http_transfer_encoding)
+	const struct Curl_cwtype *cwt;
+	struct Curl_cwriter *writer;
+
+	if((is_transfer && !data->set.http_transfer_encoding) \|\|
+	(!is_transfer && data->set.http_ce_skip)) {
	/* not requested, ignore */
	return CURLE_OK;
+	}
+
+	if(Curl_cwriter_count(data, phase) + 1 >= MAX_ENCODE_STACK) {
+	failf(data, "Reject response due to more than %u content encodings",
+	MAX_ENCODE_STACK);
+	return CURLE_BAD_CONTENT_ENCODING;
+	}

-	encoding = find_encoding(name, namelen);
-	if(!encoding)
-	encoding = &error_encoding; /* Defer error at stack use. */
+	cwt = find_encoding(name, namelen);
+	if(!cwt)
+	cwt = &error_writer; /* Defer error at use. */

-	result = Curl_client_create_writer(&writer, data, encoding, order);
+	result = Curl_cwriter_create(&writer, data, cwt, phase);
	if(result)
	return result;

-	result = Curl_client_add_writer(data, writer);
+	result = Curl_cwriter_add(data, writer);
	if(result) {
-	Curl_client_free_writer(data, writer);
+	Curl_cwriter_free(data, writer);
	return result;
	}
	}
@@ -1028,17 +1021,6 @@ CURLcode Curl_build_unencoding_stack(struct Curl_easy *data,
	return CURLE_NOT_BUILT_IN;
	}

-	CURLcode Curl_unencode_write(struct Curl_easy *data,
-	struct contenc_writer *writer,
-	const char *buf, size_t nbytes)
-	{
-	(void) data;
-	(void) writer;
-	(void) buf;
-	(void) nbytes;
-	return CURLE_NOT_BUILT_IN;
-	}
-
	char *Curl_all_content_encodings(void)
	{
	return strdup(CONTENT_ENCODING_DEFAULT); /* Satisfy caller. */

lib/content_encoding.h+1 -6

@@ -25,15 +25,10 @@
	***************************************************************************/
	#include "curl_setup.h"

-	struct contenc_writer;
+	struct Curl_cwriter;

	char *Curl_all_content_encodings(void);

	CURLcode Curl_build_unencoding_stack(struct Curl_easy *data,
	const char *enclist, int is_transfer);
-	CURLcode Curl_unencode_write(struct Curl_easy *data,
-	struct contenc_writer *writer,
-	const char *buf, size_t nbytes);
-	void Curl_unencode_cleanup(struct Curl_easy *data);
-
	#endif /* HEADER_CURL_CONTENT_ENCODING_H */

lib/file.c+0 -6

@@ -414,7 +414,6 @@ static CURLcode file_do(struct Curl_easy data, bool done)
	bool size_known;
	bool fstated = FALSE;
	char *buf = data->state.buffer;
-	curl_off_t bytecount = 0;
	int fd;
	struct FILEPROTO *file;

@@ -563,7 +562,6 @@ static CURLcode file_do(struct Curl_easy data, bool done)
	if(nread <= 0 \|\| (size_known && (expected_size == 0)))
	break;

-	bytecount += nread;
	if(size_known)
	expected_size -= nread;

@@ -571,10 +569,6 @@ static CURLcode file_do(struct Curl_easy data, bool done)
	if(result)
	return result;

-	result = Curl_pgrsSetDownloadCounter(data, bytecount);
-	if(result)
-	return result;
-
	if(Curl_pgrsUpdate(data))
	result = CURLE_ABORTED_BY_CALLBACK;
	else

lib/imap.c+0 -2

@@ -1194,8 +1194,6 @@ static CURLcode imap_state_fetch_resp(struct Curl_easy *data,
	if(result)
	return result;

-	data->req.bytecount += chunk;
-
	infof(data, "Written %zu bytes, %" CURL_FORMAT_CURL_OFF_TU
	" bytes are left for transfer", chunk, size - chunk);

lib/ldap.c+1 -15

@@ -313,7 +313,6 @@ static CURLcode ldap_do(struct Curl_easy data, bool done)
	int ldap_ssl = 0;
	char *val_b64 = NULL;
	size_t val_b64_sz = 0;
-	curl_off_t dlsize = 0;
	#ifdef LDAP_OPT_NETWORK_TIMEOUT
	struct timeval ldap_timeout = {10, 0}; /* 10 sec connection/search timeout */
	#endif
@@ -535,6 +534,7 @@ static CURLcode ldap_do(struct Curl_easy data, bool done)
	goto quit;
	}

+	Curl_pgrsSetDownloadCounter(data, 0);
	rc = ldap_search_s(server, ludp->lud_dn, ludp->lud_scope,
	ludp->lud_filter, ludp->lud_attrs, 0, &ldapmsg);

@@ -596,8 +596,6 @@ static CURLcode ldap_do(struct Curl_easy data, bool done)
	goto quit;
	}

-	dlsize += name_len + 5;
-
	FREE_ON_WINLDAP(name);
	ldap_memfree(dn);
	}
@@ -659,8 +657,6 @@ static CURLcode ldap_do(struct Curl_easy data, bool done)
	goto quit;
	}

-	dlsize += attr_len + 3;
-
	if((attr_len > 7) &&
	(strcmp(";binary", attr + (attr_len - 7)) == 0)) {
	/* Binary attribute, encode to base64. */
@@ -689,8 +685,6 @@ static CURLcode ldap_do(struct Curl_easy data, bool done)

	goto quit;
	}
-
-	dlsize += val_b64_sz;
	}
	}
	else {
@@ -705,8 +699,6 @@ static CURLcode ldap_do(struct Curl_easy data, bool done)

	goto quit;
	}
-
-	dlsize += vals[i]->bv_len;
	}

	result = Curl_client_write(data, CLIENTWRITE_BODY, (char *)"\n", 1);
@@ -719,8 +711,6 @@ static CURLcode ldap_do(struct Curl_easy data, bool done)

	goto quit;
	}
-
-	dlsize++;
	}

	/* Free memory used to store values */
@@ -734,10 +724,6 @@ static CURLcode ldap_do(struct Curl_easy data, bool done)
	result = Curl_client_write(data, CLIENTWRITE_BODY, (char *)"\n", 1);
	if(result)
	goto quit;
-	dlsize++;
-	result = Curl_pgrsSetDownloadCounter(data, dlsize);
-	if(result)
-	goto quit;
	}

	if(ber)

lib/mqtt.c+0 -6

@@ -677,7 +677,6 @@ MQTT_SUBACK_COMING:
	/* FALLTHROUGH */
	case MQTT_PUB_REMAIN: {
	/* read rest of packet, but no more. Cap to buffer size */
-	struct SingleRequest *k = &data->req;
	size_t rest = mq->npacket;
	if(rest > (size_t)data->set.buffer_size)
	rest = (size_t)data->set.buffer_size;
@@ -693,13 +692,8 @@ MQTT_SUBACK_COMING:
	result = CURLE_PARTIAL_FILE;
	goto end;
	}
-	Curl_debug(data, CURLINFO_DATA_IN, (char *)pkt, (size_t)nread);

	mq->npacket -= nread;
-	k->bytecount += nread;
-	result = Curl_pgrsSetDownloadCounter(data, k->bytecount);
-	if(result)
-	goto end;

	/* if QoS is set, message contains packet id */

lib/openldap.c+0 -6

@@ -953,18 +953,12 @@ static CURLcode client_write(struct Curl_easy *data,
	if(!len && plen && prefix[plen - 1] == ' ')
	plen--;
	result = Curl_client_write(data, CLIENTWRITE_BODY, (char *) prefix, plen);
-	if(!result)
-	data->req.bytecount += plen;
	}
	if(!result && value) {
	result = Curl_client_write(data, CLIENTWRITE_BODY, (char *) value, len);
-	if(!result)
-	data->req.bytecount += len;
	}
	if(!result && suffix) {
	result = Curl_client_write(data, CLIENTWRITE_BODY, (char *) suffix, slen);
-	if(!result)
-	data->req.bytecount += slen;
	}
	return result;
	}

lib/progress.c+0 -6

@@ -319,12 +319,6 @@ timediff_t Curl_pgrsLimitWaitTime(curl_off_t cursize,
	*/
	CURLcode Curl_pgrsSetDownloadCounter(struct Curl_easy *data, curl_off_t size)
	{
-	if(data->set.max_filesize && (size > data->set.max_filesize)) {
-	failf(data, "Exceeded the maximum allowed file size "
-	"(%" CURL_FORMAT_CURL_OFF_T ")",
-	data->set.max_filesize);
-	return CURLE_FILESIZE_EXCEEDED;
-	}
	data->progress.downloaded = size;
	return CURLE_OK;
	}

lib/rtsp.c+0 -1

@@ -655,7 +655,6 @@ static CURLcode rtsp_filter_rtp(struct Curl_easy *data,
	* to write it directly as BODY data */
	result = Curl_client_write(data, CLIENTWRITE_BODY,
	Curl_dyn_ptr(&rtspc->buf), 1);
-	++data->req.bytecount;
	Curl_dyn_free(&rtspc->buf);
	if(result)
	goto out;

lib/sendf.c+188 -71

@@ -50,6 +50,7 @@
	#include "strdup.h"
	#include "http2.h"
	#include "headers.h"
+	#include "progress.h"
	#include "ws.h"

	/* The last 3 #include files should be in this order */
@@ -57,6 +58,9 @@
	#include "curl_memory.h"
	#include "memdebug.h"

+
+	static CURLcode do_init_stack(struct Curl_easy *data);
+
	#if defined(CURL_DO_LINEEND_CONV) && !defined(CURL_DISABLE_FTP)
	/*
	* convert_lineends() changes CRLF (\r\n) end-of-line markers to a single LF
@@ -385,17 +389,17 @@ static CURLcode chop_write(struct Curl_easy *data,
	the future to leave the original data alone.
	*/
	CURLcode Curl_client_write(struct Curl_easy *data,
-	int type,
-	char *ptr,
-	size_t len)
+	int type, char *buf, size_t blen)
	{
+	CURLcode result;
+
	#if !defined(CURL_DISABLE_FTP) && defined(CURL_DO_LINEEND_CONV)
	/* FTP data may need conversion. */
	if((type & CLIENTWRITE_BODY) &&
	(data->conn->handler->protocol & PROTO_FAMILY_FTP) &&
	data->conn->proto.ftpc.transfertype == 'A') {
	/* convert end-of-line markers */
-	len = convert_lineends(data, ptr, len);
+	blen = convert_lineends(data, buf, blen);
	}
	#endif
	/* it is one of those, at least */
@@ -405,14 +409,14 @@ CURLcode Curl_client_write(struct Curl_easy *data,
	/* INFO is only INFO */
	DEBUGASSERT(!(type & CLIENTWRITE_INFO) \|\| (type == CLIENTWRITE_INFO));

-	if(type == CLIENTWRITE_BODY) {
-	if(data->req.ignorebody)
-	return CURLE_OK;
-
-	if(data->req.writer_stack && !data->set.http_ce_skip)
-	return Curl_unencode_write(data, data->req.writer_stack, ptr, len);
+	if(!data->req.writer_stack) {
+	result = do_init_stack(data);
+	if(result)
+	return result;
+	DEBUGASSERT(data->req.writer_stack);
	}
-	return chop_write(data, type, FALSE, ptr, len);
+
+	return Curl_cwriter_write(data, data->req.writer_stack, type, buf, blen);
	}

	CURLcode Curl_client_unpause(struct Curl_easy *data)
@@ -449,12 +453,12 @@ CURLcode Curl_client_unpause(struct Curl_easy *data)

	void Curl_client_cleanup(struct Curl_easy *data)
	{
-	struct contenc_writer *writer = data->req.writer_stack;
+	struct Curl_cwriter *writer = data->req.writer_stack;
	size_t i;

	while(writer) {
-	data->req.writer_stack = writer->downstream;
-	writer->handler->close_writer(data, writer);
+	data->req.writer_stack = writer->next;
+	writer->cwt->do_close(data, writer);
	free(writer);
	writer = data->req.writer_stack;
	}
@@ -466,58 +470,152 @@ void Curl_client_cleanup(struct Curl_easy *data)

	}

-	/* Real client writer: no downstream. */
-	static CURLcode client_cew_init(struct Curl_easy *data,
-	struct contenc_writer *writer)
+	/* Write data using an unencoding writer stack. "nbytes" is not
+	allowed to be 0. */
+	CURLcode Curl_cwriter_write(struct Curl_easy *data,
+	struct Curl_cwriter *writer, int type,
+	const char *buf, size_t nbytes)
	{
-	(void) data;
+	if(!nbytes)
+	return CURLE_OK;
+	if(!writer)
+	return CURLE_WRITE_ERROR;
+	return writer->cwt->do_write(data, writer, type, buf, nbytes);
+	}
+
+	CURLcode Curl_cwriter_def_init(struct Curl_easy *data,
+	struct Curl_cwriter *writer)
+	{
+	(void)data;
	(void)writer;
	return CURLE_OK;
	}

-	static CURLcode client_cew_write(struct Curl_easy *data,
-	struct contenc_writer *writer,
-	const char *buf, size_t nbytes)
+	CURLcode Curl_cwriter_def_write(struct Curl_easy *data,
+	struct Curl_cwriter *writer, int type,
+	const char *buf, size_t nbytes)
	{
-	(void)writer;
-	if(!nbytes \|\| data->req.ignorebody)
-	return CURLE_OK;
-	return chop_write(data, CLIENTWRITE_BODY, FALSE, (char *)buf, nbytes);
+	return Curl_cwriter_write(data, writer->next, type, buf, nbytes);
	}

-	static void client_cew_close(struct Curl_easy *data,
-	struct contenc_writer *writer)
+	void Curl_cwriter_def_close(struct Curl_easy *data,
+	struct Curl_cwriter *writer)
	{
	(void) data;
	(void) writer;
	}

-	static const struct content_encoding client_cew = {
+	/* Real client writer to installed callbacks. */
+	static CURLcode cw_client_write(struct Curl_easy *data,
+	struct Curl_cwriter *writer, int type,
+	const char *buf, size_t nbytes)
+	{
+	(void)writer;
+	if(!nbytes)
+	return CURLE_OK;
+	return chop_write(data, type, FALSE, (char *)buf, nbytes);
+	}
+
+	static const struct Curl_cwtype cw_client = {
+	"client",
+	NULL,
+	Curl_cwriter_def_init,
+	cw_client_write,
+	Curl_cwriter_def_close,
+	sizeof(struct Curl_cwriter)
+	};
+
+	/* Download client writer in phase CURL_CW_PROTOCOL that
+	* sees the "real" download body data. */
+	static CURLcode cw_download_write(struct Curl_easy *data,
+	struct Curl_cwriter *writer, int type,
+	const char *buf, size_t nbytes)
+	{
+	CURLcode result;
+	size_t nwrite;
+
+	if(!(type & CLIENTWRITE_BODY)) {
+	if((type & CLIENTWRITE_CONNECT) && data->set.suppress_connect_headers)
+	return CURLE_OK;
+	return Curl_cwriter_write(data, writer->next, type, buf, nbytes);
+	}
+
+	nwrite = nbytes;
+	data->req.bytecount += nbytes;
+	++data->req.bodywrites;
+	/* Enforce `max_filesize` also for downloads where we ignore the body.
+	* Also, write body data up to the max size. This ensures that we
+	* always produce the same result, even when buffers vary due to
+	* connection timings. test457 fails in CI randomly otherwise. */
+	if(data->set.max_filesize &&
+	(data->req.bytecount > data->set.max_filesize)) {
+	curl_off_t nexcess;
+	failf(data, "Exceeded the maximum allowed file size "
+	"(%" CURL_FORMAT_CURL_OFF_T ")",
+	data->set.max_filesize);
+	nexcess = data->req.bytecount - data->set.max_filesize;
+	nwrite = (nexcess >= (curl_off_t)nbytes)? 0 : (nbytes - (size_t)nexcess);
+	}
+
+	if(!data->req.ignorebody && nwrite) {
+	result = Curl_cwriter_write(data, writer->next, type, buf, nwrite);
+	if(result)
+	return result;
+	}
+	result = Curl_pgrsSetDownloadCounter(data, data->req.bytecount);
+	if(result)
+	return result;
+
+	return (nwrite == nbytes)? CURLE_OK : CURLE_FILESIZE_EXCEEDED;
+	}
+
+	static const struct Curl_cwtype cw_download = {
+	"download",
	NULL,
+	Curl_cwriter_def_init,
+	cw_download_write,
+	Curl_cwriter_def_close,
+	sizeof(struct Curl_cwriter)
+	};
+
+	/* RAW client writer in phase CURL_CW_RAW that
+	* enabled tracing of raw data. */
+	static CURLcode cw_raw_write(struct Curl_easy *data,
+	struct Curl_cwriter *writer, int type,
+	const char *buf, size_t nbytes)
+	{
+	if(type & CLIENTWRITE_BODY && data->set.verbose && !data->req.ignorebody) {
+	Curl_debug(data, CURLINFO_DATA_IN, (char *)buf, nbytes);
+	}
+	return Curl_cwriter_write(data, writer->next, type, buf, nbytes);
+	}
+
+	static const struct Curl_cwtype cw_raw = {
+	"raw",
	NULL,
-	client_cew_init,
-	client_cew_write,
-	client_cew_close,
-	sizeof(struct contenc_writer)
+	Curl_cwriter_def_init,
+	cw_raw_write,
+	Curl_cwriter_def_close,
+	sizeof(struct Curl_cwriter)
	};

	/* Create an unencoding writer stage using the given handler. */
-	CURLcode Curl_client_create_writer(struct contenc_writer **pwriter,
+	CURLcode Curl_cwriter_create(struct Curl_cwriter **pwriter,
	struct Curl_easy *data,
-	const struct content_encoding *ce_handler,
-	int order)
+	const struct Curl_cwtype *cwt,
+	Curl_cwriter_phase phase)
	{
-	struct contenc_writer *writer;
+	struct Curl_cwriter *writer;
	CURLcode result = CURLE_OUT_OF_MEMORY;

-	DEBUGASSERT(ce_handler->writersize >= sizeof(struct contenc_writer));
-	writer = (struct contenc_writer *) calloc(1, ce_handler->writersize);
+	DEBUGASSERT(cwt->cwriter_size >= sizeof(struct Curl_cwriter));
+	writer = (struct Curl_cwriter *) calloc(1, cwt->cwriter_size);
	if(!writer)
	goto out;

-	writer->handler = ce_handler;
-	writer->order = order;
-	result = ce_handler->init_writer(data, writer);
+	writer->cwt = cwt;
+	writer->phase = phase;
+	result = cwt->do_init(data, writer);

	out:
	*pwriter = result? NULL : writer;
@@ -526,55 +624,74 @@ out:
	return result;
	}

-	void Curl_client_free_writer(struct Curl_easy *data,
-	struct contenc_writer *writer)
+	void Curl_cwriter_free(struct Curl_easy *data,
+	struct Curl_cwriter *writer)
	{
	if(writer) {
-	writer->handler->close_writer(data, writer);
+	writer->cwt->do_close(data, writer);
	free(writer);
	}
	}

-	/* allow no more than 5 "chained" compression steps */
-	#define MAX_ENCODE_STACK 5
+	size_t Curl_cwriter_count(struct Curl_easy *data, Curl_cwriter_phase phase)
+	{
+	struct Curl_cwriter *w;
+	size_t n = 0;

+	for(w = data->req.writer_stack; w; w = w->next) {
+	if(w->phase == phase)
+	++n;
+	}
+	return n;
+	}

-	static CURLcode init_writer_stack(struct Curl_easy *data)
+	static CURLcode do_init_stack(struct Curl_easy *data)
	{
+	struct Curl_cwriter *writer;
+	CURLcode result;
+
	DEBUGASSERT(!data->req.writer_stack);
-	return Curl_client_create_writer(&data->req.writer_stack,
-	data, &client_cew, 0);
+	result = Curl_cwriter_create(&data->req.writer_stack,
+	data, &cw_client, CURL_CW_CLIENT);
+	if(result)
+	return result;
+
+	result = Curl_cwriter_create(&writer, data, &cw_download, CURL_CW_PROTOCOL);
+	if(result)
+	return result;
+	result = Curl_cwriter_add(data, writer);
+	if(result) {
+	Curl_cwriter_free(data, writer);
+	}
+
+	result = Curl_cwriter_create(&writer, data, &cw_raw, CURL_CW_RAW);
+	if(result)
+	return result;
+	result = Curl_cwriter_add(data, writer);
+	if(result) {
+	Curl_cwriter_free(data, writer);
+	}
+	return result;
	}

-	CURLcode Curl_client_add_writer(struct Curl_easy *data,
-	struct contenc_writer *writer)
+	CURLcode Curl_cwriter_add(struct Curl_easy *data,
+	struct Curl_cwriter *writer)
	{
	CURLcode result;
+	struct Curl_cwriter **anchor = &data->req.writer_stack;

-	if(!data->req.writer_stack) {
-	result = init_writer_stack(data);
+	if(!*anchor) {
+	result = do_init_stack(data);
	if(result)
	return result;
	}

-	if(data->req.writer_stack_depth++ >= MAX_ENCODE_STACK) {
-	failf(data, "Reject response due to more than %u content encodings",
-	MAX_ENCODE_STACK);
-	return CURLE_BAD_CONTENT_ENCODING;
-	}
-
-	/* Stack the unencoding stage. */
-	if(writer->order >= data->req.writer_stack->order) {
-	writer->downstream = data->req.writer_stack;
-	data->req.writer_stack = writer;
-	}
-	else {
-	struct contenc_writer *w = data->req.writer_stack;
-	while(w->downstream && writer->order < w->downstream->order)
-	w = w->downstream;
-	writer->downstream = w->downstream;
-	w->downstream = writer;
-	}
+	/* Insert the writer as first in its phase.
+	* Skip existing writers of lower phases. */
+	while(anchor && (anchor)->phase < writer->phase)
+	anchor = &((*anchor)->next);
+	writer->next = *anchor;
+	*anchor = writer;
	return CURLE_OK;
	}

lib/sendf.h+103 -24

@@ -50,43 +50,122 @@
	#define CLIENTWRITE_1XX (1<<5) /* a 1xx response related HEADER */
	#define CLIENTWRITE_TRAILER (1<<6) /* a trailer HEADER */

+	/**
+	* Write `len` bytes at `prt` to the client. `type` indicates what
+	* kind of data is being written.
+	*/
	CURLcode Curl_client_write(struct Curl_easy data, int type, char ptr,
	size_t len) WARN_UNUSED_RESULT;

+	/**
+	* For a paused transfer, there might be buffered data held back.
+	* Attempt to flush this data to the client. This may trigger
+	* another pause of the transfer.
+	*/
	CURLcode Curl_client_unpause(struct Curl_easy *data);
+
+	/**
+	* Free all resources related to client writing.
+	*/
	void Curl_client_cleanup(struct Curl_easy *data);

-	struct contenc_writer {
-	const struct content_encoding handler; / Encoding handler. */
-	struct contenc_writer downstream; / Downstream writer. */
-	unsigned int order; /* Ordering within writer stack. */
+	/**
+	* Client Writers - a chain passing transfer BODY data to the client.
+	* Main application: HTTP and related protocols
+	* Other uses: monitoring of download progress
+	*
+	* Writers in the chain are order by their `phase`. First come all
+	* writers in CURL_CW_RAW, followed by any in CURL_CW_TRANSFER_DECODE,
+	* followed by any in CURL_CW_PROTOCOL, etc.
+	*
+	* When adding a writer, it is inserted as first in its phase. This means
+	* the order of adding writers of the same phase matters, but writers for
+	* different phases may be added in any order.
+	*
+	* Writers which do modify the BODY data written are expected to be of
+	* phases TRANSFER_DECODE or CONTENT_DECODE. The other phases are intended
+	* for monitoring writers. Which do not modify the data but gather
+	* statistics or update progress reporting.
+	*/
+
+	/* Phase a writer operates at. */
+	typedef enum {
+	CURL_CW_RAW, /* raw data written, before any decoding */
+	CURL_CW_TRANSFER_DECODE, /* remove transfer-encodings */
+	CURL_CW_PROTOCOL, /* after transfer, but before content decoding */
+	CURL_CW_CONTENT_DECODE, /* remove content-encodings */
+	CURL_CW_CLIENT /* data written to client */
+	} Curl_cwriter_phase;
+
+	/* Client Writer Type, provides the implementation */
+	struct Curl_cwtype {
+	const char name; / writer name. */
+	const char alias; / writer name alias, maybe NULL. */
+	CURLcode (do_init)(struct Curl_easy data,
+	struct Curl_cwriter *writer);
+	CURLcode (do_write)(struct Curl_easy data,
+	struct Curl_cwriter *writer, int type,
+	const char *buf, size_t nbytes);
+	void (do_close)(struct Curl_easy data,
+	struct Curl_cwriter *writer);
+	size_t cwriter_size; /* sizeof() allocated struct Curl_cwriter */
	};

-	/* Content encoding writer. */
-	struct content_encoding {
-	const char name; / Encoding name. */
-	const char alias; / Encoding name alias. */
-	CURLcode (init_writer)(struct Curl_easy data,
-	struct contenc_writer *writer);
-	CURLcode (unencode_write)(struct Curl_easy data,
-	struct contenc_writer *writer,
-	const char *buf, size_t nbytes);
-	void (close_writer)(struct Curl_easy data,
-	struct contenc_writer *writer);
-	size_t writersize;
+	/* Client writer instance */
+	struct Curl_cwriter {
+	const struct Curl_cwtype cwt; / type implementation */
+	struct Curl_cwriter next; / Downstream writer. */
+	Curl_cwriter_phase phase; /* phase at which it operates */
	};

+	/**
+	* Create a new cwriter instance with given type and phase. Is not
+	* inserted into the writer chain by this call.
+	* Invokes `writer->do_init()`.
+	*/
+	CURLcode Curl_cwriter_create(struct Curl_cwriter **pwriter,
+	struct Curl_easy *data,
+	const struct Curl_cwtype *ce_handler,
+	Curl_cwriter_phase phase);

-	CURLcode Curl_client_create_writer(struct contenc_writer **pwriter,
-	struct Curl_easy *data,
-	const struct content_encoding *ce_handler,
-	int order);
+	/**
+	* Free a cwriter instance.
+	* Invokes `writer->do_close()`.
+	*/
+	void Curl_cwriter_free(struct Curl_easy *data,
+	struct Curl_cwriter *writer);

-	void Curl_client_free_writer(struct Curl_easy *data,
-	struct contenc_writer *writer);
+	/**
+	* Count the number of writers installed of the given phase.
+	*/
+	size_t Curl_cwriter_count(struct Curl_easy *data, Curl_cwriter_phase phase);

-	CURLcode Curl_client_add_writer(struct Curl_easy *data,
-	struct contenc_writer *writer);
+	/**
+	* Adds a writer to the transfer's writer chain.
+	* The writers `phase` determines where in the chain it is inserted.
+	*/
+	CURLcode Curl_cwriter_add(struct Curl_easy *data,
+	struct Curl_cwriter *writer);
+
+	/**
+	* Convenience method for calling `writer->do_write()` that
+	* checks for NULL writer.
+	*/
+	CURLcode Curl_cwriter_write(struct Curl_easy *data,
+	struct Curl_cwriter *writer, int type,
+	const char *buf, size_t nbytes);
+
+	/**
+	* Default implementations for do_init, do_write, do_close that
+	* do nothing and pass the data through.
+	*/
+	CURLcode Curl_cwriter_def_init(struct Curl_easy *data,
+	struct Curl_cwriter *writer);
+	CURLcode Curl_cwriter_def_write(struct Curl_easy *data,
+	struct Curl_cwriter *writer, int type,
+	const char *buf, size_t nbytes);
+	void Curl_cwriter_def_close(struct Curl_easy *data,
+	struct Curl_cwriter *writer);


	/* internal read-function, does plain socket, SSL and krb4 */

lib/smb.c+0 -7

@@ -1047,14 +1047,7 @@ static CURLcode smb_request_state(struct Curl_easy data, bool done)
	break;
	}
	}
-	data->req.bytecount += len;
	data->req.offset += len;
-	result = Curl_pgrsSetDownloadCounter(data, data->req.bytecount);
-	if(result) {
-	req->result = result;
-	next_state = SMB_CLOSE;
-	break;
-	}
	next_state = (len < MAX_PAYLOAD_SIZE) ? SMB_CLOSE : SMB_DOWNLOAD;
	break;

lib/tftp.c+0 -6

@@ -1107,7 +1107,6 @@ static CURLcode tftp_receive_packet(struct Curl_easy *data)
	CURLcode result = CURLE_OK;
	struct connectdata *conn = data->conn;
	struct tftp_state_data *state = conn->proto.tftpc;
-	struct SingleRequest *k = &data->req;

	/* Receive the packet */
	fromlen = sizeof(fromaddr);
@@ -1141,11 +1140,6 @@ static CURLcode tftp_receive_packet(struct Curl_easy *data)
	result = Curl_client_write(data, CLIENTWRITE_BODY,
	(char *)state->rpacket.data + 4,
	state->rbytes-4);
-	if(!result) {
-	k->bytecount += state->rbytes-4;
-	result = Curl_pgrsSetDownloadCounter(data,
-	(curl_off_t) k->bytecount);
-	}
	if(result) {
	tftp_state_machine(state, TFTP_EVENT_ERROR);
	return result;

lib/transfer.c+22 -31

@@ -423,6 +423,7 @@ static CURLcode readwrite_data(struct Curl_easy *data,
	{
	CURLcode result = CURLE_OK;
	ssize_t nread; /* number of bytes read */
+	ssize_t n_to_write;
	bool readmore = FALSE; /* used by RTP to signal for more data */
	int maxloops = 100;
	curl_off_t max_recv = data->set.max_recv_speed?
@@ -578,23 +579,6 @@ static CURLcode readwrite_data(struct Curl_easy *data,
	} /* this is the first time we write a body part */
	#endif /* CURL_DISABLE_HTTP */

-	k->bodywrites++;
-
-	/* pass data to the debug function before it gets "dechunked" */
-	if(data->set.verbose) {
-	if(k->badheader) {
-	Curl_debug(data, CURLINFO_DATA_IN,
-	Curl_dyn_ptr(&data->state.headerb),
-	Curl_dyn_len(&data->state.headerb));
-	if(k->badheader == HEADER_PARTHEADER)
-	Curl_debug(data, CURLINFO_DATA_IN,
-	k->str, (size_t)nread);
-	}
-	else
-	Curl_debug(data, CURLINFO_DATA_IN,
-	k->str, (size_t)nread);
-	}
-
	#ifndef CURL_DISABLE_HTTP
	if(k->chunk) {
	/*
@@ -634,16 +618,26 @@ static CURLcode readwrite_data(struct Curl_easy *data,
	#endif /* CURL_DISABLE_HTTP */

	/* Account for body content stored in the header buffer */
+	n_to_write = nread;
	if((k->badheader == HEADER_PARTHEADER) && !k->ignorebody) {
-	size_t headlen = Curl_dyn_len(&data->state.headerb);
-	DEBUGF(infof(data, "Increasing bytecount by %zu", headlen));
-	k->bytecount += headlen;
+	n_to_write += Curl_dyn_len(&data->state.headerb);
	}

	if((-1 != k->maxdownload) &&
-	(k->bytecount + nread >= k->maxdownload)) {
+	(k->bytecount + n_to_write >= k->maxdownload)) {
+
+	excess = (size_t)(k->bytecount + n_to_write - k->maxdownload);
+	if(excess > 0 && !k->ignorebody) {
+	infof(data,
+	"Excess found in a read:"
+	" excess = %zu"
+	", size = %" CURL_FORMAT_CURL_OFF_T
+	", maxdownload = %" CURL_FORMAT_CURL_OFF_T
+	", bytecount = %" CURL_FORMAT_CURL_OFF_T,
+	excess, k->size, k->maxdownload, k->bytecount);
+	connclose(conn, "excess found in a read");
+	}

-	excess = (size_t)(k->bytecount + nread - k->maxdownload);
	nread = (ssize_t) (k->maxdownload - k->bytecount);
	if(nread < 0) /* this should be unusual */
	nread = 0;
@@ -657,17 +651,12 @@ static CURLcode readwrite_data(struct Curl_easy *data,
	}
	}

-	k->bytecount += nread;
	max_recv -= nread;

-	result = Curl_pgrsSetDownloadCounter(data, k->bytecount);
-	if(result)
-	goto out;
-
	if(!k->chunk && (nread \|\| k->badheader \|\| is_empty_data)) {
	/* If this is chunky transfer, it was already written */

-	if(k->badheader && !k->ignorebody) {
+	if(k->badheader) {
	/* we parsed a piece of data wrongly assuming it was a header
	and now we output it as body instead */
	size_t headlen = Curl_dyn_len(&data->state.headerb);
@@ -691,10 +680,12 @@ static CURLcode readwrite_data(struct Curl_easy *data,
	in http_chunks.c.
	Make sure that ALL_CONTENT_ENCODINGS contains all the
	encodings handled here. */
-	if(!k->ignorebody && nread) {
+	if(nread) {
	#ifndef CURL_DISABLE_POP3
-	if(conn->handler->protocol & PROTO_FAMILY_POP3)
-	result = Curl_pop3_write(data, k->str, nread);
+	if(conn->handler->protocol & PROTO_FAMILY_POP3) {
+	result = k->ignorebody? CURLE_OK :
+	Curl_pop3_write(data, k->str, nread);
+	}
	else
	#endif /* CURL_DISABLE_POP3 */
	result = Curl_client_write(data, CLIENTWRITE_BODY, k->str,

lib/urldata.h+1 -1

@@ -685,7 +685,7 @@ struct SingleRequest {
	enum upgrade101 upgr101; /* 101 upgrade state */

	/* Content unencoding stack. See sec 3.5, RFC2616. */
-	struct contenc_writer *writer_stack;
+	struct Curl_cwriter *writer_stack;
	time_t timeofdoc;
	long bodywrites;
	char location; / This points to an allocated version of the Location:

lib/vssh/libssh.c+0 -12

@@ -1466,13 +1466,7 @@ static CURLcode myssh_statemach_act(struct Curl_easy data, bool block)
	state(data, SSH_STOP);
	break;
	}
-	/* since this counts what we send to the client, we include the
-	newline in this counter */
-	data->req.bytecount += sshc->readdir_len + 1;

-	/* output debug output if that is requested */
-	Curl_debug(data, CURLINFO_DATA_OUT, (char *)sshc->readdir_filename,
-	sshc->readdir_len);
	}
	else {
	if(Curl_dyn_add(&sshc->readdir_buf, sshc->readdir_longentry)) {
@@ -1564,12 +1558,6 @@ static CURLcode myssh_statemach_act(struct Curl_easy data, bool block)
	Curl_dyn_ptr(&sshc->readdir_buf),
	Curl_dyn_len(&sshc->readdir_buf));

-	if(!result) {
-	/* output debug output if that is requested */
-	Curl_debug(data, CURLINFO_DATA_OUT, Curl_dyn_ptr(&sshc->readdir_buf),
-	Curl_dyn_len(&sshc->readdir_buf));
-	data->req.bytecount += Curl_dyn_len(&sshc->readdir_buf);
-	}
	ssh_string_free_char(sshc->readdir_tmp);
	sshc->readdir_tmp = NULL;

lib/vssh/libssh2.c+0 -14

@@ -2341,14 +2341,7 @@ static CURLcode ssh_statemach_act(struct Curl_easy data, bool block)
	state(data, SSH_STOP);
	break;
	}
-	/* since this counts what we send to the client, we include the
-	newline in this counter */
-	data->req.bytecount += readdir_len + 1;

-	/* output debug output if that is requested */
-	Curl_debug(data, CURLINFO_DATA_IN, sshp->readdir_filename,
-	readdir_len);
-	Curl_debug(data, CURLINFO_DATA_IN, (char *)"\n", 1);
	}
	else {
	result = Curl_dyn_add(&sshp->readdir, sshp->readdir_longentry);
@@ -2427,13 +2420,6 @@ static CURLcode ssh_statemach_act(struct Curl_easy data, bool block)
	Curl_dyn_ptr(&sshp->readdir),
	Curl_dyn_len(&sshp->readdir));

-	if(!result) {
-	/* output debug output if that is requested */
-	Curl_debug(data, CURLINFO_DATA_IN,
-	Curl_dyn_ptr(&sshp->readdir),
-	Curl_dyn_len(&sshp->readdir));
-	data->req.bytecount += Curl_dyn_len(&sshp->readdir);
-	}
	if(result) {
	Curl_dyn_free(&sshp->readdir);
	state(data, SSH_STOP);

tests/data/test457+3 -2

@@ -20,7 +20,8 @@ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
	30
	bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb
	21;heresatest=moooo
-	cccccccccccccccccccccccccccccccc
+	cccccccccccccccccccccccccccccc
+	c

	0

@@ -31,7 +32,7 @@ Server: fakeit/0.9 fakeitbad/1.0
	Transfer-Encoding: chunked
	Connection: mooo

-	aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbcccccccccccccccccccccccccccccccc
+	aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbcccccccccccccccccccccccccccccc
	</datacheck>
	</reply>