← Commit list

d7b6ce64ce

Stefan Eissing

2024-01-13

SUCCESS Duration: 81s

Subject

lib: replace readwrite with write_resp

Binary

Download Binary (847 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 d7b6ce64ce0ad787ad2ed3ee05c94938a6b4f551
Previous HEAD position was adfffc39a3 transfer: remove warning: Value stored to 'blen' is never read
HEAD is now at d7b6ce64ce lib: replace readwrite with write_resp

$ 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-tls.lo
Removing lib/vquic/libcurl_la-vquic-tls.o
Removing lib/vquic/libcurl_la-vquic.lo
Removing lib/vquic/libcurl_la-vquic.o
Removing lib/vssh/.deps/
Removing lib/vssh/.dirstamp
Removing lib/vssh/libcurl_la-libssh.lo
Removing lib/vssh/libcurl_la-libssh.o
Removing lib/vssh/libcurl_la-libssh2.lo
Removing lib/vssh/libcurl_la-libssh2.o
Removing lib/vssh/libcurl_la-wolfssh.lo
Removing lib/vssh/libcurl_la-wolfssh.o
Removing lib/vtls/.deps/
Removing lib/vtls/.dirstamp
Removing lib/vtls/libcurl_la-bearssl.lo
Removing lib/vtls/libcurl_la-bearssl.o
Removing lib/vtls/libcurl_la-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_ipfs.o
Removing src/tool_libinfo.o
Removing src/tool_listhelp.o
Removing src/tool_main.o
Removing src/tool_msgs.o
Removing src/tool_operate.o
Removing src/tool_operhlp.o
Removing src/tool_paramhlp.o
Removing src/tool_parsecfg.o
Removing src/tool_progress.o
Removing src/tool_setopt.o
Removing src/tool_sleep.o
Removing src/tool_stderr.o
Removing src/tool_strdup.o
Removing src/tool_urlglob.o
Removing src/tool_util.o
Removing src/tool_vms.o
Removing src/tool_writeout.o
Removing src/tool_writeout_json.o
Removing src/tool_xattr.o
Removing src/var.o
Removing 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.6.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 compiler version... gcc '1100' (raw: '11')
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 whether build target is a native Windows one... no
checking if compiler accepts some basic options... yes
configure: compiler options added: -Werror-implicit-function-declaration
checking if compiler optimizer assumed setting might be used... yes
checking if compiler accepts optimizer enabling options... yes
configure: compiler options added: -O2
checking if compiler accepts strict warning options... yes
configure: compiler options added: -Wno-system-headers
checking if compiler halts on compilation errors... yes
checking if compiler halts on negative sized arrays... yes
checking if compiler halts on function prototype mismatch... yes
checking if compiler supports hiding library internal symbols... yes
checking whether build target supports WIN32 file API... no
checking whether build target supports WIN32 crypto API... no
checking for good-to-use Darwin CFLAGS... no
checking whether to link macOS CoreFoundation, CoreServices, and SystemConfiguration frameworks... no
checking to see if the compiler supports __builtin_available()... no
checking whether to support http... yes
checking whether to support ftp... yes
checking whether to support file... yes
checking whether to support ldap... yes
checking whether to support ldaps... yes
checking whether to support rtsp... yes
checking whether to support proxies... yes
checking whether to support dict... yes
checking whether to support telnet... yes
checking whether to support tftp... yes
checking whether to support pop3... yes
checking whether to support imap... yes
checking whether to support smb... yes
checking whether to support smtp... yes
checking whether to support gopher... yes
checking whether to support mqtt... no
checking whether to provide built-in manual... yes
checking whether to enable generation of C code... yes
checking whether to use libgcc... no
checking if X/Open network library is required... no
checking for gethostbyname... yes
checking whether build target is a native Windows one... (cached) no
checking for proto/bsdsocket.h... no
checking for connect in libraries... yes
checking for sys/types.h... (cached) yes
checking for sys/time.h... yes
checking for monotonic clock_gettime... yes
checking for clock_gettime in libraries... no additional lib required
checking if monotonic clock_gettime works... yes
checking for sys/types.h... (cached) yes
checking for sys/time.h... (cached) yes
checking for raw monotonic clock_gettime... yes
checking for pkg-config... /usr/bin/pkg-config
checking for zlib options with pkg-config... found
checking for zlib.h... yes
configure: found both libz and libz.h header
checking for BrotliDecoderDecompress in -lbrotlidec... no
checking for brotli/decode.h... no
checking for ZSTD_createDStream in -lzstd... no
checking for zstd.h... no
checking for lber.h... no
checking for ldap.h... no
checking for ldap_ssl.h... no
checking for LDAP libraries... cannot find LDAP libraries
checking whether to enable IPv6... yes
checking if struct sockaddr_in6 has sin6_scope_id member... yes
checking if argv can be written to... yes
checking if GSS-API support is requested... no
checking whether to enable Windows native SSL/TLS... no
checking whether to enable Secure Transport... no
checking whether to enable Amiga native SSL/TLS (AmiSSL v5)... no
checking for 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 in_addr_t... yes
checking for struct sockaddr_storage... yes
checking for sys/select.h... (cached) yes
checking for sys/socket.h... (cached) yes
checking for select... yes
checking for sys/types.h... (cached) yes
checking for sys/socket.h... (cached) yes
checking for recv... yes
checking for sys/types.h... (cached) yes
checking for sys/socket.h... (cached) yes
checking for send... yes
checking for sys/types.h... (cached) yes
checking for sys/socket.h... (cached) yes
checking for MSG_NOSIGNAL... yes
checking for sys/types.h... (cached) yes
checking for unistd.h... (cached) yes
checking if alarm can be linked... yes
checking if alarm is prototyped... yes
checking if alarm is compilable... yes
checking if alarm usage allowed... yes
checking if alarm might be used... yes
checking for sys/types.h... (cached) yes
checking for strings.h... (cached) yes
checking for sys/types.h... (cached) yes
checking for libgen.h... (cached) yes
checking if basename can be linked... yes
checking if basename is prototyped... yes
checking if basename is compilable... yes
checking if basename usage allowed... yes
checking if basename might be used... yes
checking for sys/types.h... (cached) yes
checking for socket.h... (cached) no
checking if closesocket can be linked... no
checking if closesocket might be used... no
checking for sys/types.h... (cached) yes
checking for sys/socket.h... (cached) yes
checking if CloseSocket can be linked... no
checking if CloseSocket might be used... no
checking for sys/types.h... (cached) yes
checking for unistd.h... (cached) yes
checking for fcntl.h... (cached) yes
checking if fcntl can be linked... yes
checking if fcntl is prototyped... yes
checking if fcntl is compilable... yes
checking if fcntl usage allowed... yes
checking if fcntl might be used... yes
checking if fcntl O_NONBLOCK is compilable... yes
checking if fcntl O_NONBLOCK usage allowed... yes
checking if fcntl O_NONBLOCK might be used... yes
checking whether build target is a native Windows one... (cached) no
checking for sys/types.h... (cached) yes
checking for netdb.h... (cached) yes
checking if freeaddrinfo can be linked... yes
checking if freeaddrinfo is prototyped... yes
checking if freeaddrinfo is compilable... yes
checking if freeaddrinfo usage allowed... yes
checking if freeaddrinfo might be used... yes
checking for sys/types.h... (cached) yes
checking for sys/xattr.h... yes
checking if fsetxattr can be linked... yes
checking if fsetxattr is prototyped... yes
checking if fsetxattr takes 5 args.... yes
checking if fsetxattr is compilable... yes
checking if fsetxattr usage allowed... yes
checking if fsetxattr might be used... yes
checking if ftruncate can be linked... yes
checking if ftruncate is prototyped... yes
checking if ftruncate is compilable... yes
checking if ftruncate usage allowed... yes
checking if ftruncate might be used... yes
checking for sys/types.h... (cached) yes
checking if getaddrinfo can be linked... yes
checking if getaddrinfo is prototyped... yes
checking if getaddrinfo is compilable... yes
checking if getaddrinfo seems to work... yes
checking if getaddrinfo usage allowed... yes
checking if getaddrinfo might be used... yes
checking if getaddrinfo is threadsafe... yes
checking if gethostbyname can be linked... yes
checking if gethostbyname is prototyped... yes
checking if gethostbyname is compilable... yes
checking if gethostbyname usage allowed... yes
checking if gethostbyname might be used... yes
checking if gethostbyname_r can be linked... yes
checking if gethostbyname_r is prototyped... yes
checking if gethostbyname_r takes 3 args.... no
checking if gethostbyname_r takes 5 args.... no
checking if gethostbyname_r takes 6 args.... yes
checking if gethostbyname_r is compilable... yes
checking if gethostbyname_r usage allowed... yes
checking if gethostbyname_r might be used... yes
checking if gethostname can be linked... yes
checking if gethostname is prototyped... yes
checking if gethostname is compilable... yes
checking for gethostname arg 2 data type... size_t
checking if gethostname usage allowed... yes
checking if gethostname might be used... yes
checking if getpeername can be linked... yes
checking if getpeername is prototyped... yes
checking if getpeername is compilable... yes
checking if getpeername usage allowed... yes
checking if getpeername might be used... yes
checking if getsockname can be linked... yes
checking if getsockname is prototyped... yes
checking if getsockname is compilable... yes
checking if getsockname usage allowed... yes
checking if getsockname might be used... yes
checking for net/if.h... (cached) yes
checking if if_nametoindex can be linked... yes
checking if if_nametoindex is prototyped... yes
checking if if_nametoindex is compilable... yes
checking if if_nametoindex usage allowed... yes
checking if if_nametoindex might be used... yes
checking for sys/types.h... (cached) yes
checking for sys/socket.h... (cached) yes
checking for netinet/in.h... (cached) yes
checking for ifaddrs.h... yes
checking if getifaddrs can be linked... yes
checking if getifaddrs is prototyped... yes
checking if getifaddrs is compilable... yes
checking if getifaddrs seems to work... yes
checking if getifaddrs usage allowed... yes
checking if getifaddrs might be used... yes
checking for sys/types.h... (cached) yes
checking for sys/time.h... (cached) yes
checking if gmtime_r can be linked... yes
checking if gmtime_r is prototyped... yes
checking if gmtime_r is compilable... yes
checking if gmtime_r seems to work... yes
checking if gmtime_r usage allowed... yes
checking if gmtime_r might be used... yes
checking for sys/types.h... (cached) yes
checking for sys/socket.h... (cached) yes
checking for netinet/in.h... (cached) yes
checking for arpa/inet.h... (cached) yes
checking if inet_ntop can be linked... yes
checking if inet_ntop is prototyped... yes
checking if inet_ntop is compilable... yes
checking if inet_ntop seems to work... yes
checking if inet_ntop usage allowed... yes
checking if inet_ntop might be used... yes
checking if inet_pton can be linked... yes
checking if inet_pton is prototyped... yes
checking if inet_pton is compilable... yes
checking if inet_pton seems to work... yes
checking if inet_pton usage allowed... yes
checking if inet_pton might be used... yes
checking for sys/types.h... (cached) yes
checking for unistd.h... (cached) yes
checking for sys/socket.h... (cached) yes
checking for sys/ioctl.h... (cached) yes
checking for stropts.h... no
checking if ioctl can be linked... yes
checking if ioctl is prototyped... yes
checking if ioctl is compilable... yes
checking if ioctl usage allowed... yes
checking if ioctl might be used... yes
checking if ioctl FIONBIO is compilable... yes
checking if ioctl FIONBIO usage allowed... yes
checking if ioctl FIONBIO might be used... yes
checking if ioctl SIOCGIFADDR is compilable... yes
checking if ioctl SIOCGIFADDR usage allowed... yes
checking if ioctl SIOCGIFADDR might be used... yes
checking if ioctlsocket can be linked... no
checking if ioctlsocket might be used... no
checking if IoctlSocket can be linked... no
checking if IoctlSocket might be used... no
checking if memrchr can be linked... yes
checking if memrchr is prototyped... no
checking if memrchr might be used... no
checking for sys/types.h... (cached) yes
checking for poll.h... (cached) yes
checking for sys/poll.h... (cached) yes
checking if poll can be linked... yes
checking if poll is prototyped... yes
checking if poll is compilable... yes
checking if poll seems to work... yes
checking if poll usage allowed... yes
checking if poll might be used... yes
checking for sys/types.h... (cached) yes
checking if sigaction can be linked... yes
checking if sigaction is prototyped... yes
checking if sigaction is compilable... yes
checking if sigaction usage allowed... yes
checking if sigaction might be used... yes
checking if siginterrupt can be linked... yes
checking if siginterrupt is prototyped... yes
checking if siginterrupt is compilable... yes
checking if siginterrupt usage allowed... yes
checking if siginterrupt might be used... yes
checking if signal can be linked... yes
checking if signal is prototyped... yes
checking if signal is compilable... yes
checking if signal usage allowed... yes
checking if signal might be used... yes
checking for sys/types.h... (cached) yes
checking if sigsetjmp can be linked... no
checking if sigsetjmp seems a macro... yes
checking if sigsetjmp is compilable... yes
checking if sigsetjmp usage allowed... yes
checking if sigsetjmp might be used... yes
checking if socket can be linked... yes
checking if socket is prototyped... yes
checking if socket is compilable... yes
checking if socket usage allowed... yes
checking if socket might be used... yes
checking if socketpair can be linked... yes
checking if socketpair is prototyped... yes
checking if socketpair is compilable... yes
checking if socketpair usage allowed... yes
checking if socketpair might be used... yes
checking if strcasecmp can be linked... yes
checking if strcasecmp is prototyped... yes
checking if strcasecmp is compilable... yes
checking if strcasecmp usage allowed... yes
checking if strcasecmp might be used... yes
checking if strcmpi can be linked... no
checking if strcmpi might be used... no
checking if strdup can be linked... yes
checking if strdup is prototyped... yes
checking if strdup is compilable... yes
checking if strdup usage allowed... yes
checking if strdup might be used... yes
checking if strerror_r can be linked... yes
checking if strerror_r is prototyped... yes
checking if strerror_r is compilable... yes
checking if strerror_r is glibc like... no
checking if strerror_r is POSIX like... yes
checking if strerror_r seems to work... yes
checking if strerror_r usage allowed... yes
checking if strerror_r might be used... yes
checking if stricmp can be linked... no
checking if stricmp might be used... no
checking if strtok_r can be linked... yes
checking if strtok_r is prototyped... yes
checking if strtok_r is compilable... yes
checking if strtok_r usage allowed... yes
checking if strtok_r might be used... yes
checking if strtoll can be linked... yes
checking if strtoll is prototyped... yes
checking if strtoll is compilable... yes
checking if strtoll usage allowed... yes
checking if strtoll might be used... yes
checking for ccache gcc options needed to detect all undeclared functions... none needed
checking whether getpwuid_r is declared... yes
checking for _fseeki64... no
checking deeper for _fseeki64... but still no
checking for arc4random... no
checking deeper for arc4random... but still no
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.6.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)
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 IPFS IPNS 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-altsvc.lo
CC libcurl_la-amigaos.lo
CC libcurl_la-asyn-ares.lo
CC libcurl_la-asyn-thread.lo
CC libcurl_la-base64.lo
CC libcurl_la-bufq.lo
CC libcurl_la-bufref.lo
CC libcurl_la-c-hyper.lo
CC libcurl_la-cf-h1-proxy.lo
CC libcurl_la-cf-h2-proxy.lo
CC libcurl_la-cf-haproxy.lo
CC libcurl_la-cf-https-connect.lo
CC libcurl_la-cf-socket.lo
CC libcurl_la-cfilters.lo
CC libcurl_la-conncache.lo
CC libcurl_la-connect.lo
CC libcurl_la-content_encoding.lo
CC libcurl_la-cookie.lo
CC libcurl_la-curl_addrinfo.lo
CC libcurl_la-curl_des.lo
CC libcurl_la-curl_endian.lo
CC libcurl_la-curl_fnmatch.lo
CC libcurl_la-curl_get_line.lo
CC libcurl_la-curl_gethostname.lo
CC libcurl_la-curl_gssapi.lo
CC libcurl_la-curl_memrchr.lo
CC libcurl_la-curl_multibyte.lo
CC libcurl_la-curl_ntlm_core.lo
CC libcurl_la-curl_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-hash.lo
CC libcurl_la-gopher.lo
CC libcurl_la-headers.lo
CC libcurl_la-hmac.lo
CC libcurl_la-hostasyn.lo
CC libcurl_la-hostip.lo
CC libcurl_la-hostip4.lo
CC libcurl_la-hostip6.lo
CC libcurl_la-hostsyn.lo
CC libcurl_la-hsts.lo
CC libcurl_la-http.lo
CC libcurl_la-http1.lo
CC libcurl_la-http2.lo
CC libcurl_la-http_aws_sigv4.lo
CC libcurl_la-http_chunks.lo
CC libcurl_la-http_digest.lo
CC libcurl_la-http_negotiate.lo
CC libcurl_la-http_ntlm.lo
CC libcurl_la-http_proxy.lo
CC libcurl_la-idn.lo
CC libcurl_la-if2ip.lo
CC libcurl_la-imap.lo
CC libcurl_la-inet_ntop.lo
CC libcurl_la-inet_pton.lo
CC libcurl_la-krb5.lo
CC libcurl_la-ldap.lo
CC libcurl_la-llist.lo
CC libcurl_la-macos.lo
CC libcurl_la-md4.lo
CC libcurl_la-md5.lo
CC libcurl_la-memdebug.lo
CC libcurl_la-mime.lo
CC libcurl_la-mprintf.lo
CC libcurl_la-mqtt.lo
CC libcurl_la-multi.lo
CC libcurl_la-netrc.lo
CC libcurl_la-nonblock.lo
CC libcurl_la-noproxy.lo
CC libcurl_la-openldap.lo
CC libcurl_la-parsedate.lo
CC libcurl_la-pingpong.lo
CC libcurl_la-pop3.lo
CC libcurl_la-progress.lo
CC libcurl_la-psl.lo
CC libcurl_la-rand.lo
CC libcurl_la-rename.lo
CC libcurl_la-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-sectransp.lo
CC vtls/libcurl_la-schannel_verify.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 vquic/libcurl_la-vquic-tls.lo
CC vssh/libcurl_la-libssh.lo
CC vssh/libcurl_la-libssh2.lo
CC vssh/libcurl_la-wolfssh.lo
CCLD libcurl.la
make[2]: Leaving directory '/root/asi_db/builds/curl/_worktrees/w0/lib'
make[1]: Leaving directory '/root/asi_db/builds/curl/_worktrees/w0/lib'
Making all in 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 tool_binmode.o
CC tool_bname.o
CC slist_wc.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_ipfs.o
CC tool_libinfo.o
CC tool_listhelp.o
CC tool_main.o
CC tool_msgs.o
CC tool_operate.o
CC tool_operhlp.o
CC tool_paramhlp.o
CC tool_parsecfg.o
CC tool_progress.o
CC tool_setopt.o
CC tool_sleep.o
CC tool_stderr.o
CC tool_strdup.o
CC tool_urlglob.o
CC tool_util.o
CC tool_vms.o
CC tool_writeout.o
CC tool_writeout_json.o
CC tool_xattr.o
CC var.o
CC ../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
CC tool_hugehelp.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+3 -0

@@ -325,6 +325,9 @@ static CURLcode empty_header(struct Curl_easy *data)
	CURLE_WRITE_ERROR : CURLE_OK;
	if(result)
	failf(data, "hyperstream: couldn't pass blank header");
+	/* Hyper does chunked decoding itself. If it was added during
+	* response header processing, remove it again. */
+	Curl_cwriter_remove_by_name(data, "chunked");
	}
	return result;
	}

lib/cf-h1-proxy.c+23 -42

@@ -70,6 +70,7 @@ struct h1_tunnel_state {
	struct dynbuf request_data;
	size_t nsent;
	size_t headerlines;
+	struct Curl_chunker ch;
	enum keeponval {
	KEEPON_DONE,
	KEEPON_CONNECT,
@@ -133,6 +134,7 @@ static CURLcode tunnel_init(struct Curl_cfilter *cf,

	Curl_dyn_init(&ts->rcvbuf, DYN_PROXY_CONNECT_HEADERS);
	Curl_dyn_init(&ts->request_data, DYN_HTTP_REQUEST);
+	Curl_httpchunk_init(data, &ts->ch, TRUE);

	*pts = ts;
	connkeep(cf->conn, "HTTP proxy CONNECT");
@@ -146,14 +148,6 @@ static void h1_tunnel_go_state(struct Curl_cfilter *cf,
	{
	if(ts->tunnel_state == new_state)
	return;
-	/* leaving this one */
-	switch(ts->tunnel_state) {
-	case H1_TUNNEL_CONNECT:
-	data->req.ignorebody = FALSE;
-	break;
-	default:
-	break;
-	}
	/* entering this one */
	switch(new_state) {
	case H1_TUNNEL_INIT:
@@ -212,6 +206,7 @@ static void tunnel_free(struct Curl_cfilter *cf,
	h1_tunnel_go_state(cf, ts, H1_TUNNEL_FAILED, data);
	Curl_dyn_free(&ts->rcvbuf);
	Curl_dyn_free(&ts->request_data);
+	Curl_httpchunk_free(data, &ts->ch);
	free(ts);
	cf->ctx = NULL;
	}
@@ -344,8 +339,8 @@ static CURLcode on_resp_header(struct Curl_cfilter *cf,
	STRCONST("chunked"))) {
	infof(data, "CONNECT responded chunked");
	ts->chunked_encoding = TRUE;
-	/* init our chunky engine */
-	Curl_httpchunk_init(data);
+	/* reset our chunky engine */
+	Curl_httpchunk_reset(data, &ts->ch, TRUE);
	}
	}
	else if(Curl_compareheader(header,
@@ -373,7 +368,7 @@ static CURLcode recv_CONNECT_resp(struct Curl_cfilter *cf,
	struct SingleRequest *k = &data->req;
	curl_socket_t tunnelsocket = Curl_conn_cf_get_socket(cf, data);
	char *linep;
-	size_t perline;
+	size_t line_len;
	int error, writetype;

	#define SELECT_OK 0
@@ -432,17 +427,17 @@ static CURLcode recv_CONNECT_resp(struct Curl_cfilter *cf,
	break;
	}
	}
-	else {
+	else if(ts->chunked_encoding) {
	/* chunked-encoded body, so we need to do the chunked dance
	properly to know when the end of the body is reached */
-	CHUNKcode r;
-	CURLcode extra;
	size_t consumed = 0;

	/* now parse the chunked piece of data so that we can
	properly tell when the stream ends */
-	r = Curl_httpchunk_read(data, &byte, 1, &consumed, &extra);
-	if(r == CHUNKE_STOP) {
+	result = Curl_httpchunk_read(data, &ts->ch, &byte, 1, &consumed);
+	if(result)
+	return result;
+	if(Curl_httpchunk_is_done(data, &ts->ch)) {
	/* we're done reading chunks! */
	infof(data, "chunk reading DONE");
	ts->keepon = KEEPON_DONE;
@@ -462,19 +457,19 @@ static CURLcode recv_CONNECT_resp(struct Curl_cfilter *cf,

	ts->headerlines++;
	linep = Curl_dyn_ptr(&ts->rcvbuf);
-	perline = Curl_dyn_len(&ts->rcvbuf); /* amount of bytes in this line */
+	line_len = Curl_dyn_len(&ts->rcvbuf); /* amount of bytes in this line */

	/* output debug if that is requested */
-	Curl_debug(data, CURLINFO_HEADER_IN, linep, perline);
+	Curl_debug(data, CURLINFO_HEADER_IN, linep, line_len);

	/* 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);
+	result = Curl_client_write(data, writetype, linep, line_len);
	if(result)
	return result;

-	result = Curl_bump_headersize(data, perline, TRUE);
+	result = Curl_bump_headersize(data, line_len, TRUE);
	if(result)
	return result;

@@ -497,29 +492,7 @@ static CURLcode recv_CONNECT_resp(struct Curl_cfilter *cf,
	" bytes of response-body", ts->cl);
	}
	else if(ts->chunked_encoding) {
-	CHUNKcode r;
-	CURLcode extra;
-	size_t consumed = 0;
-
	infof(data, "Ignore chunked response-body");
-
-	/* We set ignorebody true here since the chunked decoder
-	function will acknowledge that. Pay attention so that this is
-	cleared again when this function returns! */
-	k->ignorebody = TRUE;
-
-	if(linep[1] == '\n')
-	/* this can only be a LF if the letter at index 0 was a CR */
-	linep++;
-
-	/* now parse the chunked piece of data so that we can properly
-	tell when the stream ends */
-	r = Curl_httpchunk_read(data, linep + 1, 1, &consumed, &extra);
-	if(r == CHUNKE_STOP) {
-	/* we're done reading chunks! */
-	infof(data, "chunk reading DONE");
-	ts->keepon = KEEPON_DONE;
-	}
	}
	else {
	/* without content-length or chunked encoding, we
@@ -1030,6 +1003,14 @@ out:
	*done = (result == CURLE_OK) && tunnel_is_established(cf->ctx);
	if(*done) {
	cf->connected = TRUE;
+	/* Restore `data->req` fields that may habe been touched */
+	data->req.header = TRUE; /* assume header */
+	data->req.bytecount = 0;
+	data->req.ignorebody = FALSE;
+	Curl_client_cleanup(data);
+	Curl_pgrsSetUploadCounter(data, 0);
+	Curl_pgrsSetDownloadCounter(data, 0);
+
	tunnel_free(cf, data);
	}
	return result;

lib/content_encoding.c+31 -16

@@ -835,8 +835,8 @@ static const struct Curl_cwtype identity_encoding = {
	};


-	/* supported content encodings table. */
-	static const struct Curl_cwtype * const encodings[] = {
+	/* supported general content decoders. */
+	static const struct Curl_cwtype * const general_unencoders[] = {
	&identity_encoding,
	#ifdef HAVE_LIBZ
	&deflate_encoding,
@@ -851,6 +851,13 @@ static const struct Curl_cwtype * const encodings[] = {
	NULL
	};

+	/* supported content decoders only for transfer encodings */
+	static const struct Curl_cwtype * const transfer_unencoders[] = {
+	#ifndef CURL_DISABLE_HTTP
+	&Curl_httpchunk_unencoder,
+	#endif
+	NULL
+	};

	/* Provide a list of comma-separated names of supported encodings.
	*/
@@ -864,7 +871,7 @@ void Curl_all_content_encodings(char *buf, size_t blen)
	DEBUGASSERT(blen);
	buf[0] = 0;

-	for(cep = encodings; *cep; cep++) {
+	for(cep = general_unencoders; *cep; cep++) {
	ce = *cep;
	if(!strcasecompare(ce->name, CONTENT_ENCODING_DEFAULT))
	len += strlen(ce->name) + 2;
@@ -876,7 +883,7 @@ void Curl_all_content_encodings(char *buf, size_t blen)
	}
	else if(blen > len) {
	char *p = buf;
-	for(cep = encodings; *cep; cep++) {
+	for(cep = general_unencoders; *cep; cep++) {
	ce = *cep;
	if(!strcasecompare(ce->name, CONTENT_ENCODING_DEFAULT)) {
	strcpy(p, ce->name);
@@ -934,12 +941,23 @@ static const struct Curl_cwtype error_writer = {
	};

	/* Find the content encoding by name. */
-	static const struct Curl_cwtype find_encoding(const char name,
-	size_t len)
+	static const struct Curl_cwtype find_unencode_writer(const char name,
+	size_t len,
+	Curl_cwriter_phase phase)
	{
	const struct Curl_cwtype * const *cep;

-	for(cep = encodings; *cep; cep++) {
+	if(phase == CURL_CW_TRANSFER_DECODE) {
+	for(cep = transfer_unencoders; *cep; 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;
+	}
+	}
+	/* look among the general decoders */
+	for(cep = general_unencoders; *cep; 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]))
@@ -953,7 +971,6 @@ static const struct Curl_cwtype find_encoding(const char name,
	CURLcode Curl_build_unencoding_stack(struct Curl_easy *data,
	const char *enclist, int is_transfer)
	{
-	struct SingleRequest *k = &data->req;
	Curl_cwriter_phase phase = is_transfer?
	CURL_CW_TRANSFER_DECODE:CURL_CW_CONTENT_DECODE;
	CURLcode result;
@@ -972,16 +989,14 @@ CURLcode Curl_build_unencoding_stack(struct Curl_easy *data,
	if(!ISSPACE(*enclist))
	namelen = enclist - name + 1;

-	/* Special case: chunked encoding is handled at the reader level. */
-	if(is_transfer && namelen == 7 && strncasecompare(name, "chunked", 7)) {
-	k->chunk = TRUE; /* chunks coming our way. */
-	Curl_httpchunk_init(data); /* init our chunky engine. */
-	}
-	else if(namelen) {
+	if(namelen) {
	const struct Curl_cwtype *cwt;
	struct Curl_cwriter *writer;

-	if((is_transfer && !data->set.http_transfer_encoding) \|\|
+	/* if we skip the decoding in this phase, do not look further.
+	* Exception is "chunked" transfer-encoding which always must happen */
+	if((is_transfer && !data->set.http_transfer_encoding &&
+	(namelen != 7 \|\| !strncasecompare(name, "chunked", 7))) \|\|
	(!is_transfer && data->set.http_ce_skip)) {
	/* not requested, ignore */
	return CURLE_OK;
@@ -993,7 +1008,7 @@ CURLcode Curl_build_unencoding_stack(struct Curl_easy *data,
	return CURLE_BAD_CONTENT_ENCODING;
	}

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

lib/curl_rtmp.c+6 -6

@@ -79,7 +79,7 @@ const struct Curl_handler Curl_handler_rtmp = {
	ZERO_NULL, /* domore_getsock */
	ZERO_NULL, /* perform_getsock */
	rtmp_disconnect, /* disconnect */
-	ZERO_NULL, /* readwrite */
+	ZERO_NULL, /* write_resp */
	ZERO_NULL, /* connection_check */
	ZERO_NULL, /* attach connection */
	PORT_RTMP, /* defport */
@@ -102,7 +102,7 @@ const struct Curl_handler Curl_handler_rtmpt = {
	ZERO_NULL, /* domore_getsock */
	ZERO_NULL, /* perform_getsock */
	rtmp_disconnect, /* disconnect */
-	ZERO_NULL, /* readwrite */
+	ZERO_NULL, /* write_resp */
	ZERO_NULL, /* connection_check */
	ZERO_NULL, /* attach connection */
	PORT_RTMPT, /* defport */
@@ -125,7 +125,7 @@ const struct Curl_handler Curl_handler_rtmpe = {
	ZERO_NULL, /* domore_getsock */
	ZERO_NULL, /* perform_getsock */
	rtmp_disconnect, /* disconnect */
-	ZERO_NULL, /* readwrite */
+	ZERO_NULL, /* write_resp */
	ZERO_NULL, /* connection_check */
	ZERO_NULL, /* attach connection */
	PORT_RTMP, /* defport */
@@ -148,7 +148,7 @@ const struct Curl_handler Curl_handler_rtmpte = {
	ZERO_NULL, /* domore_getsock */
	ZERO_NULL, /* perform_getsock */
	rtmp_disconnect, /* disconnect */
-	ZERO_NULL, /* readwrite */
+	ZERO_NULL, /* write_resp */
	ZERO_NULL, /* connection_check */
	ZERO_NULL, /* attach connection */
	PORT_RTMPT, /* defport */
@@ -171,7 +171,7 @@ const struct Curl_handler Curl_handler_rtmps = {
	ZERO_NULL, /* domore_getsock */
	ZERO_NULL, /* perform_getsock */
	rtmp_disconnect, /* disconnect */
-	ZERO_NULL, /* readwrite */
+	ZERO_NULL, /* write_resp */
	ZERO_NULL, /* connection_check */
	ZERO_NULL, /* attach connection */
	PORT_RTMPS, /* defport */
@@ -194,7 +194,7 @@ const struct Curl_handler Curl_handler_rtmpts = {
	ZERO_NULL, /* domore_getsock */
	ZERO_NULL, /* perform_getsock */
	rtmp_disconnect, /* disconnect */
-	ZERO_NULL, /* readwrite */
+	ZERO_NULL, /* write_resp */
	ZERO_NULL, /* connection_check */
	ZERO_NULL, /* attach connection */
	PORT_RTMPS, /* defport */

lib/dict.c+1 -1

@@ -89,7 +89,7 @@ const struct Curl_handler Curl_handler_dict = {
	ZERO_NULL, /* domore_getsock */
	ZERO_NULL, /* perform_getsock */
	ZERO_NULL, /* disconnect */
-	ZERO_NULL, /* readwrite */
+	ZERO_NULL, /* write_resp */
	ZERO_NULL, /* connection_check */
	ZERO_NULL, /* attach connection */
	PORT_DICT, /* defport */

lib/file.c+1 -1

@@ -113,7 +113,7 @@ const struct Curl_handler Curl_handler_file = {
	ZERO_NULL, /* domore_getsock */
	ZERO_NULL, /* perform_getsock */
	file_disconnect, /* disconnect */
-	ZERO_NULL, /* readwrite */
+	ZERO_NULL, /* write_resp */
	ZERO_NULL, /* connection_check */
	ZERO_NULL, /* attach connection */
	0, /* defport */

lib/ftp.c+2 -2

@@ -168,7 +168,7 @@ const struct Curl_handler Curl_handler_ftp = {
	ftp_domore_getsock, /* domore_getsock */
	ZERO_NULL, /* perform_getsock */
	ftp_disconnect, /* disconnect */
-	ZERO_NULL, /* readwrite */
+	ZERO_NULL, /* write_resp */
	ZERO_NULL, /* connection_check */
	ZERO_NULL, /* attach connection */
	PORT_FTP, /* defport */
@@ -199,7 +199,7 @@ const struct Curl_handler Curl_handler_ftps = {
	ftp_domore_getsock, /* domore_getsock */
	ZERO_NULL, /* perform_getsock */
	ftp_disconnect, /* disconnect */
-	ZERO_NULL, /* readwrite */
+	ZERO_NULL, /* write_resp */
	ZERO_NULL, /* connection_check */
	ZERO_NULL, /* attach connection */
	PORT_FTPS, /* defport */

lib/gopher.c+2 -2

@@ -75,7 +75,7 @@ const struct Curl_handler Curl_handler_gopher = {
	ZERO_NULL, /* domore_getsock */
	ZERO_NULL, /* perform_getsock */
	ZERO_NULL, /* disconnect */
-	ZERO_NULL, /* readwrite */
+	ZERO_NULL, /* write_resp */
	ZERO_NULL, /* connection_check */
	ZERO_NULL, /* attach connection */
	PORT_GOPHER, /* defport */
@@ -99,7 +99,7 @@ const struct Curl_handler Curl_handler_gophers = {
	ZERO_NULL, /* domore_getsock */
	ZERO_NULL, /* perform_getsock */
	ZERO_NULL, /* disconnect */
-	ZERO_NULL, /* readwrite */
+	ZERO_NULL, /* write_resp */
	ZERO_NULL, /* connection_check */
	ZERO_NULL, /* attach connection */
	PORT_GOPHER, /* defport */

lib/http.c+101 -37

@@ -107,6 +107,11 @@ static bool http_should_fail(struct Curl_easy *data);

	static CURLcode http_setup_conn(struct Curl_easy *data,
	struct connectdata *conn);
+	static CURLcode http_write_resp(struct Curl_easy *data,
+	const char *buf, size_t blen,
+	bool is_eos,
+	bool *done);
+
	#ifdef USE_WEBSOCKETS
	static CURLcode ws_setup_conn(struct Curl_easy *data,
	struct connectdata *conn);
@@ -129,7 +134,7 @@ const struct Curl_handler Curl_handler_http = {
	ZERO_NULL, /* domore_getsock */
	ZERO_NULL, /* perform_getsock */
	ZERO_NULL, /* disconnect */
-	ZERO_NULL, /* readwrite */
+	http_write_resp, /* write_resp */
	ZERO_NULL, /* connection_check */
	ZERO_NULL, /* attach connection */
	PORT_HTTP, /* defport */
@@ -154,7 +159,7 @@ const struct Curl_handler Curl_handler_ws = {
	ZERO_NULL, /* domore_getsock */
	ZERO_NULL, /* perform_getsock */
	Curl_ws_disconnect, /* disconnect */
-	ZERO_NULL, /* readwrite */
+	http_write_resp, /* write_resp */
	ZERO_NULL, /* connection_check */
	ZERO_NULL, /* attach connection */
	PORT_HTTP, /* defport */
@@ -183,7 +188,7 @@ const struct Curl_handler Curl_handler_https = {
	ZERO_NULL, /* domore_getsock */
	ZERO_NULL, /* perform_getsock */
	ZERO_NULL, /* disconnect */
-	ZERO_NULL, /* readwrite */
+	http_write_resp, /* write_resp */
	ZERO_NULL, /* connection_check */
	ZERO_NULL, /* attach connection */
	PORT_HTTPS, /* defport */
@@ -208,7 +213,7 @@ const struct Curl_handler Curl_handler_wss = {
	ZERO_NULL, /* domore_getsock */
	ZERO_NULL, /* perform_getsock */
	Curl_ws_disconnect, /* disconnect */
-	ZERO_NULL, /* readwrite */
+	http_write_resp, /* write_resp */
	ZERO_NULL, /* connection_check */
	ZERO_NULL, /* attach connection */
	PORT_HTTPS, /* defport */
@@ -3055,6 +3060,7 @@ CURLcode Curl_http_firstwrite(struct Curl_easy *data,
	{
	struct SingleRequest *k = &data->req;

+	*done = FALSE;
	if(data->req.newurl) {
	if(conn->bits.close) {
	/* Abort after the headers if "follow Location" is set
@@ -3991,15 +3997,16 @@ CURLcode Curl_bump_headersize(struct Curl_easy *data,
	/*
	* Read any HTTP header lines from the server and pass them to the client app.
	*/
-	CURLcode Curl_http_readwrite_headers(struct Curl_easy *data,
-	struct connectdata *conn,
-	const char *buf, size_t blen,
-	size_t *pconsumed)
+	static CURLcode http_rw_headers(struct Curl_easy *data,
+	const char *buf, size_t blen,
+	size_t *pconsumed)
	{
-	CURLcode result;
+	struct connectdata *conn = data->conn;
+	CURLcode result = CURLE_OK;
	struct SingleRequest *k = &data->req;
	char *headp;
	char *end_ptr;
+	bool leftover_body = FALSE;

	/* header line within buffer loop */
	*pconsumed = 0;
@@ -4028,12 +4035,12 @@ CURLcode Curl_http_readwrite_headers(struct Curl_easy *data,
	if(st == STATUS_BAD) {
	/* this is not the beginning of a protocol first header line */
	k->header = FALSE;
-	k->badheader = TRUE;
	streamclose(conn, "bad HTTP: No end-of-message indicator");
	if(!data->set.http09_allowed) {
	failf(data, "Received HTTP/0.9 when not allowed");
	return CURLE_UNSUPPORTED_PROTOCOL;
	}
+	leftover_body = TRUE;
	goto out;
	}
	}
@@ -4067,15 +4074,8 @@ CURLcode Curl_http_readwrite_headers(struct Curl_easy *data,
	return CURLE_UNSUPPORTED_PROTOCOL;
	}
	k->header = FALSE;
-	if(blen)
-	/* since there's more, this is a partial bad header */
-	k->badheader = TRUE;
-	else {
-	/* this was all we read so it's all a bad header */
-	k->badheader = TRUE;
-	return CURLE_OK;
-	}
-	break;
+	leftover_body = TRUE;
+	goto out;
	}
	}

@@ -4084,6 +4084,7 @@ CURLcode Curl_http_readwrite_headers(struct Curl_easy *data,
	headp = Curl_dyn_ptr(&data->state.headerb);
	if((0x0a == headp) \|\| (0x0d == headp)) {
	size_t headerlen;
+	bool switch_to_h2 = FALSE;
	/* Zero-length header line means end of headers! */

	if('\r' == *headp)
@@ -4123,14 +4124,7 @@ CURLcode Curl_http_readwrite_headers(struct Curl_easy *data,
	/* we'll get more headers (HTTP/2 response) */
	k->header = TRUE;
	k->headerline = 0; /* restart the header line counter */
-
-	/* switch to http2 now. The bytes after response headers
-	are also processed here, otherwise they are lost. */
-	result = Curl_http2_upgrade(data, conn, FIRSTSOCKET, buf, blen);
-	if(result)
-	return result;
-	*pconsumed += blen;
-	blen = 0;
+	switch_to_h2 = TRUE;
	}
	#ifdef USE_WEBSOCKETS
	else if(k->upgr101 == UPGR101_WS) {
@@ -4355,16 +4349,6 @@ CURLcode Curl_http_readwrite_headers(struct Curl_easy *data,
	*/
	if(data->req.no_body)
	k->download_done = TRUE;
-	#ifndef CURL_DISABLE_RTSP
-	else if((conn->handler->protocol & CURLPROTO_RTSP) &&
-	(data->set.rtspreq == RTSPREQ_DESCRIBE) &&
-	(k->size <= -1))
-	/* Respect section 4.4 of rfc2326: If the Content-Length header is
-	absent, a length 0 must be assumed. It will prevent libcurl from
-	hanging on DESCRIBE request that got refused for whatever
-	reason */
-	k->download_done = TRUE;
-	#endif

	/* If max download size is zero (nothing) we already have
	nothing and can safely return ok now! But for HTTP/2, we'd
@@ -4384,6 +4368,17 @@ CURLcode Curl_http_readwrite_headers(struct Curl_easy *data,

	/* We continue reading headers, reset the line-based header */
	Curl_dyn_reset(&data->state.headerb);
+	if(switch_to_h2) {
+	/* Having handled the headers, we can do the HTTP/2 switch.
+	* Any remaining `buf` bytes are already HTTP/2 and passed to
+	* be processed. */
+	result = Curl_http2_upgrade(data, conn, FIRSTSOCKET, buf, blen);
+	if(result)
+	return result;
+	*pconsumed += blen;
+	blen = 0;
+	}
+
	continue;
	}

@@ -4574,9 +4569,78 @@ CURLcode Curl_http_readwrite_headers(struct Curl_easy *data,
	there might be a non-header part left in the end of the read
	buffer. */
	out:
+	if(!k->header && !leftover_body) {
+	Curl_dyn_free(&data->state.headerb);
+	}
	return CURLE_OK;
	}

+	/*
+	* HTTP protocol `write_resp` implementation. Will parse headers
+	* when not done yet and otherwise return without consuming data.
+	*/
+	CURLcode Curl_http_write_resp_hds(struct Curl_easy *data,
+	const char *buf, size_t blen,
+	size_t *pconsumed,
+	bool *done)
+	{
+	*done = FALSE;
+	if(!data->req.header) {
+	*pconsumed = 0;
+	return CURLE_OK;
+	}
+	else {
+	CURLcode result;
+
+	result = http_rw_headers(data, buf, blen, pconsumed);
+	if(!result && !data->req.header) {
+	/* we have successfully finished parsing the HEADERs */
+	result = Curl_http_firstwrite(data, data->conn, done);
+
+	if(!data->req.no_body && Curl_dyn_len(&data->state.headerb)) {
+	/* leftover from parsing something that turned out not
+	* to be a header, only happens if we allow for
+	* HTTP/0.9 like responses */
+	result = Curl_client_write(data, CLIENTWRITE_BODY,
+	Curl_dyn_ptr(&data->state.headerb),
+	Curl_dyn_len(&data->state.headerb));
+	}
+	Curl_dyn_free(&data->state.headerb);
+	}
+	return result;
+	}
+	}
+
+	static CURLcode http_write_resp(struct Curl_easy *data,
+	const char *buf, size_t blen,
+	bool is_eos,
+	bool *done)
+	{
+	CURLcode result;
+	size_t consumed;
+	int flags;
+
+	*done = FALSE;
+	result = Curl_http_write_resp_hds(data, buf, blen, &consumed, done);
+	if(result \|\| *done)
+	goto out;
+
+	DEBUGASSERT(consumed <= blen);
+	blen -= consumed;
+	buf += consumed;
+	/* either all was consumed in header parsing, or we have data left
+	* and are done with heders, e.g. it is BODY data */
+	DEBUGASSERT(!blen \|\| !data->req.header);
+	if(!data->req.header && (blen \|\| is_eos)) {
+	/* BODY data after header been parsed, write and consume */
+	flags = CLIENTWRITE_BODY;
+	if(is_eos)
+	flags \|= CLIENTWRITE_EOS;
+	result = Curl_client_write(data, flags, (char *)buf, blen);
+	}
+	out:
+	return result;
+	}

	/* Decode HTTP status code string. */
	CURLcode Curl_http_decode_status(int pstatus, const char s, size_t len)

lib/http.h+4 -4

@@ -225,10 +225,10 @@ struct HTTP {

	CURLcode Curl_http_size(struct Curl_easy *data);

-	CURLcode Curl_http_readwrite_headers(struct Curl_easy *data,
-	struct connectdata *conn,
-	const char *buf, size_t blen,
-	size_t *pconsumed);
+	CURLcode Curl_http_write_resp_hds(struct Curl_easy *data,
+	const char *buf, size_t blen,
+	size_t *pconsumed,
+	bool *done);

	/**
	* Curl_http_output_auth() setups the authentication headers for the

lib/http_chunks.c+217 -77

@@ -75,47 +75,67 @@

	*/

-	void Curl_httpchunk_init(struct Curl_easy *data)
+	void Curl_httpchunk_init(struct Curl_easy data, struct Curl_chunker ch,
+	bool ignore_body)
	{
-	struct connectdata *conn = data->conn;
-	struct Curl_chunker *chunk = &conn->chunk;
-	chunk->hexindex = 0; /* start at 0 */
-	chunk->state = CHUNK_HEX; /* we get hex first! */
-	Curl_dyn_init(&conn->trailer, DYN_H1_TRAILER);
+	(void)data;
+	ch->hexindex = 0; /* start at 0 */
+	ch->state = CHUNK_HEX; /* we get hex first! */
+	ch->last_code = CHUNKE_OK;
+	Curl_dyn_init(&ch->trailer, DYN_H1_TRAILER);
+	ch->ignore_body = ignore_body;
	}

-	/*
-	* chunk_read() returns a OK for normal operations, or a positive return code
-	* for errors. STOP means this sequence of chunks is complete. The 'wrote'
-	* argument is set to tell the caller how many bytes we actually passed to the
-	* client (for byte-counting and whatever).
-	*
-	* The states and the state-machine is further explained in the header file.
-	*
-	* This function always uses ASCII hex values to accommodate non-ASCII hosts.
-	* For example, 0x0d and 0x0a are used instead of '\r' and '\n'.
-	*/
-	CHUNKcode Curl_httpchunk_read(struct Curl_easy *data,
-	char *buf,
-	size_t blen,
-	size_t *pconsumed,
-	CURLcode *extrap)
+	void Curl_httpchunk_reset(struct Curl_easy data, struct Curl_chunker ch,
+	bool ignore_body)
+	{
+	(void)data;
+	ch->hexindex = 0; /* start at 0 */
+	ch->state = CHUNK_HEX; /* we get hex first! */
+	ch->last_code = CHUNKE_OK;
+	Curl_dyn_reset(&ch->trailer);
+	ch->ignore_body = ignore_body;
+	}
+
+	void Curl_httpchunk_free(struct Curl_easy data, struct Curl_chunker ch)
+	{
+	(void)data;
+	Curl_dyn_free(&ch->trailer);
+	}
+
+	bool Curl_httpchunk_is_done(struct Curl_easy data, struct Curl_chunker ch)
+	{
+	(void)data;
+	return ch->state == CHUNK_DONE;
+	}
+
+	static CURLcode httpchunk_readwrite(struct Curl_easy *data,
+	struct Curl_chunker *ch,
+	struct Curl_cwriter *cw_next,
+	const char *buf, size_t blen,
+	size_t *pconsumed)
	{
	CURLcode result = CURLE_OK;
-	struct connectdata *conn = data->conn;
-	struct Curl_chunker *ch = &conn->chunk;
-	struct SingleRequest *k = &data->req;
	size_t piece;

	pconsumed = 0; / nothing's written yet */
+	/* first check terminal states that will not progress anywhere */
+	if(ch->state == CHUNK_DONE)
+	return CURLE_OK;
+	if(ch->state == CHUNK_FAILED)
+	return CURLE_RECV_ERROR;

	/* the original data is written to the client, but we go on with the
	chunk read process, to properly calculate the content length */
-	if(data->set.http_te_skip && !k->ignorebody) {
-	result = Curl_client_write(data, CLIENTWRITE_BODY, buf, blen);
+	if(data->set.http_te_skip && !ch->ignore_body) {
+	if(cw_next)
+	result = Curl_cwriter_write(data, cw_next, CLIENTWRITE_BODY, buf, blen);
+	else
+	result = Curl_client_write(data, CLIENTWRITE_BODY, (char *)buf, blen);
	if(result) {
-	*extrap = result;
-	return CHUNKE_PASSTHRU_ERROR;
+	ch->state = CHUNK_FAILED;
+	ch->last_code = CHUNKE_PASSTHRU_ERROR;
+	return result;
	}
	}

@@ -123,28 +143,35 @@ CHUNKcode Curl_httpchunk_read(struct Curl_easy *data,
	switch(ch->state) {
	case CHUNK_HEX:
	if(ISXDIGIT(*buf)) {
-	if(ch->hexindex < CHUNK_MAXNUM_LEN) {
-	ch->hexbuffer[ch->hexindex] = *buf;
-	buf++;
-	blen--;
-	ch->hexindex++;
-	}
-	else {
-	return CHUNKE_TOO_LONG_HEX; /* longer hex than we support */
+	if(ch->hexindex >= CHUNK_MAXNUM_LEN) {
+	failf(data, "chunk hex-length longer than %d", CHUNK_MAXNUM_LEN);
+	ch->state = CHUNK_FAILED;
+	ch->last_code = CHUNKE_TOO_LONG_HEX; /* longer than we support */
+	return CURLE_RECV_ERROR;
	}
+	ch->hexbuffer[ch->hexindex++] = *buf;
+	buf++;
+	blen--;
	}
	else {
	char *endptr;
-	if(0 == ch->hexindex)
+	if(0 == ch->hexindex) {
	/* This is illegal data, we received junk where we expected
	a hexadecimal digit. */
-	return CHUNKE_ILLEGAL_HEX;
+	failf(data, "chunk hex-length char not a hex digit: 0x%x", *buf);
+	ch->state = CHUNK_FAILED;
+	ch->last_code = CHUNKE_ILLEGAL_HEX;
+	return CURLE_RECV_ERROR;
+	}

	/* blen and buf are unmodified */
	ch->hexbuffer[ch->hexindex] = 0;
-
-	if(curlx_strtoofft(ch->hexbuffer, &endptr, 16, &ch->datasize))
-	return CHUNKE_ILLEGAL_HEX;
+	if(curlx_strtoofft(ch->hexbuffer, &endptr, 16, &ch->datasize)) {
+	failf(data, "chunk hex-length not valid: '%s'", ch->hexbuffer);
+	ch->state = CHUNK_FAILED;
+	ch->last_code = CHUNKE_ILLEGAL_HEX;
+	return CURLE_RECV_ERROR;
+	}
	ch->state = CHUNK_LF; /* now wait for the CRLF */
	}
	break;
@@ -173,12 +200,17 @@ CHUNKcode Curl_httpchunk_read(struct Curl_easy *data,
	piece = curlx_sotouz(ch->datasize);

	/* Write the data portion available */
-	if(!data->set.http_te_skip && !k->ignorebody) {
-	result = Curl_client_write(data, CLIENTWRITE_BODY, buf, piece);
-
+	if(!data->set.http_te_skip && !ch->ignore_body) {
+	if(cw_next)
+	result = Curl_cwriter_write(data, cw_next, CLIENTWRITE_BODY,
+	buf, piece);
+	else
+	result = Curl_client_write(data, CLIENTWRITE_BODY,
+	(char *)buf, piece);
	if(result) {
-	*extrap = result;
-	return CHUNKE_PASSTHRU_ERROR;
+	ch->state = CHUNK_FAILED;
+	ch->last_code = CHUNKE_PASSTHRU_ERROR;
+	return result;
	}
	}

@@ -195,38 +227,51 @@ CHUNKcode Curl_httpchunk_read(struct Curl_easy *data,
	case CHUNK_POSTLF:
	if(*buf == 0x0a) {
	/* The last one before we go back to hex state and start all over. */
-	Curl_httpchunk_init(data); /* sets state back to CHUNK_HEX */
+	Curl_httpchunk_reset(data, ch, ch->ignore_body);
+	}
+	else if(*buf != 0x0d) {
+	ch->state = CHUNK_FAILED;
+	ch->last_code = CHUNKE_BAD_CHUNK;
+	return CURLE_RECV_ERROR;
	}
-	else if(*buf != 0x0d)
-	return CHUNKE_BAD_CHUNK;
	buf++;
	blen--;
	break;

	case CHUNK_TRAILER:
	if((buf == 0x0d) \|\| (buf == 0x0a)) {
-	char *tr = Curl_dyn_ptr(&conn->trailer);
+	char *tr = Curl_dyn_ptr(&ch->trailer);
	/* this is the end of a trailer, but if the trailer was zero bytes
	there was no trailer and we move on */

	if(tr) {
	size_t trlen;
-	result = Curl_dyn_addn(&conn->trailer, (char *)STRCONST("\x0d\x0a"));
-	if(result)
-	return CHUNKE_OUT_OF_MEMORY;
-
-	tr = Curl_dyn_ptr(&conn->trailer);
-	trlen = Curl_dyn_len(&conn->trailer);
+	result = Curl_dyn_addn(&ch->trailer, (char *)STRCONST("\x0d\x0a"));
+	if(result) {
+	ch->state = CHUNK_FAILED;
+	ch->last_code = CHUNKE_OUT_OF_MEMORY;
+	return result;
+	}
+	tr = Curl_dyn_ptr(&ch->trailer);
+	trlen = Curl_dyn_len(&ch->trailer);
	if(!data->set.http_te_skip) {
-	result = Curl_client_write(data,
-	CLIENTWRITE_HEADER\|CLIENTWRITE_TRAILER,
-	tr, trlen);
+	if(cw_next)
+	result = Curl_cwriter_write(data, cw_next,
+	CLIENTWRITE_HEADER\|
+	CLIENTWRITE_TRAILER,
+	tr, trlen);
+	else
+	result = Curl_client_write(data,
+	CLIENTWRITE_HEADER\|
+	CLIENTWRITE_TRAILER,
+	tr, trlen);
	if(result) {
-	*extrap = result;
-	return CHUNKE_PASSTHRU_ERROR;
+	ch->state = CHUNK_FAILED;
+	ch->last_code = CHUNKE_PASSTHRU_ERROR;
+	return result;
	}
	}
-	Curl_dyn_reset(&conn->trailer);
+	Curl_dyn_reset(&ch->trailer);
	ch->state = CHUNK_TRAILER_CR;
	if(*buf == 0x0a)
	/* already on the LF */
@@ -239,9 +284,12 @@ CHUNKcode Curl_httpchunk_read(struct Curl_easy *data,
	}
	}
	else {
-	result = Curl_dyn_addn(&conn->trailer, buf, 1);
-	if(result)
-	return CHUNKE_OUT_OF_MEMORY;
+	result = Curl_dyn_addn(&ch->trailer, buf, 1);
+	if(result) {
+	ch->state = CHUNK_FAILED;
+	ch->last_code = CHUNKE_OUT_OF_MEMORY;
+	return result;
+	}
	}
	buf++;
	blen--;
@@ -253,8 +301,11 @@ CHUNKcode Curl_httpchunk_read(struct Curl_easy *data,
	buf++;
	blen--;
	}
-	else
-	return CHUNKE_BAD_CHUNK;
+	else {
+	ch->state = CHUNK_FAILED;
+	ch->last_code = CHUNKE_BAD_CHUNK;
+	return CURLE_RECV_ERROR;
+	}
	break;

	case CHUNK_TRAILER_POSTCR:
@@ -277,21 +328,29 @@ CHUNKcode Curl_httpchunk_read(struct Curl_easy *data,
	case CHUNK_STOP:
	if(*buf == 0x0a) {
	blen--;
-
	/* Record the length of any data left in the end of the buffer
	even if there's no more chunks to read */
	ch->datasize = blen;
-
-	return CHUNKE_STOP; /* return stop */
+	ch->state = CHUNK_DONE;
+	return CURLE_OK;
	}
-	else
-	return CHUNKE_BAD_CHUNK;
+	else {
+	ch->state = CHUNK_FAILED;
+	ch->last_code = CHUNKE_BAD_CHUNK;
+	return CURLE_RECV_ERROR;
+	}
+	case CHUNK_DONE:
+	return CURLE_OK;
+
+	case CHUNK_FAILED:
+	return CURLE_RECV_ERROR;
	}
+
	}
-	return CHUNKE_OK;
+	return CURLE_OK;
	}

-	const char *Curl_chunked_strerror(CHUNKcode code)
+	static const char *Curl_chunked_strerror(CHUNKcode code)
	{
	switch(code) {
	default:
@@ -303,8 +362,7 @@ const char *Curl_chunked_strerror(CHUNKcode code)
	case CHUNKE_BAD_CHUNK:
	return "Malformed encoding found";
	case CHUNKE_PASSTHRU_ERROR:
-	DEBUGASSERT(0); /* never used */
-	return "";
+	return "Error writing data to client";
	case CHUNKE_BAD_ENCODING:
	return "Bad content-encoding found";
	case CHUNKE_OUT_OF_MEMORY:
@@ -312,4 +370,86 @@ const char *Curl_chunked_strerror(CHUNKcode code)
	}
	}

+	CURLcode Curl_httpchunk_read(struct Curl_easy *data,
+	struct Curl_chunker *ch,
+	char *buf, size_t blen,
+	size_t *pconsumed)
+	{
+	return httpchunk_readwrite(data, ch, NULL, buf, blen, pconsumed);
+	}
+
+	struct chunked_writer {
+	struct Curl_cwriter super;
+	struct Curl_chunker ch;
+	};
+
+	static CURLcode cw_chunked_init(struct Curl_easy *data,
+	struct Curl_cwriter *writer)
+	{
+	struct chunked_writer ctx = (struct chunked_writer )writer;
+
+	data->req.chunk = TRUE; /* chunks coming our way. */
+	Curl_httpchunk_init(data, &ctx->ch, FALSE);
+	return CURLE_OK;
+	}
+
+	static void cw_chunked_close(struct Curl_easy *data,
+	struct Curl_cwriter *writer)
+	{
+	struct chunked_writer ctx = (struct chunked_writer )writer;
+	Curl_httpchunk_free(data, &ctx->ch);
+	}
+
+	static CURLcode cw_chunked_write(struct Curl_easy *data,
+	struct Curl_cwriter *writer, int type,
+	const char *buf, size_t blen)
+	{
+	struct chunked_writer ctx = (struct chunked_writer )writer;
+	CURLcode result;
+	size_t consumed;
+
+	if(!(type & CLIENTWRITE_BODY))
+	return Curl_cwriter_write(data, writer->next, type, buf, blen);
+
+	consumed = 0;
+	result = httpchunk_readwrite(data, &ctx->ch, writer->next, buf, blen,
+	&consumed);
+
+	if(result) {
+	if(CHUNKE_PASSTHRU_ERROR == ctx->ch.last_code) {
+	failf(data, "Failed reading the chunked-encoded stream");
+	}
+	else {
+	failf(data, "%s in chunked-encoding",
+	Curl_chunked_strerror(ctx->ch.last_code));
+	}
+	return result;
+	}
+
+	blen -= consumed;
+	if(CHUNK_DONE == ctx->ch.state) {
+	/* chunks read successfully, download is complete */
+	data->req.download_done = TRUE;
+	if(blen) {
+	infof(data, "Leftovers after chunking: %zu bytes", blen);
+	}
+	}
+	else if((type & CLIENTWRITE_EOS) && !data->req.no_body) {
+	failf(data, "transfer closed with outstanding read data remaining");
+	return CURLE_PARTIAL_FILE;
+	}
+
+	return CURLE_OK;
+	}
+
+	/* HTTP chunked Transfer-Encoding decoder */
+	const struct Curl_cwtype Curl_httpchunk_unencoder = {
+	"chunked",
+	NULL,
+	cw_chunked_init,
+	cw_chunked_write,
+	cw_chunked_close,
+	sizeof(struct chunked_writer)
+	};
+
	#endif /* CURL_DISABLE_HTTP */

lib/http_chunks.h+49 -11

@@ -24,6 +24,10 @@
	*
	***************************************************************************/

+	#ifndef CURL_DISABLE_HTTP
+
+	#include "dynbuf.h"
+
	struct connectdata;

	/*
@@ -67,34 +71,68 @@ typedef enum {
	signalled If this is an empty trailer CHUNKE_STOP will be signalled.
	Otherwise the trailer will be broadcasted via Curl_client_write() and the
	next state will be CHUNK_TRAILER */
-	CHUNK_TRAILER_POSTCR
+	CHUNK_TRAILER_POSTCR,
+
+	/* Successfully de-chunked everything */
+	CHUNK_DONE,
+
+	/* Failed on seeing a bad or not correctly terminated chunk */
+	CHUNK_FAILED
	} ChunkyState;

	typedef enum {
-	CHUNKE_STOP = -1,
	CHUNKE_OK = 0,
	CHUNKE_TOO_LONG_HEX = 1,
	CHUNKE_ILLEGAL_HEX,
	CHUNKE_BAD_CHUNK,
	CHUNKE_BAD_ENCODING,
	CHUNKE_OUT_OF_MEMORY,
-	CHUNKE_PASSTHRU_ERROR, /* Curl_httpchunk_read() returns a CURLcode to use */
-	CHUNKE_LAST
+	CHUNKE_PASSTHRU_ERROR /* Curl_httpchunk_read() returns a CURLcode to use */
	} CHUNKcode;

-	const char *Curl_chunked_strerror(CHUNKcode code);
-
	struct Curl_chunker {
	curl_off_t datasize;
	ChunkyState state;
+	CHUNKcode last_code;
+	struct dynbuf trailer; /* for chunked-encoded trailer */
	unsigned char hexindex;
-	char hexbuffer[ CHUNK_MAXNUM_LEN + 1]; /* +1 for null-terminator */
+	char hexbuffer[CHUNK_MAXNUM_LEN + 1]; /* +1 for null-terminator */
+	BIT(ignore_body); /* never write response body data */
	};

	/* The following functions are defined in http_chunks.c */
-	void Curl_httpchunk_init(struct Curl_easy *data);
-	CHUNKcode Curl_httpchunk_read(struct Curl_easy data, char buf,
-	size_t blen, size_t *pconsumed,
-	CURLcode *passthru);
+	void Curl_httpchunk_init(struct Curl_easy data, struct Curl_chunker ch,
+	bool ignore_body);
+	void Curl_httpchunk_free(struct Curl_easy data, struct Curl_chunker ch);
+	void Curl_httpchunk_reset(struct Curl_easy data, struct Curl_chunker ch,
+	bool ignore_body);
+
+	/*
+	* Read BODY bytes in HTTP/1.1 chunked encoding from `buf` and return
+	* the amount of bytes consumed. The actual response bytes and trailer
+	* headers are written out to the client.
+	* On success, this will consume all bytes up to the end of the response,
+	* e.g. the last chunk, has been processed.
+	* @param data the transfer involved
+	* @param ch the chunker instance keeping state across calls
+	* @param buf the response data
+	* @param blen amount of bytes in `buf`
+	* @param pconsumed on successful return, the number of bytes in `buf`
+	* consumed
+	*
+	* This function always uses ASCII hex values to accommodate non-ASCII hosts.
+	* For example, 0x0d and 0x0a are used instead of '\r' and '\n'.
+	*/
+	CURLcode Curl_httpchunk_read(struct Curl_easy data, struct Curl_chunker ch,
+	char buf, size_t blen, size_t pconsumed);
+
+	/**
+	* @return TRUE iff chunked decoded has finished successfully.
+	*/
+	bool Curl_httpchunk_is_done(struct Curl_easy data, struct Curl_chunker ch);
+
+	extern const struct Curl_cwtype Curl_httpchunk_unencoder;
+
+	#endif /* !CURL_DISABLE_HTTP */

	#endif /* HEADER_CURL_HTTP_CHUNKS_H */

lib/imap.c+2 -2

@@ -130,7 +130,7 @@ const struct Curl_handler Curl_handler_imap = {
	ZERO_NULL, /* domore_getsock */
	ZERO_NULL, /* perform_getsock */
	imap_disconnect, /* disconnect */
-	ZERO_NULL, /* readwrite */
+	ZERO_NULL, /* write_resp */
	ZERO_NULL, /* connection_check */
	ZERO_NULL, /* attach connection */
	PORT_IMAP, /* defport */
@@ -159,7 +159,7 @@ const struct Curl_handler Curl_handler_imaps = {
	ZERO_NULL, /* domore_getsock */
	ZERO_NULL, /* perform_getsock */
	imap_disconnect, /* disconnect */
-	ZERO_NULL, /* readwrite */
+	ZERO_NULL, /* write_resp */
	ZERO_NULL, /* connection_check */
	ZERO_NULL, /* attach connection */
	PORT_IMAPS, /* defport */

lib/ldap.c+2 -2

@@ -177,7 +177,7 @@ const struct Curl_handler Curl_handler_ldap = {
	ZERO_NULL, /* domore_getsock */
	ZERO_NULL, /* perform_getsock */
	ZERO_NULL, /* disconnect */
-	ZERO_NULL, /* readwrite */
+	ZERO_NULL, /* write_resp */
	ZERO_NULL, /* connection_check */
	ZERO_NULL, /* attach connection */
	PORT_LDAP, /* defport */
@@ -205,7 +205,7 @@ const struct Curl_handler Curl_handler_ldaps = {
	ZERO_NULL, /* domore_getsock */
	ZERO_NULL, /* perform_getsock */
	ZERO_NULL, /* disconnect */
-	ZERO_NULL, /* readwrite */
+	ZERO_NULL, /* write_resp */
	ZERO_NULL, /* connection_check */
	ZERO_NULL, /* attach connection */
	PORT_LDAPS, /* defport */

lib/mqtt.c+1 -1

@@ -88,7 +88,7 @@ const struct Curl_handler Curl_handler_mqtt = {
	ZERO_NULL, /* domore_getsock */
	ZERO_NULL, /* perform_getsock */
	ZERO_NULL, /* disconnect */
-	ZERO_NULL, /* readwrite */
+	ZERO_NULL, /* write_resp */
	ZERO_NULL, /* connection_check */
	ZERO_NULL, /* attach connection */
	PORT_MQTT, /* defport */

lib/multi.c+1 -1

@@ -2480,7 +2480,7 @@ static CURLMcode multi_runsingle(struct Curl_multi *multi,
	}

	/* read/write data if it is ready to do so */
-	result = Curl_readwrite(data->conn, data, &done);
+	result = Curl_readwrite(data, &done);

	if(done \|\| (result == CURLE_RECV_ERROR)) {
	/* If CURLE_RECV_ERROR happens early enough, we assume it was a race

lib/openldap.c+2 -2

@@ -130,7 +130,7 @@ const struct Curl_handler Curl_handler_ldap = {
	ZERO_NULL, /* domore_getsock */
	ZERO_NULL, /* perform_getsock */
	oldap_disconnect, /* disconnect */
-	ZERO_NULL, /* readwrite */
+	ZERO_NULL, /* write_resp */
	ZERO_NULL, /* connection_check */
	ZERO_NULL, /* attach connection */
	PORT_LDAP, /* defport */
@@ -158,7 +158,7 @@ const struct Curl_handler Curl_handler_ldaps = {
	ZERO_NULL, /* domore_getsock */
	ZERO_NULL, /* perform_getsock */
	oldap_disconnect, /* disconnect */
-	ZERO_NULL, /* readwrite */
+	ZERO_NULL, /* write_resp */
	ZERO_NULL, /* connection_check */
	ZERO_NULL, /* attach connection */
	PORT_LDAPS, /* defport */

lib/pop3.c+2 -2

@@ -125,7 +125,7 @@ const struct Curl_handler Curl_handler_pop3 = {
	ZERO_NULL, /* domore_getsock */
	ZERO_NULL, /* perform_getsock */
	pop3_disconnect, /* disconnect */
-	ZERO_NULL, /* readwrite */
+	ZERO_NULL, /* write_resp */
	ZERO_NULL, /* connection_check */
	ZERO_NULL, /* attach connection */
	PORT_POP3, /* defport */
@@ -154,7 +154,7 @@ const struct Curl_handler Curl_handler_pop3s = {
	ZERO_NULL, /* domore_getsock */
	ZERO_NULL, /* perform_getsock */
	pop3_disconnect, /* disconnect */
-	ZERO_NULL, /* readwrite */
+	ZERO_NULL, /* write_resp */
	ZERO_NULL, /* connection_check */
	ZERO_NULL, /* attach connection */
	PORT_POP3S, /* defport */

lib/rtsp.c+97 -70

@@ -58,21 +58,20 @@ static int rtsp_getsock_do(struct Curl_easy *data,
	struct connectdata conn, curl_socket_t socks);

	/*
-	* Parse and write out any available RTP data.
+	* Parse and write out an RTSP response.
	* @param data the transfer
	* @param conn the connection
	* @param buf data read from connection
	* @param blen amount of data in buf
-	* @param consumed out, number of blen consumed
+	* @param is_eos TRUE iff this is the last write
	* @param readmore out, TRUE iff complete buf was consumed and more data
	* is needed
	*/
-	static CURLcode rtsp_rtp_readwrite(struct Curl_easy *data,
-	struct connectdata *conn,
-	const char *buf,
-	size_t blen,
-	size_t *pconsumed,
-	bool *readmore);
+	static CURLcode rtsp_rtp_write_resp(struct Curl_easy *data,
+	const char *buf,
+	size_t blen,
+	bool is_eos,
+	bool *done);

	static CURLcode rtsp_setup_connection(struct Curl_easy *data,
	struct connectdata *conn);
@@ -115,7 +114,7 @@ const struct Curl_handler Curl_handler_rtsp = {
	ZERO_NULL, /* domore_getsock */
	ZERO_NULL, /* perform_getsock */
	rtsp_disconnect, /* disconnect */
-	rtsp_rtp_readwrite, /* readwrite */
+	rtsp_rtp_write_resp, /* write_resp */
	rtsp_conncheck, /* connection_check */
	ZERO_NULL, /* attach connection */
	PORT_RTSP, /* defport */
@@ -590,26 +589,48 @@ static CURLcode rtsp_do(struct Curl_easy data, bool done)
	return result;
	}

+	/**
+	* write any BODY bytes missing to the client, ignore the rest.
+	*/
+	static CURLcode rtp_write_body_junk(struct Curl_easy *data,
+	const char *buf,
+	size_t blen)
+	{
+	struct rtsp_conn *rtspc = &(data->conn->proto.rtspc);
+	curl_off_t body_remain;
+	bool in_body;
+
+	in_body = (data->req.headerline && !rtspc->in_header) &&
+	(data->req.size >= 0) &&
+	(data->req.bytecount < data->req.size);
+	body_remain = in_body? (data->req.size - data->req.bytecount) : 0;
+	DEBUGASSERT(body_remain >= 0);
+	if(body_remain) {
+	if((curl_off_t)blen > body_remain)
+	blen = (size_t)body_remain;
+	return Curl_client_write(data, CLIENTWRITE_BODY, (char *)buf, blen);
+	}
+	return CURLE_OK;
+	}
+
	static CURLcode rtsp_filter_rtp(struct Curl_easy *data,
-	struct connectdata *conn,
	const char *buf,
	size_t blen,
-	bool in_body,
	size_t *pconsumed)
	{
-	struct rtsp_conn *rtspc = &(conn->proto.rtspc);
+	struct rtsp_conn *rtspc = &(data->conn->proto.rtspc);
	CURLcode result = CURLE_OK;
+	size_t skip_len = 0;

	*pconsumed = 0;
	while(blen) {
+	bool in_body = (data->req.headerline && !rtspc->in_header) &&
+	(data->req.size >= 0) &&
+	(data->req.bytecount < data->req.size);
	switch(rtspc->state) {

	case RTP_PARSE_SKIP: {
	DEBUGASSERT(Curl_dyn_len(&rtspc->buf) == 0);
-	if(in_body && buf[0] != '$') {
-	/* in BODY and no valid start, do not consume and return */
-	goto out;
-	}
	while(blen && buf[0] != '$') {
	if(!in_body && buf[0] == 'R' &&
	data->set.rtspreq != RTSPREQ_RECEIVE) {
@@ -624,13 +645,22 @@ static CURLcode rtsp_filter_rtp(struct Curl_easy *data,
	goto out;
	}
	}
-	/* junk, consume without buffering */
+	/* junk/BODY, consume without buffering */
	*pconsumed += 1;
	++buf;
	--blen;
+	++skip_len;
	}
	if(blen && buf[0] == '$') {
	/* possible start of an RTP message, buffer */
+	if(skip_len) {
+	/* end of junk/BODY bytes, flush */
+	result = rtp_write_body_junk(data,
+	(char *)(buf - skip_len), skip_len);
+	skip_len = 0;
+	if(result)
+	goto out;
+	}
	if(Curl_dyn_addn(&rtspc->buf, buf, 1)) {
	result = CURLE_OUT_OF_MEMORY;
	goto out;
@@ -650,35 +680,22 @@ static CURLcode rtsp_filter_rtp(struct Curl_easy *data,
	if(!(data->state.rtp_channel_mask[idx] & (1 << off))) {
	/* invalid channel number, junk or BODY data */
	rtspc->state = RTP_PARSE_SKIP;
-	if(in_body) {
-	/* we do not consume this byte, it is BODY data */
-	DEBUGF(infof(data, "RTSP: invalid RTP channel %d in BODY, "
-	"treating as BODY data", idx));
-	if(*pconsumed == 0) {
-	/* We did not consume the initial '$' in our buffer, but had
-	* it from an earlier call. We cannot un-consume it and have
-	* to write it directly as BODY data */
-	result = Curl_client_write(data, CLIENTWRITE_BODY,
-	Curl_dyn_ptr(&rtspc->buf), 1);
-	Curl_dyn_free(&rtspc->buf);
-	if(result)
-	goto out;
-	}
-	else {
-	/* un-consume the '$' and leave */
-	Curl_dyn_free(&rtspc->buf);
-	*pconsumed -= 1;
-	--buf;
-	++blen;
+	DEBUGASSERT(skip_len == 0);
+	/* we do not consume this byte, it is BODY data */
+	DEBUGF(infof(data, "RTSP: invalid RTP channel %d, skipping", idx));
+	if(*pconsumed == 0) {
+	/* We did not consume the initial '$' in our buffer, but had
+	* it from an earlier call. We cannot un-consume it and have
+	* to write it directly as BODY data */
+	result = rtp_write_body_junk(data, Curl_dyn_ptr(&rtspc->buf), 1);
+	if(result)
	goto out;
-	}
	}
	else {
-	/* not BODY, forget the junk '$'. Do not consume this byte,
-	* it might be a start */
-	infof(data, "RTSP: invalid RTP channel %d, skipping", idx);
-	Curl_dyn_free(&rtspc->buf);
+	/* count the '$' as skip and continue */
+	skip_len = 1;
	}
+	Curl_dyn_free(&rtspc->buf);
	break;
	}
	/* a valid channel, so we expect this to be a real RTP message */
@@ -754,52 +771,49 @@ static CURLcode rtsp_filter_rtp(struct Curl_easy *data,
	}
	}
	out:
+	if(!result && skip_len)
+	result = rtp_write_body_junk(data, (char *)(buf - skip_len), skip_len);
	return result;
	}

-	static CURLcode rtsp_rtp_readwrite(struct Curl_easy *data,
-	struct connectdata *conn,
-	const char *buf,
-	size_t blen,
-	size_t *pconsumed,
-	bool *readmore)
+	static CURLcode rtsp_rtp_write_resp(struct Curl_easy *data,
+	const char *buf,
+	size_t blen,
+	bool is_eos,
+	bool *done)
	{
-	struct rtsp_conn *rtspc = &(conn->proto.rtspc);
+	struct rtsp_conn *rtspc = &(data->conn->proto.rtspc);
	CURLcode result = CURLE_OK;
	size_t consumed = 0;
-	bool in_body;

	if(!data->req.header)
	rtspc->in_header = FALSE;
-	in_body = (data->req.headerline && !rtspc->in_header) &&
-	(data->req.size >= 0) &&
-	(data->req.bytecount < data->req.size);
-
-	*readmore = FALSE;
-	*pconsumed = 0;
+	*done = FALSE;
	if(!blen) {
	goto out;
	}

+	DEBUGF(infof(data, "rtsp_rtp_write_resp(len=%zu, in_header=%d, eos=%d)",
+	blen, rtspc->in_header, is_eos));
+
	/* If header parsing is not onging, extract RTP messages */
	if(!rtspc->in_header) {
-	result = rtsp_filter_rtp(data, conn, buf, blen, in_body, &consumed);
+	result = rtsp_filter_rtp(data, buf, blen, &consumed);
	if(result)
	goto out;
-	*pconsumed += consumed;
	buf += consumed;
	blen -= consumed;
+	/* either we consumed all or are at the start of header parsing */
+	DEBUGASSERT(blen == 0 \|\| data->req.header);
	}

	/* we want to parse headers, do so */
	if(data->req.header && blen) {
	rtspc->in_header = TRUE;
-	result = Curl_http_readwrite_headers(data, conn, buf, blen,
-	&consumed);
+	result = Curl_http_write_resp_hds(data, buf, blen, &consumed, done);
	if(result)
	goto out;

-	*pconsumed += consumed;
	buf += consumed;
	blen -= consumed;

@@ -807,26 +821,39 @@ static CURLcode rtsp_rtp_readwrite(struct Curl_easy *data,
	rtspc->in_header = FALSE;

	if(!rtspc->in_header) {
-	/* If header parsing is done and data left, extract RTP messages */
-	in_body = (data->req.headerline && !rtspc->in_header) &&
-	(data->req.size >= 0) &&
-	(data->req.bytecount < data->req.size);
-	result = rtsp_filter_rtp(data, conn, buf, blen, in_body, &consumed);
+	/* If header parsing is done, extract interleaved RTP messages */
+	if((data->set.rtspreq == RTSPREQ_DESCRIBE) && (data->req.size <= -1)) {
+	/* Respect section 4.4 of rfc2326: If the Content-Length header is
+	absent, a length 0 must be assumed. It will prevent libcurl from
+	hanging on DESCRIBE request that got refused for whatever
+	reason */
+	data->req.download_done = TRUE;
+	}
+	result = rtsp_filter_rtp(data, buf, blen, &consumed);
	if(result)
	goto out;
-	*pconsumed += consumed;
+	blen -= consumed;
	}
	}

	if(rtspc->state != RTP_PARSE_SKIP)
-	*readmore = TRUE;
+	*done = FALSE;
+	/* we MUST have consumed all bytes */
+	DEBUGF(infof(data, "rtsp_rtp_write_resp(len=%zu, in_header=%d, done=%d)",
+	blen, rtspc->in_header, *done));
+	DEBUGASSERT(blen == 0);
+	if(!result && is_eos) {
+	result = Curl_client_write(data, CLIENTWRITE_BODY\|CLIENTWRITE_EOS,
+	(char *)buf, 0);
+	}

	out:
-	if(!*readmore && data->set.rtspreq == RTSPREQ_RECEIVE) {
+	if((data->set.rtspreq == RTSPREQ_RECEIVE) &&
+	(rtspc->state == RTP_PARSE_SKIP)) {
	/* In special mode RECEIVE, we just process one chunk of network
	* data, so we stop the transfer here, if we have no incomplete
	* RTP message pending. */
-	data->req.keepon &= ~KEEP_RECV;
+	data->req.download_done = TRUE;
	}
	return result;
	}

lib/sendf.c+51 -25

@@ -404,10 +404,12 @@ CURLcode Curl_client_write(struct Curl_easy *data,
	#endif
	/* it is one of those, at least */
	DEBUGASSERT(type & (CLIENTWRITE_BODY\|CLIENTWRITE_HEADER\|CLIENTWRITE_INFO));
-	/* BODY is only BODY */
-	DEBUGASSERT(!(type & CLIENTWRITE_BODY) \|\| (type == CLIENTWRITE_BODY));
-	/* INFO is only INFO */
-	DEBUGASSERT(!(type & CLIENTWRITE_INFO) \|\| (type == CLIENTWRITE_INFO));
+	/* BODY is only BODY (with optional EOS) */
+	DEBUGASSERT(!(type & CLIENTWRITE_BODY) \|\|
+	((type & ~(CLIENTWRITE_BODY\|CLIENTWRITE_EOS)) == 0));
+	/* INFO is only INFO (with optional EOS) */
+	DEBUGASSERT(!(type & CLIENTWRITE_INFO) \|\|
+	((type & ~(CLIENTWRITE_INFO\|CLIENTWRITE_EOS)) == 0));

	if(!data->req.writer_stack) {
	result = do_init_stack(data);
@@ -477,8 +479,6 @@ CURLcode Curl_cwriter_write(struct Curl_easy *data,
	struct Curl_cwriter *writer, int type,
	const char *buf, size_t nbytes)
	{
-	if(!nbytes)
-	return CURLE_OK;
	if(!writer)
	return CURLE_WRITE_ERROR;
	return writer->cwt->do_write(data, writer, type, buf, nbytes);
@@ -556,7 +556,6 @@ static CURLcode cw_download_write(struct Curl_easy *data,
	{
	CURLcode result;
	size_t nwrite, excess_len = 0;
-	const char *excess_data = NULL;

	if(!(type & CLIENTWRITE_BODY)) {
	if((type & CLIENTWRITE_CONNECT) && data->set.suppress_connect_headers)
@@ -564,13 +563,38 @@ static CURLcode cw_download_write(struct Curl_easy *data,
	return Curl_cwriter_write(data, writer->next, type, buf, nbytes);
	}

+	if(!data->req.bytecount) {
+	Curl_pgrsTime(data, TIMER_STARTTRANSFER);
+	if(data->req.exp100 > EXP100_SEND_DATA)
+	/* set time stamp to compare with when waiting for the 100 */
+	data->req.start100 = Curl_now();
+	}
+
+	/* Here, we deal with REAL BODY bytes. All filtering and transfer
+	* encodings have been applied and only the true content, e.g. BODY,
+	* bytes are passed here.
+	* This allows us to check sizes, update stats, etc. independent
+	* from the protocol in play. */
+
+	if(data->req.no_body && nbytes > 0) {
+	/* BODY arrives although we want none, bail out */
+	streamclose(data->conn, "ignoring body");
+	DEBUGF(infof(data, "did not want a BODY, but seeing %zu bytes",
+	nbytes));
+	data->req.download_done = TRUE;
+	return CURLE_WEIRD_SERVER_REPLY;
+	}
+
+	/* Determine if we see any bytes in excess to what is allowed.
+	* We write the allowed bytes and handle excess further below.
+	* This gives deterministic BODY writes on varying buffer receive
+	* lengths. */
	nwrite = nbytes;
	if(-1 != data->req.maxdownload) {
	size_t wmax = get_max_body_write_len(data, data->req.maxdownload);
	if(nwrite > wmax) {
	excess_len = nbytes - wmax;
	nwrite = wmax;
-	excess_data = buf + nwrite;
	}

	if(nwrite == wmax) {
@@ -578,6 +602,8 @@ static CURLcode cw_download_write(struct Curl_easy *data,
	}
	}

+	/* Error on too large filesize is handled below, after writing
+	* the permitted bytes */
	if(data->set.max_filesize) {
	size_t wmax = get_max_body_write_len(data, data->set.max_filesize);
	if(nwrite > wmax) {
@@ -585,6 +611,7 @@ static CURLcode cw_download_write(struct Curl_easy *data,
	}
	}

+	/* Update stats, write and report progress */
	data->req.bytecount += nwrite;
	++data->req.bodywrites;
	if(!data->req.ignorebody && nwrite) {
@@ -597,23 +624,7 @@ static CURLcode cw_download_write(struct Curl_easy *data,
	return result;

	if(excess_len) {
-	if(data->conn->handler->readwrite) {
-	/* RTSP hack moved from transfer loop to here */
-	bool readmore = FALSE; /* indicates data is incomplete, need more */
-	size_t consumed = 0;
-	result = data->conn->handler->readwrite(data, data->conn,
-	excess_data, excess_len,
-	&consumed, &readmore);
-	if(result)
-	return result;
-	DEBUGASSERT(consumed <= excess_len);
-	excess_len -= consumed;
-	if(readmore) {
-	data->req.download_done = FALSE;
-	data->req.keepon \|= KEEP_RECV; /* we're not done reading */
-	}
-	}
-	if(excess_len && !data->req.ignorebody) {
+	if(!data->req.ignorebody) {
	infof(data,
	"Excess found writing body:"
	" excess = %zu"
@@ -762,6 +773,21 @@ CURLcode Curl_cwriter_add(struct Curl_easy *data,
	return CURLE_OK;
	}

+	void Curl_cwriter_remove_by_name(struct Curl_easy *data,
+	const char *name)
+	{
+	struct Curl_cwriter **anchor = &data->req.writer_stack;
+
+	while(*anchor) {
+	if(!strcmp(name, (*anchor)->cwt->name)) {
+	struct Curl_cwriter w = (anchor);
+	*anchor = w->next;
+	Curl_cwriter_free(data, w);
+	continue;
+	}
+	anchor = &((*anchor)->next);
+	}
+	}

	/*
	* Internal read-from-socket function. This is meant to deal with plain

lib/sendf.h+4 -0

@@ -49,6 +49,7 @@
	#define CLIENTWRITE_CONNECT (1<<4) /* a CONNECT related HEADER */
	#define CLIENTWRITE_1XX (1<<5) /* a 1xx response related HEADER */
	#define CLIENTWRITE_TRAILER (1<<6) /* a trailer HEADER */
+	#define CLIENTWRITE_EOS (1<<7) /* End Of transfer download Stream */

	/**
	* Write `len` bytes at `prt` to the client. `type` indicates what
@@ -147,6 +148,9 @@ size_t Curl_cwriter_count(struct Curl_easy *data, Curl_cwriter_phase phase);
	CURLcode Curl_cwriter_add(struct Curl_easy *data,
	struct Curl_cwriter *writer);

+	void Curl_cwriter_remove_by_name(struct Curl_easy *data,
+	const char *name);
+
	/**
	* Convenience method for calling `writer->do_write()` that
	* checks for NULL writer.

lib/smb.c+2 -2

@@ -272,7 +272,7 @@ const struct Curl_handler Curl_handler_smb = {
	ZERO_NULL, /* domore_getsock */
	ZERO_NULL, /* perform_getsock */
	smb_disconnect, /* disconnect */
-	ZERO_NULL, /* readwrite */
+	ZERO_NULL, /* write_resp */
	ZERO_NULL, /* connection_check */
	ZERO_NULL, /* attach connection */
	PORT_SMB, /* defport */
@@ -299,7 +299,7 @@ const struct Curl_handler Curl_handler_smbs = {
	ZERO_NULL, /* domore_getsock */
	ZERO_NULL, /* perform_getsock */
	smb_disconnect, /* disconnect */
-	ZERO_NULL, /* readwrite */
+	ZERO_NULL, /* write_resp */
	ZERO_NULL, /* connection_check */
	ZERO_NULL, /* attach connection */
	PORT_SMBS, /* defport */

lib/smtp.c+2 -2

@@ -130,7 +130,7 @@ const struct Curl_handler Curl_handler_smtp = {
	ZERO_NULL, /* domore_getsock */
	ZERO_NULL, /* perform_getsock */
	smtp_disconnect, /* disconnect */
-	ZERO_NULL, /* readwrite */
+	ZERO_NULL, /* write_resp */
	ZERO_NULL, /* connection_check */
	ZERO_NULL, /* attach connection */
	PORT_SMTP, /* defport */
@@ -159,7 +159,7 @@ const struct Curl_handler Curl_handler_smtps = {
	ZERO_NULL, /* domore_getsock */
	ZERO_NULL, /* perform_getsock */
	smtp_disconnect, /* disconnect */
-	ZERO_NULL, /* readwrite */
+	ZERO_NULL, /* write_resp */
	ZERO_NULL, /* connection_check */
	ZERO_NULL, /* attach connection */
	PORT_SMTPS, /* defport */

lib/telnet.c+1 -1

@@ -186,7 +186,7 @@ const struct Curl_handler Curl_handler_telnet = {
	ZERO_NULL, /* domore_getsock */
	ZERO_NULL, /* perform_getsock */
	ZERO_NULL, /* disconnect */
-	ZERO_NULL, /* readwrite */
+	ZERO_NULL, /* write_resp */
	ZERO_NULL, /* connection_check */
	ZERO_NULL, /* attach connection */
	PORT_TELNET, /* defport */

lib/tftp.c+1 -1

@@ -181,7 +181,7 @@ const struct Curl_handler Curl_handler_tftp = {
	ZERO_NULL, /* domore_getsock */
	ZERO_NULL, /* perform_getsock */
	tftp_disconnect, /* disconnect */
-	ZERO_NULL, /* readwrite */
+	ZERO_NULL, /* write_resp */
	ZERO_NULL, /* connection_check */
	ZERO_NULL, /* attach connection */
	PORT_TFTP, /* defport */

lib/transfer.c+124 -278

@@ -413,23 +413,64 @@ bool Curl_meets_timecondition(struct Curl_easy *data, time_t timeofdoc)
	return TRUE;
	}

+	/**
+	* Receive raw response data for the transfer.
+	* @param data the transfer
+	* @param buf buffer to keep response data received
+	* @param blen length of `buf`
+	* @param eos_reliable if EOS detection in underlying connection is reliable
+	* @param err error code in case of -1 return
+	* @return number of bytes read or -1 for error
+	*/
+	static ssize_t Curl_xfer_recv_resp(struct Curl_easy *data,
+	char *buf, size_t blen,
+	bool eos_reliable,
+	CURLcode *err)
+	{
+	ssize_t nread;
+
+	DEBUGASSERT(blen > 0);
+	/* If we are reading BODY data and the connection does NOT handle EOF
+	* and we know the size of the BODY data, limit the read amount */
+	if(!eos_reliable && !data->req.header && data->req.size != -1) {
+	curl_off_t totalleft = data->req.size - data->req.bytecount;
+	if(totalleft <= 0)
+	blen = 0;
+	else if(totalleft < (curl_off_t)blen)
+	blen = (size_t)totalleft;
+	}
+
+	if(!blen) {
+	/* want nothing - continue as if read nothing. */
+	DEBUGF(infof(data, "readwrite_data: we're done"));
+	*err = CURLE_OK;
+	return 0;
+	}
+
+	*err = Curl_read(data, data->conn->sockfd, buf, blen, &nread);
+	if(*err)
+	return -1;
+	DEBUGASSERT(nread >= 0);
+	*err = CURLE_OK;
+	return nread;
+	}
+
	/*
	* Go ahead and do a read if we have a readable socket or if
	* the stream was rewound (in which case we have data in a
	* buffer)
	*/
	static CURLcode readwrite_data(struct Curl_easy *data,
-	struct connectdata *conn,
	struct SingleRequest *k,
	int didwhat, bool done)
	{
+	struct connectdata *conn = data->conn;
	CURLcode result = CURLE_OK;
	char *buf;
	size_t blen;
-	size_t consumed;
	int maxloops = 10;
	curl_off_t total_received = 0;
-	bool data_eof_handled = FALSE;
+	bool is_multiplex = FALSE;

	DEBUGASSERT(data->state.buffer);
	*done = FALSE;
@@ -437,290 +478,72 @@ static CURLcode readwrite_data(struct Curl_easy *data,
	/* This is where we loop until we have read everything there is to
	read or we get a CURLE_AGAIN */
	do {
-	bool is_empty_data = FALSE;
-	size_t bytestoread = data->set.buffer_size;
-
-	/* For HTTP/2 and HTTP/3, read data without caring about the content
-	length. This is safe because body in HTTP/2 is always segmented
-	thanks to its framing layer. Meanwhile, we have to call Curl_read
-	to ensure that http2_handle_stream_close is called when we read all
-	incoming bytes for a particular stream. */
-	bool is_http3 = Curl_conn_is_http3(data, conn, FIRSTSOCKET);
-	data_eof_handled = is_http3 \|\| Curl_conn_is_http2(data, conn, FIRSTSOCKET);
-
-	if(data->set.max_recv_speed) {
-	/* Limit the amount we read here, break on reaching it */
-	curl_off_t net_limit = data->set.max_recv_speed - total_received;
-	if(net_limit <= 0)
-	break;
-	if((size_t)net_limit < bytestoread)
-	bytestoread = (size_t)net_limit;
+	bool is_eos = FALSE;
+	size_t bytestoread;
+	ssize_t nread;
+
+	if(!is_multiplex) {
+	/* Multiplexed connection have inherent handling of EOF and we do not
+	* have to carefully restrict the amount we try to read.
+	* Multiplexed changes only in one direction. */
+	is_multiplex = Curl_conn_is_multiplex(conn, FIRSTSOCKET);
	}

-	/* Each loop iteration starts with a fresh buffer and handles
-	* all data read into it. */
	buf = data->state.buffer;
	blen = 0;
+	bytestoread = data->set.buffer_size;

-	/* If we are reading BODY data and the connection does NOT handle EOF
-	* and we know the size of the BODY data, limit the read amount */
-	if(!k->header && !data_eof_handled && k->size != -1) {
-	curl_off_t totalleft = k->size - k->bytecount;
-	if(totalleft <= 0)
-	bytestoread = 0;
-	else if(totalleft < (curl_off_t)bytestoread)
-	bytestoread = (size_t)totalleft;
+	/* Observe any imposed speed limit */
+	if(bytestoread && data->set.max_recv_speed) {
+	curl_off_t net_limit = data->set.max_recv_speed - total_received;
+	if(net_limit <= 0)
+	break;
+	if((size_t)net_limit < bytestoread)
+	bytestoread = (size_t)net_limit;
	}

-	if(bytestoread) {
-	/* receive data from the network! */
-	ssize_t nread; /* number of bytes read */
-	result = Curl_read(data, conn->sockfd, buf, bytestoread, &nread);
+	nread = Curl_xfer_recv_resp(data, buf, bytestoread,
+	is_multiplex, &result);
+	if(nread < 0) {
	if(CURLE_AGAIN == result) {
	result = CURLE_OK;
	break; /* get out of loop */
	}
-	else if(result)
-	goto out;
-	DEBUGASSERT(nread >= 0);
-	blen = (size_t)nread;
-	}
-	else {
-	/* read nothing but since we wanted nothing we consider this an OK
-	situation to proceed from */
-	DEBUGF(infof(data, "readwrite_data: we're done"));
-	}
-
-	if(!k->bytecount) {
-	Curl_pgrsTime(data, TIMER_STARTTRANSFER);
-	if(k->exp100 > EXP100_SEND_DATA)
-	/* set time stamp to compare with when waiting for the 100 */
-	k->start100 = Curl_now();
+	goto out; /* real error */
	}

+	/* We only get a 0-length read on EndOfStream */
+	blen = (size_t)nread;
+	is_eos = (blen == 0);
	*didwhat \|= KEEP_RECV;
-	/* indicates data of zero size, i.e. empty file */
-	is_empty_data = ((blen == 0) && (k->bodywrites == 0)) ? TRUE : FALSE;
-
-	if(0 < blen \|\| is_empty_data) {
-	/* data->state.buffer is allocated 1 byte larger than
-	* data->set.buffer_size admits. wink */
-	/* TODO: we should really not rely on this being 0-terminated, since
-	* the actual data read might contain 0s. */
-	buf[blen] = 0;
-	}

	if(!blen) {
	/* if we receive 0 or less here, either the data transfer is done or the
	server closed the connection and we bail out from this! */
-	if(data_eof_handled)
+	if(is_multiplex)
	DEBUGF(infof(data, "nread == 0, stream closed, bailing"));
	else
	DEBUGF(infof(data, "nread <= 0, server closed connection, bailing"));
-	k->keepon = 0; /* stop sending as well */
-	if(!is_empty_data)
-	break;
-	}
-
-	if(conn->handler->readwrite) {
-	bool readmore = FALSE; /* indicates data is incomplete, need more */
-	consumed = 0;
-	result = conn->handler->readwrite(data, conn, buf, blen,
-	&consumed, &readmore);
-	if(result)
-	goto out;
-	if(readmore)
-	break;
-	buf += consumed;
-	blen -= consumed;
-	if(k->download_done) {
-	/* We've stopped dealing with input, get out of the do-while loop */
-	if(blen > 0) {
-	infof(data,
-	"Excess found:"
-	" excess = %zu"
-	" url = %s (zero-length body)",
-	blen, data->state.up.path);
-	}
-
-	/* we make sure that this socket isn't read more now */
-	k->keepon &= ~KEEP_RECV;
+	if(k->eos_written) { /* already did write this to client, leave */
+	k->keepon = 0; /* stop sending as well */
	break;
	}
	}
+	total_received += blen;

-	#ifndef CURL_DISABLE_HTTP
-	/* Since this is a two-state thing, we check if we are parsing
-	headers at the moment or not. */
-	if(k->header) {
-	consumed = 0;
-	result = Curl_http_readwrite_headers(data, conn, buf, blen, &consumed);
-	if(result)
-	goto out;
-	buf += consumed;
-	blen -= consumed;
-
-	if(conn->handler->readwrite &&
-	(k->maxdownload <= 0 && blen > 0)) {
-	bool readmore = FALSE; /* indicates data is incomplete, need more */
-	consumed = 0;
-	result = conn->handler->readwrite(data, conn, buf, blen,
-	&consumed, &readmore);
-	if(result)
-	goto out;
-	if(readmore)
-	break;
-	buf += consumed;
-	blen -= consumed;
-	}
-
-	if(k->download_done) {
-	/* We've stopped dealing with input, get out of the do-while loop */
-	if(blen > 0) {
-	infof(data,
-	"Excess found:"
-	" excess = %zu"
-	" url = %s (zero-length body)",
-	blen, data->state.up.path);
-	}
-
-	/* we make sure that this socket isn't read more now */
-	k->keepon &= ~KEEP_RECV;
-	break;
-	}
-	}
-	#endif /* CURL_DISABLE_HTTP */
-
-
-	/* This is not an 'else if' since it may be a rest from the header
-	parsing, where the beginning of the buffer is headers and the end
-	is non-headers. */
-	if(!k->header && (blen > 0 \|\| is_empty_data)) {
-
-	if(data->req.no_body && blen > 0) {
-	/* data arrives although we want none, bail out */
-	streamclose(conn, "ignoring body");
-	DEBUGF(infof(data, "did not want a BODY, but seeing %zu bytes",
-	blen));
-	*done = TRUE;
-	result = CURLE_WEIRD_SERVER_REPLY;
-	goto out;
-	}
-
-	#ifndef CURL_DISABLE_HTTP
-	if(0 == k->bodywrites && !is_empty_data) {
-	/* These checks are only made the first time we are about to
-	write a piece of the body */
-	if(conn->handler->protocol&(PROTO_FAMILY_HTTP\|CURLPROTO_RTSP)) {
-	/* HTTP-only checks */
-	result = Curl_http_firstwrite(data, conn, done);
-	if(result \|\| *done)
-	goto out;
-	}
-	} /* this is the first time we write a body part */
-	#endif /* CURL_DISABLE_HTTP */
-
-	#ifndef CURL_DISABLE_HTTP
-	if(k->chunk) {
-	/*
-	* Here comes a chunked transfer flying and we need to decode this
-	* properly. While the name says read, this function both reads
-	* and writes away the data.
-	*/
-	CURLcode extra;
-	CHUNKcode res;
-
-	consumed = 0;
-	res = Curl_httpchunk_read(data, buf, blen, &consumed, &extra);
-
-	if(CHUNKE_OK < res) {
-	if(CHUNKE_PASSTHRU_ERROR == res) {
-	failf(data, "Failed reading the chunked-encoded stream");
-	result = extra;
-	goto out;
-	}
-	failf(data, "%s in chunked-encoding", Curl_chunked_strerror(res));
-	result = CURLE_RECV_ERROR;
-	goto out;
-	}
-
-	buf += consumed;
-	blen -= consumed;
-	if(CHUNKE_STOP == res) {
-	/* we're done reading chunks! */
-	k->keepon &= ~KEEP_RECV; /* read no more */
-	/* chunks read successfully, download is complete */
-	k->download_done = TRUE;
-
-	/* N number of bytes at the end of the str buffer that weren't
-	written to the client. */
-	if(conn->chunk.datasize) {
-	infof(data, "Leftovers after chunking: % "
-	CURL_FORMAT_CURL_OFF_T "u bytes",
-	conn->chunk.datasize);
-	}
-	}
-	/* If it returned OK, we just keep going */
-	}
-	#endif /* CURL_DISABLE_HTTP */
-
-	total_received += blen;
-
-	if(!k->chunk && (blen \|\| k->badheader \|\| is_empty_data)) {
-	/* If this is chunky transfer, it was already written */
-
-	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);
-
-	/* Don't let excess data pollute body writes */
-	if(k->maxdownload != -1 && (curl_off_t)headlen > k->maxdownload)
-	headlen = (size_t)k->maxdownload;
-
-	result = Curl_client_write(data, CLIENTWRITE_BODY,
-	Curl_dyn_ptr(&data->state.headerb),
-	headlen);
-	if(result)
-	goto out;
-	}
-
-	if(blen) {
-	#ifndef CURL_DISABLE_POP3
-	if(conn->handler->protocol & PROTO_FAMILY_POP3) {
-	result = k->ignorebody? CURLE_OK :
-	Curl_pop3_write(data, buf, blen);
-	}
-	else
-	#endif /* CURL_DISABLE_POP3 */
-	result = Curl_client_write(data, CLIENTWRITE_BODY, buf, blen);
-	}
-	k->badheader = FALSE; /* taken care of now */
-
-	if(result)
-	goto out;
-	}
-
-	if(k->download_done && !is_http3) {
-	/* HTTP/3 over QUIC should keep reading until QUIC connection
-	is closed. In contrast to HTTP/2 which can stop reading
-	from TCP connection, HTTP/3 over QUIC needs ACK from server
-	to ensure stream closure. It should keep reading. */
-	k->keepon &= ~KEEP_RECV; /* we're done reading */
-	}
-	} /* if(!header and data to read) */
+	result = Curl_xfer_write_resp(data, buf, blen, is_eos, done);
+	if(result \|\| *done)
+	goto out;

-	if(is_empty_data) {
-	/* if we received nothing, the server closed the connection and we
-	are done */
-	k->keepon &= ~KEEP_RECV;
-	k->download_done = TRUE;
+	/* if we are done, we stop receiving. On multiplexed connections,
+	* we should read the EOS. Which may arrive as meta data after
+	* the bytes. Not taking it in might lead to RST of streams. */
+	if((!is_multiplex && data->req.download_done) \|\| is_eos) {
+	data->req.keepon &= ~KEEP_RECV;
	}
-
-	if((k->keepon & KEEP_RECV_PAUSE) \|\| !(k->keepon & KEEP_RECV)) {
-	/* this is a paused or stopped transfer */
+	/* if we are PAUSEd or stopped receiving, leave the loop */
+	if((k->keepon & KEEP_RECV_PAUSE) \|\| !(k->keepon & KEEP_RECV))
	break;
-	}

	} while(maxloops-- && data_pending(data));

@@ -732,7 +555,7 @@ static CURLcode readwrite_data(struct Curl_easy *data,
	}

	if(((k->keepon & (KEEP_RECV\|KEEP_SEND)) == KEEP_SEND) &&
-	(conn->bits.close \|\| data_eof_handled)) {
+	(conn->bits.close \|\| is_multiplex)) {
	/* When we've read the entire thing and the close bit is set, the server
	may now close the connection. If there's now any kind of sending going
	on from our side, we need to stop that immediately. */
@@ -1038,10 +861,10 @@ static int select_bits_paused(struct Curl_easy *data, int select_bits)
	* Curl_readwrite() is the low-level function to be called when data is to
	* be read and written to/from the connection.
	*/
-	CURLcode Curl_readwrite(struct connectdata *conn,
-	struct Curl_easy *data,
+	CURLcode Curl_readwrite(struct Curl_easy *data,
	bool *done)
	{
+	struct connectdata *conn = data->conn;
	struct SingleRequest *k = &data->req;
	CURLcode result;
	struct curltime now;
@@ -1095,7 +918,7 @@ CURLcode Curl_readwrite(struct connectdata *conn,
	the stream was rewound (in which case we have data in a
	buffer) */
	if((k->keepon & KEEP_RECV) && (select_bits & CURL_CSELECT_IN)) {
-	result = readwrite_data(data, conn, k, &didwhat, done);
+	result = readwrite_data(data, k, &didwhat, done);
	if(result \|\| *done)
	goto out;
	}
@@ -1191,21 +1014,6 @@ CURLcode Curl_readwrite(struct connectdata *conn,
	result = CURLE_PARTIAL_FILE;
	goto out;
	}
-	if(!(data->req.no_body) && k->chunk &&
-	(conn->chunk.state != CHUNK_STOP)) {
-	/*
-	* In chunked mode, return an error if the connection is closed prior to
-	* the empty (terminating) chunk is read.
-	*
-	* The condition above used to check for
-	* conn->proto.http->chunk.datasize != 0 which is true after reading
-	* any chunk, not just the empty chunk.
-	*
-	*/
-	failf(data, "transfer closed with outstanding read data remaining");
-	result = CURLE_PARTIAL_FILE;
-	goto out;
-	}
	if(Curl_pgrsUpdate(data)) {
	result = CURLE_ABORTED_BY_CALLBACK;
	goto out;
@@ -1866,3 +1674,41 @@ Curl_setup_transfer(
	} /* if(k->getheader \|\| !data->req.no_body) */

	}
+
+	CURLcode Curl_xfer_write_resp(struct Curl_easy *data,
+	char *buf, size_t blen,
+	bool is_eos, bool *done)
+	{
+	CURLcode result = CURLE_OK;
+
+	if(data->conn->handler->write_resp) {
+	/* protocol handlers offering this function take full responsibility
+	* for writing all received download data to the client. */
+	result = data->conn->handler->write_resp(data, buf, blen, is_eos, done);
+	}
+	else {
+	/* No special handling by protocol handler, write all received data
+	* as BODY to the client. */
+	if(blen \|\| is_eos) {
+	int cwtype = CLIENTWRITE_BODY;
+	if(is_eos)
+	cwtype \|= CLIENTWRITE_EOS;
+
+	#ifndef CURL_DISABLE_POP3
+	if(blen && data->conn->handler->protocol & PROTO_FAMILY_POP3) {
+	result = data->req.ignorebody? CURLE_OK :
+	Curl_pop3_write(data, buf, blen);
+	}
+	else
+	#endif /* CURL_DISABLE_POP3 */
+	result = Curl_client_write(data, cwtype, buf, blen);
+	}
+	}
+
+	if(!result && is_eos) {
+	/* If we wrote the EOS, we are definitely done */
+	data->req.eos_written = TRUE;
+	data->req.download_done = TRUE;
+	}
+	return result;
+	}

lib/transfer.h+20 -2

@@ -45,8 +45,9 @@ typedef enum {

	CURLcode Curl_follow(struct Curl_easy data, char newurl,
	followtype type);
-	CURLcode Curl_readwrite(struct connectdata *conn,
-	struct Curl_easy data, bool done);
+	CURLcode Curl_readwrite(struct Curl_easy data, bool done);
+	int Curl_single_getsock(struct Curl_easy *data,
+	struct connectdata conn, curl_socket_t socks);
	CURLcode Curl_fillreadbuffer(struct Curl_easy *data, size_t bytes,
	size_t *nreadp);
	CURLcode Curl_retry_request(struct Curl_easy data, char *url);
@@ -56,6 +57,23 @@ CURLcode Curl_get_upload_buffer(struct Curl_easy *data);
	CURLcode Curl_done_sending(struct Curl_easy *data,
	struct SingleRequest *k);

+	/**
+	* Write the transfer raw response bytes, as received from the connection.
+	* Will handle all passed bytes or return an error. By default, this will
+	* write the bytes as BODY to the client. Protocols may provide a
+	* "write_resp" callback in their handler to add specific treatment. E.g.
+	* HTTP parses response headers and passes them differently to the client.
+	* @param data the transfer
+	* @param buf the raw response bytes
+	* @param blen the amount of bytes in `buf`
+	* @param is_eos TRUE iff the connection indicates this to be the last
+	* bytes of the response
+	* @param done on returnm, TRUE iff the response is complete
+	*/
+	CURLcode Curl_xfer_write_resp(struct Curl_easy *data,
+	char *buf, size_t blen,
+	bool is_eos, bool *done);
+
	/* This sets up a forthcoming transfer */
	void
	Curl_setup_transfer (struct Curl_easy *data,

lib/url.c+0 -3

@@ -592,9 +592,6 @@ static void conn_free(struct Curl_easy data, struct connectdata conn)
	Curl_safefree(conn->sasl_authzid);
	Curl_safefree(conn->options);
	Curl_safefree(conn->oauth_bearer);
-	#ifndef CURL_DISABLE_HTTP
-	Curl_dyn_free(&conn->trailer);
-	#endif
	Curl_safefree(conn->host.rawalloc); /* host name buffer */
	Curl_safefree(conn->conn_to_host.rawalloc); /* host name buffer */
	Curl_safefree(conn->hostname_resolve);

lib/urldata.h+7 -17

@@ -683,7 +683,8 @@ struct SingleRequest {
	enum expect100 exp100; /* expect 100 continue state */
	enum upgrade101 upgr101; /* 101 upgrade state */

-	/* Content unencoding stack. See sec 3.5, RFC2616. */
+	/* Client Writer stack, handles trasnfer- and content-encodings, protocol
+	* checks, pausing by client callbacks. */
	struct Curl_cwriter *writer_stack;
	time_t timeofdoc;
	long bodywrites;
@@ -730,11 +731,10 @@ struct SingleRequest {
	#ifndef CURL_DISABLE_COOKIES
	unsigned char setcookies;
	#endif
-	unsigned char writer_stack_depth; /* Unencoding stack depth. */
	BIT(header); /* incoming data has HTTP header */
-	BIT(badheader); /* header parsing found sth not a header */
	BIT(content_range); /* set TRUE if Content-Range: was found */
	BIT(download_done); /* set to TRUE when download is complete */
+	BIT(eos_written); /* iff EOS has been written to client */
	BIT(upload_done); /* set to TRUE when doing chunked transfer-encoding
	upload and we're uploading the last chunk */
	BIT(ignorebody); /* we read a response-body but we ignore it! */
@@ -816,10 +816,10 @@ struct Curl_handler {
	bool dead_connection);

	/* If used, this function gets called from transfer.c:readwrite_data() to
-	allow the protocol to do extra reads/writes */
-	CURLcode (readwrite)(struct Curl_easy data, struct connectdata *conn,
-	const char *buf, size_t blen,
-	size_t pconsumed, bool readmore);
+	allow the protocol to do extra handling in writing response to
+	the client. */
+	CURLcode (write_resp)(struct Curl_easy data, const char *buf, size_t blen,
+	bool is_eos, bool *done);

	/* This function can perform various checks on the connection. See
	CONNCHECK_* for more information about the checks that can be performed,
@@ -898,11 +898,6 @@ struct ldapconninfo;
	struct connectdata {
	struct Curl_llist_element bundle_node; /* conncache */

-	/* chunk is for HTTP chunked encoding, but is in the general connectdata
-	struct only because we can do just about any protocol through an HTTP
-	proxy and an HTTP proxy may in fact respond using chunked encoding */
-	struct Curl_chunker chunk;
-
	curl_closesocket_callback fclosesocket; /* function closing the socket(s) */
	void *closesocket_client;

@@ -1025,11 +1020,6 @@ struct connectdata {
	struct negotiatedata proxyneg; /* state data for proxy Negotiate auth */
	#endif

-	#ifndef CURL_DISABLE_HTTP
-	/* for chunked-encoded trailer */
-	struct dynbuf trailer;
-	#endif
-
	union {
	#ifndef CURL_DISABLE_FTP
	struct ftp_conn ftpc;

lib/vssh/libssh.c+2 -2

@@ -161,7 +161,7 @@ const struct Curl_handler Curl_handler_scp = {
	ZERO_NULL, /* domore_getsock */
	myssh_getsock, /* perform_getsock */
	scp_disconnect, /* disconnect */
-	ZERO_NULL, /* readwrite */
+	ZERO_NULL, /* write_resp */
	ZERO_NULL, /* connection_check */
	ZERO_NULL, /* attach connection */
	PORT_SSH, /* defport */
@@ -188,7 +188,7 @@ const struct Curl_handler Curl_handler_sftp = {
	ZERO_NULL, /* domore_getsock */
	myssh_getsock, /* perform_getsock */
	sftp_disconnect, /* disconnect */
-	ZERO_NULL, /* readwrite */
+	ZERO_NULL, /* write_resp */
	ZERO_NULL, /* connection_check */
	ZERO_NULL, /* attach connection */
	PORT_SSH, /* defport */

lib/vssh/libssh2.c+2 -2

@@ -138,7 +138,7 @@ const struct Curl_handler Curl_handler_scp = {
	ZERO_NULL, /* domore_getsock */
	ssh_getsock, /* perform_getsock */
	scp_disconnect, /* disconnect */
-	ZERO_NULL, /* readwrite */
+	ZERO_NULL, /* write_resp */
	ZERO_NULL, /* connection_check */
	ssh_attach, /* attach */
	PORT_SSH, /* defport */
@@ -167,7 +167,7 @@ const struct Curl_handler Curl_handler_sftp = {
	ZERO_NULL, /* domore_getsock */
	ssh_getsock, /* perform_getsock */
	sftp_disconnect, /* disconnect */
-	ZERO_NULL, /* readwrite */
+	ZERO_NULL, /* write_resp */
	ZERO_NULL, /* connection_check */
	ssh_attach, /* attach */
	PORT_SSH, /* defport */

lib/vssh/wolfssh.c+2 -2

@@ -93,7 +93,7 @@ const struct Curl_handler Curl_handler_scp = {
	ZERO_NULL, /* domore_getsock */
	wssh_getsock, /* perform_getsock */
	wscp_disconnect, /* disconnect */
-	ZERO_NULL, /* readwrite */
+	ZERO_NULL, /* write_resp */
	ZERO_NULL, /* connection_check */
	ZERO_NULL, /* attach connection */
	PORT_SSH, /* defport */
@@ -122,7 +122,7 @@ const struct Curl_handler Curl_handler_sftp = {
	ZERO_NULL, /* domore_getsock */
	wssh_getsock, /* perform_getsock */
	wsftp_disconnect, /* disconnect */
-	ZERO_NULL, /* readwrite */
+	ZERO_NULL, /* write_resp */
	ZERO_NULL, /* connection_check */
	ZERO_NULL, /* attach connection */
	PORT_SSH, /* defport */

scripts/singleuse.pl+1 -0

@@ -43,6 +43,7 @@ my $file = $ARGV[0];

	my %wl = (
	'curlx_uztoso' => 'cmdline tool use',
+	'Curl_xfer_write_resp' => 'internal api',
	);

	my %api = (

tests/libtest/lib568.c+1 -0

@@ -93,6 +93,7 @@ int test(char *URL)
	test_setopt(curl, CURLOPT_READDATA, sdpf);
	test_setopt(curl, CURLOPT_UPLOAD, 1L);
	test_setopt(curl, CURLOPT_INFILESIZE_LARGE, (curl_off_t) file_info.st_size);
+	test_setopt(curl, CURLOPT_VERBOSE, 1L);

	/* Do the ANNOUNCE */
	res = curl_easy_perform(curl);