← Commit list

14bcea074a

Stefan Eissing

2024-03-05

SUCCESS Duration: 95s

Subject

lib: enhance client reader resume + rewind

Binary

Download Binary (867 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 14bcea074a78227248b00bb6fb22462e0c1b65aa
Previous HEAD position was a5dd9435ee smpt: fix starttls
HEAD is now at 14bcea074a lib: enhance client reader resume + rewind

$ 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-config.1
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_sha512_256.lo
Removing lib/libcurl_la-curl_sha512_256.o
Removing lib/libcurl_la-curl_sspi.lo
Removing lib/libcurl_la-curl_sspi.o
Removing lib/libcurl_la-curl_threads.lo
Removing lib/libcurl_la-curl_threads.o
Removing lib/libcurl_la-curl_trc.lo
Removing lib/libcurl_la-curl_trc.o
Removing lib/libcurl_la-cw-out.lo
Removing lib/libcurl_la-cw-out.o
Removing lib/libcurl_la-dict.lo
Removing lib/libcurl_la-dict.o
Removing lib/libcurl_la-doh.lo
Removing lib/libcurl_la-doh.o
Removing lib/libcurl_la-dynbuf.lo
Removing lib/libcurl_la-dynbuf.o
Removing lib/libcurl_la-dynhds.lo
Removing lib/libcurl_la-dynhds.o
Removing lib/libcurl_la-easy.lo
Removing lib/libcurl_la-easy.o
Removing lib/libcurl_la-easygetopt.lo
Removing lib/libcurl_la-easygetopt.o
Removing lib/libcurl_la-easyoptions.lo
Removing lib/libcurl_la-easyoptions.o
Removing lib/libcurl_la-escape.lo
Removing lib/libcurl_la-escape.o
Removing lib/libcurl_la-file.lo
Removing lib/libcurl_la-file.o
Removing lib/libcurl_la-fileinfo.lo
Removing lib/libcurl_la-fileinfo.o
Removing lib/libcurl_la-fopen.lo
Removing lib/libcurl_la-fopen.o
Removing lib/libcurl_la-formdata.lo
Removing lib/libcurl_la-formdata.o
Removing lib/libcurl_la-ftp.lo
Removing lib/libcurl_la-ftp.o
Removing lib/libcurl_la-ftplistparser.lo
Removing lib/libcurl_la-ftplistparser.o
Removing lib/libcurl_la-getenv.lo
Removing lib/libcurl_la-getenv.o
Removing lib/libcurl_la-getinfo.lo
Removing lib/libcurl_la-getinfo.o
Removing lib/libcurl_la-gopher.lo
Removing lib/libcurl_la-gopher.o
Removing lib/libcurl_la-hash.lo
Removing lib/libcurl_la-hash.o
Removing lib/libcurl_la-headers.lo
Removing lib/libcurl_la-headers.o
Removing lib/libcurl_la-hmac.lo
Removing lib/libcurl_la-hmac.o
Removing lib/libcurl_la-hostasyn.lo
Removing lib/libcurl_la-hostasyn.o
Removing lib/libcurl_la-hostip.lo
Removing lib/libcurl_la-hostip.o
Removing lib/libcurl_la-hostip4.lo
Removing lib/libcurl_la-hostip4.o
Removing lib/libcurl_la-hostip6.lo
Removing lib/libcurl_la-hostip6.o
Removing lib/libcurl_la-hostsyn.lo
Removing lib/libcurl_la-hostsyn.o
Removing lib/libcurl_la-hsts.lo
Removing lib/libcurl_la-hsts.o
Removing lib/libcurl_la-http.lo
Removing lib/libcurl_la-http.o
Removing lib/libcurl_la-http1.lo
Removing lib/libcurl_la-http1.o
Removing lib/libcurl_la-http2.lo
Removing lib/libcurl_la-http2.o
Removing lib/libcurl_la-http_aws_sigv4.lo
Removing lib/libcurl_la-http_aws_sigv4.o
Removing lib/libcurl_la-http_chunks.lo
Removing lib/libcurl_la-http_chunks.o
Removing lib/libcurl_la-http_digest.lo
Removing lib/libcurl_la-http_digest.o
Removing lib/libcurl_la-http_negotiate.lo
Removing lib/libcurl_la-http_negotiate.o
Removing lib/libcurl_la-http_ntlm.lo
Removing lib/libcurl_la-http_ntlm.o
Removing lib/libcurl_la-http_proxy.lo
Removing lib/libcurl_la-http_proxy.o
Removing lib/libcurl_la-idn.lo
Removing lib/libcurl_la-idn.o
Removing lib/libcurl_la-if2ip.lo
Removing lib/libcurl_la-if2ip.o
Removing lib/libcurl_la-imap.lo
Removing lib/libcurl_la-imap.o
Removing lib/libcurl_la-inet_ntop.lo
Removing lib/libcurl_la-inet_ntop.o
Removing lib/libcurl_la-inet_pton.lo
Removing lib/libcurl_la-inet_pton.o
Removing lib/libcurl_la-krb5.lo
Removing lib/libcurl_la-krb5.o
Removing lib/libcurl_la-ldap.lo
Removing lib/libcurl_la-ldap.o
Removing lib/libcurl_la-llist.lo
Removing lib/libcurl_la-llist.o
Removing lib/libcurl_la-macos.lo
Removing lib/libcurl_la-macos.o
Removing lib/libcurl_la-md4.lo
Removing lib/libcurl_la-md4.o
Removing lib/libcurl_la-md5.lo
Removing lib/libcurl_la-md5.o
Removing lib/libcurl_la-memdebug.lo
Removing lib/libcurl_la-memdebug.o
Removing lib/libcurl_la-mime.lo
Removing lib/libcurl_la-mime.o
Removing lib/libcurl_la-mprintf.lo
Removing lib/libcurl_la-mprintf.o
Removing lib/libcurl_la-mqtt.lo
Removing lib/libcurl_la-mqtt.o
Removing lib/libcurl_la-multi.lo
Removing lib/libcurl_la-multi.o
Removing lib/libcurl_la-netrc.lo
Removing lib/libcurl_la-netrc.o
Removing lib/libcurl_la-nonblock.lo
Removing lib/libcurl_la-nonblock.o
Removing lib/libcurl_la-noproxy.lo
Removing lib/libcurl_la-noproxy.o
Removing lib/libcurl_la-openldap.lo
Removing lib/libcurl_la-openldap.o
Removing lib/libcurl_la-parsedate.lo
Removing lib/libcurl_la-parsedate.o
Removing lib/libcurl_la-pingpong.lo
Removing lib/libcurl_la-pingpong.o
Removing lib/libcurl_la-pop3.lo
Removing lib/libcurl_la-pop3.o
Removing lib/libcurl_la-progress.lo
Removing lib/libcurl_la-progress.o
Removing lib/libcurl_la-psl.lo
Removing lib/libcurl_la-psl.o
Removing lib/libcurl_la-rand.lo
Removing lib/libcurl_la-rand.o
Removing lib/libcurl_la-rename.lo
Removing lib/libcurl_la-rename.o
Removing lib/libcurl_la-request.lo
Removing lib/libcurl_la-request.o
Removing lib/libcurl_la-rtsp.lo
Removing lib/libcurl_la-rtsp.o
Removing lib/libcurl_la-select.lo
Removing lib/libcurl_la-select.o
Removing lib/libcurl_la-sendf.lo
Removing lib/libcurl_la-sendf.o
Removing lib/libcurl_la-setopt.lo
Removing lib/libcurl_la-setopt.o
Removing lib/libcurl_la-sha256.lo
Removing lib/libcurl_la-sha256.o
Removing lib/libcurl_la-share.lo
Removing lib/libcurl_la-share.o
Removing lib/libcurl_la-slist.lo
Removing lib/libcurl_la-slist.o
Removing lib/libcurl_la-smb.lo
Removing lib/libcurl_la-smb.o
Removing lib/libcurl_la-smtp.lo
Removing lib/libcurl_la-smtp.o
Removing lib/libcurl_la-socketpair.lo
Removing lib/libcurl_la-socketpair.o
Removing lib/libcurl_la-socks.lo
Removing lib/libcurl_la-socks.o
Removing lib/libcurl_la-socks_gssapi.lo
Removing lib/libcurl_la-socks_gssapi.o
Removing lib/libcurl_la-socks_sspi.lo
Removing lib/libcurl_la-socks_sspi.o
Removing lib/libcurl_la-speedcheck.lo
Removing lib/libcurl_la-speedcheck.o
Removing lib/libcurl_la-splay.lo
Removing lib/libcurl_la-splay.o
Removing lib/libcurl_la-strcase.lo
Removing lib/libcurl_la-strcase.o
Removing lib/libcurl_la-strdup.lo
Removing lib/libcurl_la-strdup.o
Removing lib/libcurl_la-strerror.lo
Removing lib/libcurl_la-strerror.o
Removing lib/libcurl_la-strtok.lo
Removing lib/libcurl_la-strtok.o
Removing lib/libcurl_la-strtoofft.lo
Removing lib/libcurl_la-strtoofft.o
Removing lib/libcurl_la-system_win32.lo
Removing lib/libcurl_la-system_win32.o
Removing lib/libcurl_la-telnet.lo
Removing lib/libcurl_la-telnet.o
Removing lib/libcurl_la-tftp.lo
Removing lib/libcurl_la-tftp.o
Removing lib/libcurl_la-timediff.lo
Removing lib/libcurl_la-timediff.o
Removing lib/libcurl_la-timeval.lo
Removing lib/libcurl_la-timeval.o
Removing lib/libcurl_la-transfer.lo
Removing lib/libcurl_la-transfer.o
Removing lib/libcurl_la-url.lo
Removing lib/libcurl_la-url.o
Removing lib/libcurl_la-urlapi.lo
Removing lib/libcurl_la-urlapi.o
Removing lib/libcurl_la-version.lo
Removing lib/libcurl_la-version.o
Removing lib/libcurl_la-version_win32.lo
Removing lib/libcurl_la-version_win32.o
Removing lib/libcurl_la-warnless.lo
Removing lib/libcurl_la-warnless.o
Removing lib/libcurl_la-ws.lo
Removing lib/libcurl_la-ws.o
Removing lib/nonblock.o
Removing lib/stamp-h1
Removing lib/strtoofft.o
Removing lib/timediff.o
Removing lib/vauth/.deps/
Removing lib/vauth/.dirstamp
Removing lib/vauth/libcurl_la-cleartext.lo
Removing lib/vauth/libcurl_la-cleartext.o
Removing lib/vauth/libcurl_la-cram.lo
Removing lib/vauth/libcurl_la-cram.o
Removing lib/vauth/libcurl_la-digest.lo
Removing lib/vauth/libcurl_la-digest.o
Removing lib/vauth/libcurl_la-digest_sspi.lo
Removing lib/vauth/libcurl_la-digest_sspi.o
Removing lib/vauth/libcurl_la-gsasl.lo
Removing lib/vauth/libcurl_la-gsasl.o
Removing lib/vauth/libcurl_la-krb5_gssapi.lo
Removing lib/vauth/libcurl_la-krb5_gssapi.o
Removing lib/vauth/libcurl_la-krb5_sspi.lo
Removing lib/vauth/libcurl_la-krb5_sspi.o
Removing lib/vauth/libcurl_la-ntlm.lo
Removing lib/vauth/libcurl_la-ntlm.o
Removing lib/vauth/libcurl_la-ntlm_sspi.lo
Removing lib/vauth/libcurl_la-ntlm_sspi.o
Removing lib/vauth/libcurl_la-oauth2.lo
Removing lib/vauth/libcurl_la-oauth2.o
Removing lib/vauth/libcurl_la-spnego_gssapi.lo
Removing lib/vauth/libcurl_la-spnego_gssapi.o
Removing lib/vauth/libcurl_la-spnego_sspi.lo
Removing lib/vauth/libcurl_la-spnego_sspi.o
Removing lib/vauth/libcurl_la-vauth.lo
Removing lib/vauth/libcurl_la-vauth.o
Removing lib/version_win32.o
Removing lib/vquic/.deps/
Removing lib/vquic/.dirstamp
Removing lib/vquic/libcurl_la-curl_msh3.lo
Removing lib/vquic/libcurl_la-curl_msh3.o
Removing lib/vquic/libcurl_la-curl_ngtcp2.lo
Removing lib/vquic/libcurl_la-curl_ngtcp2.o
Removing lib/vquic/libcurl_la-curl_osslq.lo
Removing lib/vquic/libcurl_la-curl_osslq.o
Removing lib/vquic/libcurl_la-curl_quiche.lo
Removing lib/vquic/libcurl_la-curl_quiche.o
Removing lib/vquic/libcurl_la-vquic-tls.lo
Removing lib/vquic/libcurl_la-vquic-tls.o
Removing lib/vquic/libcurl_la-vquic.lo
Removing lib/vquic/libcurl_la-vquic.o
Removing lib/vssh/.deps/
Removing lib/vssh/.dirstamp
Removing lib/vssh/libcurl_la-libssh.lo
Removing lib/vssh/libcurl_la-libssh.o
Removing lib/vssh/libcurl_la-libssh2.lo
Removing lib/vssh/libcurl_la-libssh2.o
Removing lib/vssh/libcurl_la-wolfssh.lo
Removing lib/vssh/libcurl_la-wolfssh.o
Removing lib/vtls/.deps/
Removing lib/vtls/.dirstamp
Removing lib/vtls/libcurl_la-bearssl.lo
Removing lib/vtls/libcurl_la-bearssl.o
Removing lib/vtls/libcurl_la-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 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:425: installing './config.guess'
configure.ac:425: installing './config.sub'
configure.ac:123: installing './install-sh'
configure.ac:129: installing './missing'
docs/examples/Makefile.am: installing './depcomp'

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

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

$ chmod +x configure

$ ./configure --disable-shared --without-ssl --disable-docs
checking whether to enable maintainer-specific portions of Makefiles... no
checking whether make supports nested variables... yes
checking whether to enable debug build options... no
checking whether to enable compiler optimizer... (assumed) yes
checking whether to enable strict compiler warnings... no
checking whether to enable compiler warnings as errors... no
checking whether to enable curl debug memory tracking... no
checking whether to enable hiding of library internal symbols... yes
checking whether to enable c-ares for DNS lookups... no
checking whether to disable dependency on -lrt... (assumed no)
checking whether to enable 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.7.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 build documentation... 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 psl_builtin in -lpsl... yes
checking for libpsl.h... yes
checking for library containing gsasl_init... no
checking for RTMP_Init in -lrtmp... no
checking whether versioned symbols are wanted... no
checking whether to enable Windows native IDN (Windows native builds only)... no
checking whether to build with libidn2... (assumed) yes
checking for pkg-config... (cached) /usr/bin/pkg-config
checking for libidn2 options with pkg-config... no
configure: IDN_LIBS: "-lidn2"
configure: IDN_LDFLAGS: ""
configure: IDN_CPPFLAGS: ""
configure: IDN_DIR: ""
checking if idn2_lookup_ul can be linked... no
checking for idn2.h... no
checking for pkg-config... (cached) /usr/bin/pkg-config
checking for libnghttp2 options with pkg-config... no
checking for nghttp2_session_get_stream_local_window_size in -lnghttp2... no
checking for sys/types.h... (cached) yes
checking for sys/time.h... (cached) yes
checking for sys/select.h... yes
checking for sys/socket.h... yes
checking for sys/ioctl.h... yes
checking for unistd.h... (cached) yes
checking for stdlib.h... (cached) yes
checking for arpa/inet.h... yes
checking for net/if.h... yes
checking for netinet/in.h... yes
checking for netinet/in6.h... no
checking for sys/un.h... yes
checking for linux/tcp.h... yes
checking for netinet/tcp.h... yes
checking for netinet/udp.h... yes
checking for netdb.h... yes
checking for sys/sockio.h... no
checking for sys/stat.h... (cached) yes
checking for sys/param.h... yes
checking for termios.h... yes
checking for termio.h... yes
checking for fcntl.h... yes
checking for io.h... no
checking for pwd.h... yes
checking for utime.h... yes
checking for sys/utime.h... no
checking for sys/poll.h... yes
checking for poll.h... yes
checking for socket.h... no
checking for sys/resource.h... yes
checking for libgen.h... yes
checking for locale.h... yes
checking for stdbool.h... yes
checking for sys/filio.h... no
checking for sys/wait.h... yes
checking for 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.7.0-DEV
SSL: no (--with-{openssl,gnutls,mbedtls,wolfssl,schannel,secure-transport,amissl,bearssl,rustls} )
SSH: no (--with-{libssh,libssh2})
zlib: enabled
brotli: no (--with-brotli)
zstd: no (--with-zstd)
GSS-API: no (--with-gssapi)
GSASL: no (libgsasl not found)
TLS-SRP: no (--enable-tls-srp)
resolver: POSIX threaded
IPv6: enabled
Unix sockets: enabled
IDN: no (--with-{libidn2,winidn})
Build docs: no
Build libcurl: Shared=no, Static=yes
Built-in manual: 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-openssl-quic, --with-msh3)
ECH: no (--enable-ech)
WebSockets: no (--enable-websockets)
Protocols: DICT FILE FTP GOPHER HTTP IMAP IPFS IPNS MQTT POP3 RTSP SMTP TELNET TFTP
Features: AsynchDNS IPv6 Largefile PSL UnixSockets alt-svc libz threadsafe

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

$ make -j3
Making all in lib
make[1]: Entering directory '/root/asi_db/builds/curl/_worktrees/w0/lib'
make all-am
make[2]: Entering directory '/root/asi_db/builds/curl/_worktrees/w0/lib'
CC libcurl_la-altsvc.lo
CC libcurl_la-amigaos.lo
CC libcurl_la-asyn-ares.lo
CC libcurl_la-asyn-thread.lo
CC libcurl_la-base64.lo
CC libcurl_la-bufq.lo
CC libcurl_la-bufref.lo
CC libcurl_la-c-hyper.lo
CC libcurl_la-cf-h1-proxy.lo
CC libcurl_la-cf-h2-proxy.lo
CC libcurl_la-cf-haproxy.lo
CC libcurl_la-cf-https-connect.lo
CC libcurl_la-cf-socket.lo
CC libcurl_la-cfilters.lo
CC libcurl_la-conncache.lo
CC libcurl_la-connect.lo
CC libcurl_la-content_encoding.lo
CC libcurl_la-cookie.lo
CC libcurl_la-curl_addrinfo.lo
CC libcurl_la-curl_des.lo
CC libcurl_la-curl_endian.lo
CC libcurl_la-curl_fnmatch.lo
CC libcurl_la-curl_get_line.lo
CC libcurl_la-curl_gethostname.lo
CC libcurl_la-curl_gssapi.lo
CC libcurl_la-curl_memrchr.lo
CC libcurl_la-curl_multibyte.lo
CC libcurl_la-curl_ntlm_core.lo
CC libcurl_la-curl_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_sha512_256.lo
CC libcurl_la-curl_sspi.lo
CC libcurl_la-curl_threads.lo
CC libcurl_la-curl_trc.lo
CC libcurl_la-cw-out.lo
CC libcurl_la-dict.lo
CC libcurl_la-doh.lo
CC libcurl_la-dynbuf.lo
CC libcurl_la-dynhds.lo
CC libcurl_la-easy.lo
CC libcurl_la-easygetopt.lo
CC libcurl_la-easyoptions.lo
CC libcurl_la-escape.lo
CC libcurl_la-file.lo
CC libcurl_la-fileinfo.lo
CC libcurl_la-fopen.lo
CC libcurl_la-formdata.lo
CC libcurl_la-ftp.lo
CC libcurl_la-ftplistparser.lo
CC libcurl_la-getenv.lo
CC libcurl_la-getinfo.lo
CC libcurl_la-gopher.lo
CC libcurl_la-hash.lo
CC libcurl_la-headers.lo
CC libcurl_la-hmac.lo
CC libcurl_la-hostasyn.lo
CC libcurl_la-hostip.lo
CC libcurl_la-hostip4.lo
CC libcurl_la-hostip6.lo
CC libcurl_la-hostsyn.lo
CC libcurl_la-hsts.lo
CC libcurl_la-http.lo
CC libcurl_la-http1.lo
CC libcurl_la-http2.lo
CC libcurl_la-http_aws_sigv4.lo
CC libcurl_la-http_chunks.lo
CC libcurl_la-http_digest.lo
CC libcurl_la-http_negotiate.lo
CC libcurl_la-http_ntlm.lo
CC libcurl_la-http_proxy.lo
CC libcurl_la-idn.lo
CC libcurl_la-if2ip.lo
CC libcurl_la-imap.lo
CC libcurl_la-inet_ntop.lo
CC libcurl_la-inet_pton.lo
CC libcurl_la-krb5.lo
CC libcurl_la-ldap.lo
CC libcurl_la-llist.lo
CC libcurl_la-macos.lo
CC libcurl_la-md4.lo
CC libcurl_la-md5.lo
CC libcurl_la-memdebug.lo
CC libcurl_la-mime.lo
CC libcurl_la-mprintf.lo
CC libcurl_la-mqtt.lo
CC libcurl_la-multi.lo
CC libcurl_la-netrc.lo
CC libcurl_la-nonblock.lo
CC libcurl_la-noproxy.lo
CC libcurl_la-openldap.lo
CC libcurl_la-parsedate.lo
CC libcurl_la-pingpong.lo
CC libcurl_la-pop3.lo
CC libcurl_la-progress.lo
CC libcurl_la-psl.lo
CC libcurl_la-rand.lo
CC libcurl_la-rename.lo
CC libcurl_la-request.lo
CC libcurl_la-rtsp.lo
CC libcurl_la-select.lo
CC libcurl_la-sendf.lo
CC libcurl_la-setopt.lo
CC libcurl_la-sha256.lo
CC libcurl_la-share.lo
CC libcurl_la-slist.lo
CC libcurl_la-smb.lo
CC libcurl_la-smtp.lo
CC libcurl_la-socketpair.lo
CC libcurl_la-socks.lo
CC libcurl_la-socks_sspi.lo
CC libcurl_la-socks_gssapi.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-mbedtls.lo
CC vtls/libcurl_la-keylog.lo
CC vtls/libcurl_la-mbedtls_threadlock.lo
CC vtls/libcurl_la-openssl.lo
CC vtls/libcurl_la-rustls.lo
CC vtls/libcurl_la-schannel.lo
CC vtls/libcurl_la-schannel_verify.lo
CC vtls/libcurl_la-sectransp.lo
CC vtls/libcurl_la-vtls.lo
CC vtls/libcurl_la-wolfssl.lo
CC vtls/libcurl_la-x509asn1.lo
CC vquic/libcurl_la-curl_msh3.lo
CC vquic/libcurl_la-curl_ngtcp2.lo
CC vquic/libcurl_la-curl_osslq.lo
CC vquic/libcurl_la-curl_quiche.lo
CC vquic/libcurl_la-vquic.lo
CC vquic/libcurl_la-vquic-tls.lo
CC vssh/libcurl_la-libssh.lo
CC vssh/libcurl_la-libssh2.lo
CC vssh/libcurl_la-wolfssh.lo
CCLD libcurl.la
make[2]: Leaving directory '/root/asi_db/builds/curl/_worktrees/w0/lib'
make[1]: Leaving directory '/root/asi_db/builds/curl/_worktrees/w0/lib'
Making all in src
make[1]: Entering directory '/root/asi_db/builds/curl/_worktrees/w0/src'
make[2]: Entering directory '/root/asi_db/builds/curl/_worktrees/w0/src'
CC slist_wc.o
CC tool_binmode.o
CC tool_bname.o
CC tool_cb_hdr.o
CC tool_cb_prg.o
CC tool_cb_dbg.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
cd ../docs && make
make[3]: Entering directory '/root/asi_db/builds/curl/_worktrees/w0/docs'
CC tool_ipfs.o
Making all in .
CC tool_libinfo.o
make[4]: 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
CC tool_listhelp.o
cd cmdline-opts && make
make[5]: Entering directory '/root/asi_db/builds/curl/_worktrees/w0/docs/cmdline-opts'
GENERATE ../../docs/curl.1
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
make[5]: Leaving directory '/root/asi_db/builds/curl/_worktrees/w0/docs/cmdline-opts'
RENDER curl-config.1
CC tool_util.o
CC tool_vms.o
make[4]: Leaving directory '/root/asi_db/builds/curl/_worktrees/w0/docs'
Making all in cmdline-opts
CC tool_writeout.o
CC tool_writeout_json.o
make[4]: Entering directory '/root/asi_db/builds/curl/_worktrees/w0/docs/cmdline-opts'
make[4]: Nothing to be done for 'all'.
make[4]: Leaving directory '/root/asi_db/builds/curl/_worktrees/w0/docs/cmdline-opts'
Making all in libcurl
make[4]: Entering directory '/root/asi_db/builds/curl/_worktrees/w0/docs/libcurl'
Making all in opts
make[5]: Entering directory '/root/asi_db/builds/curl/_worktrees/w0/docs/libcurl/opts'
make[5]: Nothing to be done for 'all'.
make[5]: Leaving directory '/root/asi_db/builds/curl/_worktrees/w0/docs/libcurl/opts'
CC var.o
CC tool_xattr.o
make[5]: Entering directory '/root/asi_db/builds/curl/_worktrees/w0/docs/libcurl'
make[5]: Nothing to be done for 'all-am'.
make[5]: Leaving directory '/root/asi_db/builds/curl/_worktrees/w0/docs/libcurl'
make[4]: Leaving directory '/root/asi_db/builds/curl/_worktrees/w0/docs/libcurl'
make[3]: Leaving directory '/root/asi_db/builds/curl/_worktrees/w0/docs'
HUGE tool_hugehelp.c
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'
Making all in scripts
make[1]: Entering directory '/root/asi_db/builds/curl/_worktrees/w0/scripts'
make[1]: Nothing to be done for 'all'.
make[1]: Leaving directory '/root/asi_db/builds/curl/_worktrees/w0/scripts'
make[1]: Entering directory '/root/asi_db/builds/curl/_worktrees/w0'
make[1]: Nothing to be done for 'all-am'.
make[1]: Leaving directory '/root/asi_db/builds/curl/_worktrees/w0'

Commit Diff GitHub →

docs/CLIENT-READERS.md +35 -2 lib/c-hyper.c +6 -8 lib/http.c +202 -297 lib/http.h +5 -8 lib/http_chunks.c +12 -0 lib/multi.c +0 -90 lib/request.c +49 -15 lib/request.h +1 -2 lib/rtsp.c +19 -18 lib/sendf.c +332 -16 lib/sendf.h +72 -6 lib/smtp.c +13 -1 lib/transfer.c +3 -6 lib/urldata.h +0 -3 scripts/singleuse.pl +2 -1

docs/CLIENT-READERS.md+35 -2

@@ -31,6 +31,11 @@ struct Curl_crtype {
	char buf, size_t blen, size_t nread, bool *eos);
	void (do_close)(struct Curl_easy data, struct Curl_creader *reader);
	bool (needs_rewind)(struct Curl_easy data, struct Curl_creader *reader);
+	curl_off_t (total_length)(struct Curl_easy data,
+	struct Curl_creader *reader);
+	CURLcode (resume_from)(struct Curl_easy data,
+	struct Curl_creader *reader, curl_off_t offset);
+	CURLcode (rewind)(struct Curl_easy data, struct Curl_creader *reader);
	};

	struct Curl_creader {
@@ -80,6 +85,36 @@ Implemented in `sendf.c` for phase `CURL_CR_CLIENT`, this reader get a buffer po

	Sometimes it is necessary to send a request with client data again. Transfer handling can inquire via `Curl_client_read_needs_rewind()` if a rewind (e.g. a reset of the client data) is necessary. This asks all installed readers if they need it and give `FALSE` of none does.

+	## Upload Size
+
+	Many protocols need to know the amount of bytes delivered by the client readers in advance. They may invoke `Curl_creader_total_length(data)` to retrieve that. However, not all reader chains know the exact value beforehand. In that case, the call returns `-1` for "unknown".
+
+	Even if the length of the "raw" data is known, the length that is send may not. Example: with option `--crlf` the uploaded content undergoes line-end conversion. The line converting reader does not know in advance how many newlines it may encounter. Therefore it must return `-1` for any positive raw content length.
+
+	In HTTP, once the correct client readers are installed, the protocol asks the readers for the total length. If that is known, it can set `Content-Length:` accordingly. If not, it may choose to add an HTTP "chunked" reader.
+
+	In addition, there is `Curl_creader_client_length(data)` which gives the total length as reported by the reader in phase `CURL_CR_CLIENT` without asking other readers that may transform the raw data. This is useful in estimating the size of an upload. The HTTP protocol uses this to determine if `Expect: 100-continue` shall be done.
+
+	## Resuming
+
+	Uploads can start at a specific offset, if so requested. The "resume from" that offset. This applies to the reader in phase `CURL_CR_CLIENT` that delivers the "raw" content. Resumption can fail if the installed reader does not support it or if the offset is too large.
+
+	The total length reported by the reader changes when resuming. Example: resuming an upload of 100 bytes by 25 reports a total length of 75 afterwards.
+
+	If `resume_from()` is invoked twice, it is additive. There is currently no way to undo a resume.
+
+	## Rewinding
+
+	When a request is retried, installed client readers are discarded and replaced by new ones. This works only if the new readers upload the same data. For many readers, this is not an issue. The "null" reader always does the same. Also the `buf` reader, initialized with the same buffer, does this.
+
+	Readers operating on callbacks to the application need to "rewind" the underlying content. For example, when reading from a `FILE*`, the reader needs to `fseek()` to the beginning. The following methods are used:
+
+	1. `Curl_creader_needs_rewind(data)`: tells if a rewind is necessary, given the current state of the reader chain. If nothing really has been read so far, this returns `FALSE`.
+	2. `Curl_creader_will_rewind(data)`: tells if the reader chain rewinds at the start of the next request.
+	3. `Curl_creader_set_rewind(data, TRUE)`: marks the reader chain for rewinding at the start of the next request.
+	4. `Curl_client_start(data)`: tells the readers that a new request starts and they need to rewind if requested.
+
+
	## Summary and Outlook

	By adding the client reader interface, any protocol can control how/if it wants the curl transfer to send bytes for a request. The transfer loop becomes then blissfully ignorant of the specifics.
@@ -87,7 +122,5 @@ By adding the client reader interface, any protocol can control how/if it wants
	The protocols on the other hand no longer have to care to package data most efficiently. At any time, should more data be needed, it can be read from the client. This is used when sending HTTP requests headers to add as much request body data to the initial sending as there is room for.

	Future enhancements based on the client readers:
-	* delegate the actual "rewinding" to the readers. The should know how it is done, eliminating the `readrewind.c` protocol specifics in `multi.c`.
	* `expect-100` handling: place that into a HTTP specific reader at `CURL_CR_PROTOCOL` and eliminate the checks in the generic transfer parts.
-	* `eos` detection: `upload_done` is partly triggered now by comparing the number of bytes sent to a known size. This is no longer necessary since the core readers obey length restrictions.
	* `eos forwarding`: transfer should forward an `eos` flag to the connection filters. Filters like HTTP/2 and HTTP/3 can make use of that, terminating streams early. This would also eliminate length checks in stream handling.

lib/c-hyper.c+6 -8

@@ -363,7 +363,7 @@ CURLcode Curl_hyper_stream(struct Curl_easy *data,
	k->exp100 = EXP100_SEND_DATA;
	k->keepon \|= KEEP_SEND;
	Curl_expire_done(data, EXPIRE_100_TIMEOUT);
-	infof(data, "Done waiting for 100-continue");
+	infof(data, "Done waiting for 100-continue after %ldms", (long)ms);
	if(data->hyp.exp100_waker) {
	hyper_waker_wake(data->hyp.exp100_waker);
	data->hyp.exp100_waker = NULL;
@@ -848,7 +848,9 @@ CURLcode Curl_http(struct Curl_easy data, bool done)
	may be parts of the request that is not yet sent, since we can deal with
	the rest of the request in the PERFORM phase. */
	*done = TRUE;
-	Curl_client_reset(data);
+	result = Curl_client_start(data);
+	if(result)
+	return result;

	/* Add collecting of headers written to client. For a new connection,
	* we might have done that already, but reuse
@@ -883,9 +885,9 @@ CURLcode Curl_http(struct Curl_easy data, bool done)
	return result;
	}

-	result = Curl_http_resume(data, conn, httpreq);
+	result = Curl_http_req_set_reader(data, httpreq, &te);
	if(result)
-	return result;
+	goto error;

	result = Curl_http_range(data, httpreq);
	if(result)
@@ -1006,10 +1008,6 @@ CURLcode Curl_http(struct Curl_easy data, bool done)
	goto error;
	}

-	result = Curl_http_body(data, conn, httpreq, &te);
-	if(result)
-	goto error;
-
	if(data->state.aptr.host) {
	result = Curl_hyper_header(data, headers, data->state.aptr.host);
	if(result)

lib/http.c+202 -297

@@ -430,50 +430,23 @@ static CURLcode http_perhapsrewind(struct Curl_easy *data,
	{
	struct HTTP *http = data->req.p.http;
	curl_off_t bytessent;
-	curl_off_t expectsend = -1; /* default is unknown */
+	curl_off_t expectsend = Curl_creader_total_length(data);

	if(!http)
	/* If this is still NULL, we have not reach very far and we can safely
	skip this rewinding stuff */
	return CURLE_OK;

-	switch(data->state.httpreq) {
-	case HTTPREQ_GET:
-	case HTTPREQ_HEAD:
+	if(!expectsend)
+	/* not sending any body */
	return CURLE_OK;
-	default:
-	break;
-	}
-
-	bytessent = data->req.writebytecount;

-	if(data->req.authneg) {
-	/* This is a state where we are known to be negotiating and we don't send
-	any data then. */
-	expectsend = 0;
-	}
-	else if(!conn->bits.protoconnstart) {
+	if(!conn->bits.protoconnstart)
	/* HTTP CONNECT in progress: there is no body */
	expectsend = 0;
-	}
-	else {
-	/* figure out how much data we are expected to send */
-	switch(data->state.httpreq) {
-	case HTTPREQ_POST:
-	case HTTPREQ_PUT:
-	if(data->state.infilesize != -1)
-	expectsend = data->state.infilesize;
-	break;
-	case HTTPREQ_POST_FORM:
-	case HTTPREQ_POST_MIME:
-	expectsend = http->postsize;
-	break;
-	default:
-	break;
-	}
-	}

-	data->state.rewindbeforesend = FALSE; /* default */
+	bytessent = data->req.writebytecount;
+	Curl_creader_set_rewind(data, FALSE);

	if((expectsend == -1) \|\| (expectsend > bytessent)) {
	#if defined(USE_NTLM)
@@ -490,7 +463,7 @@ static CURLcode http_perhapsrewind(struct Curl_easy *data,

	/* rewind data when completely done sending! */
	if(!data->req.authneg && (conn->writesockfd != CURL_SOCKET_BAD)) {
-	data->state.rewindbeforesend = TRUE;
+	Curl_creader_set_rewind(data, TRUE);
	infof(data, "Rewind stream before next send");
	}

@@ -518,7 +491,7 @@ static CURLcode http_perhapsrewind(struct Curl_easy *data,

	/* rewind data when completely done sending! */
	if(!data->req.authneg && (conn->writesockfd != CURL_SOCKET_BAD)) {
-	data->state.rewindbeforesend = TRUE;
+	Curl_creader_set_rewind(data, TRUE);
	infof(data, "Rewind stream before next send");
	}

@@ -543,9 +516,9 @@ static CURLcode http_perhapsrewind(struct Curl_easy *data,
	closure so we can safely do the rewind right now */
	}

-	if(Curl_client_read_needs_rewind(data)) {
+	if(Curl_creader_needs_rewind(data)) {
	/* mark for rewind since if we already sent something */
-	data->state.rewindbeforesend = TRUE;
+	Curl_creader_set_rewind(data, TRUE);
	infof(data, "Please rewind output before next send");
	}

@@ -604,7 +577,7 @@ CURLcode Curl_http_auth_act(struct Curl_easy *data)
	if(pickhost \|\| pickproxy) {
	if((data->state.httpreq != HTTPREQ_GET) &&
	(data->state.httpreq != HTTPREQ_HEAD) &&
-	!data->state.rewindbeforesend) {
+	!Curl_creader_will_rewind(data)) {
	result = http_perhapsrewind(data, conn);
	if(result)
	return result;
@@ -2021,13 +1994,11 @@ CURLcode Curl_http_target(struct Curl_easy *data,
	return result;
	}

-	CURLcode Curl_http_body(struct Curl_easy data, struct connectdata conn,
-	Curl_HttpReq httpreq, const char **tep)
+	#if !defined(CURL_DISABLE_MIME) \|\| !defined(CURL_DISABLE_FORM_API)
+	static CURLcode set_post_reader(struct Curl_easy *data, Curl_HttpReq httpreq)
	{
-	CURLcode result = CURLE_OK;
-	const char *ptr;
-	struct HTTP *http = data->req.p.http;
-	http->postsize = 0;
+	curl_off_t postsize = 0;
+	CURLcode result;

	switch(httpreq) {
	#ifndef CURL_DISABLE_MIME
@@ -2056,6 +2027,7 @@ CURLcode Curl_http_body(struct Curl_easy data, struct connectdata conn,
	#endif
	default:
	data->state.mimepost = NULL;
+	break;
	}

	#ifndef CURL_DISABLE_MIME
@@ -2081,10 +2053,137 @@ CURLcode Curl_http_body(struct Curl_easy data, struct connectdata conn,
	result = Curl_mime_rewind(data->state.mimepost);
	if(result)
	return result;
-	http->postsize = Curl_mime_size(data->state.mimepost);
+	postsize = Curl_mime_size(data->state.mimepost);
	}
	#endif

+	switch(httpreq) {
+	case HTTPREQ_POST_FORM:
+	case HTTPREQ_POST_MIME:
+	/* This is form posting using mime data. */
+	data->state.infilesize = postsize;
+	if(!postsize)
+	result = Curl_creader_set_null(data);
+	else {
+	/* Read from mime structure. We could do a special client reader
+	* for this, but replacing the callback seems to work fine. */
+	data->state.fread_func = (curl_read_callback) Curl_mime_read;
+	data->state.in = (void *) data->state.mimepost;
+	result = Curl_creader_set_fread(data, postsize);
+	}
+	return result;
+	default:
+	if(!postsize)
+	result = Curl_creader_set_null(data);
+	else
+	result = Curl_creader_set_fread(data, postsize);
+	return result;
+	}
+	/* never reached */
+	}
+	#endif
+
+	static CURLcode set_reader(struct Curl_easy *data, Curl_HttpReq httpreq)
+	{
+	CURLcode result = CURLE_OK;
+	curl_off_t postsize = data->state.infilesize;
+
+	DEBUGASSERT(data->conn);
+
+	if(data->req.authneg) {
+	return Curl_creader_set_null(data);
+	}
+
+	switch(httpreq) {
+	case HTTPREQ_PUT: /* Let's PUT the data to the server! */
+	if(!postsize)
+	result = Curl_creader_set_null(data);
+	else
+	result = Curl_creader_set_fread(data, postsize);
+	return result;
+
+	#if !defined(CURL_DISABLE_MIME) \|\| !defined(CURL_DISABLE_FORM_API)
+	case HTTPREQ_POST_FORM:
+	case HTTPREQ_POST_MIME:
+	return set_post_reader(data, httpreq);
+	#endif
+
+	case HTTPREQ_POST:
+	/* this is the simple POST, using x-www-form-urlencoded style */
+	/* the size of the post body */
+	if(!postsize) {
+	result = Curl_creader_set_null(data);
+	}
+	else if(data->set.postfields) {
+	if(postsize > 0)
+	result = Curl_creader_set_buf(data, data->set.postfields,
+	(size_t)postsize);
+	else
+	result = Curl_creader_set_null(data);
+	}
+	else { /* we read the bytes from the callback */
+	result = Curl_creader_set_fread(data, postsize);
+	}
+	return result;
+
+	default:
+	/* HTTP GET/HEAD download, has no body, needs no Content-Length */
+	data->state.infilesize = 0;
+	return Curl_creader_set_null(data);
+	}
+	/* not reached */
+	}
+
+	static CURLcode http_resume(struct Curl_easy *data, Curl_HttpReq httpreq)
+	{
+	if((HTTPREQ_POST == httpreq \|\| HTTPREQ_PUT == httpreq) &&
+	data->state.resume_from) {
+	/**********************************************************************
+	* Resuming upload in HTTP means that we PUT or POST and that we have
+	* got a resume_from value set. The resume value has already created
+	* a Range: header that will be passed along. We need to "fast forward"
+	* the file the given number of bytes and decrease the assume upload
+	* file size before we continue this venture in the dark lands of HTTP.
+	* Resuming mime/form posting at an offset > 0 has no sense and is ignored.
+	*********************************************************************/
+
+	if(data->state.resume_from < 0) {
+	/*
+	* This is meant to get the size of the present remote-file by itself.
+	* We don't support this now. Bail out!
+	*/
+	data->state.resume_from = 0;
+	}
+
+	if(data->state.resume_from && !data->req.authneg) {
+	/* only act on the first request */
+	CURLcode result;
+	result = Curl_creader_resume_from(data, data->state.resume_from);
+	if(result) {
+	failf(data, "Unable to resume from offset %" CURL_FORMAT_CURL_OFF_T,
+	data->state.resume_from);
+	return result;
+	}
+	}
+	}
+	return CURLE_OK;
+	}
+
+	CURLcode Curl_http_req_set_reader(struct Curl_easy *data,
+	Curl_HttpReq httpreq,
+	const char **tep)
+	{
+	CURLcode result = CURLE_OK;
+	const char *ptr;
+
+	result = set_reader(data, httpreq);
+	if(result)
+	return result;
+
+	result = http_resume(data, httpreq);
+	if(result)
+	return result;
+
	ptr = Curl_checkheaders(data, STRCONST("Transfer-Encoding"));
	if(ptr) {
	/* Some kind of TE is requested, check if 'chunked' is chosen */
@@ -2093,18 +2192,14 @@ CURLcode Curl_http_body(struct Curl_easy data, struct connectdata conn,
	STRCONST("Transfer-Encoding:"), STRCONST("chunked"));
	}
	else {
-	if((conn->handler->protocol & PROTO_FAMILY_HTTP) &&
-	(((httpreq == HTTPREQ_POST_MIME \|\| httpreq == HTTPREQ_POST_FORM) &&
-	http->postsize < 0) \|\|
-	((data->state.upload \|\| httpreq == HTTPREQ_POST) &&
-	data->state.infilesize == -1))) {
-	if(data->req.authneg)
-	/* don't enable chunked during auth neg */
-	;
-	else if(Curl_use_http_1_1plus(data, conn)) {
-	if(conn->httpversion < 20)
-	/* HTTP, upload, unknown file size and not HTTP 1.0 */
-	data->req.upload_chunky = TRUE;
+	curl_off_t req_clen = Curl_creader_total_length(data);
+
+	if(req_clen < 0) {
+	/* indeterminate request content length */
+	if(Curl_use_http_1_1plus(data, data->conn)) {
+	/* On HTTP/1.1, enable chunked, on HTTP/2 and later we do not
+	* need it */
+	data->req.upload_chunky = (data->conn->httpversion < 20);
	}
	else {
	failf(data, "Chunky upload is not supported by HTTP 1.0");
@@ -2127,7 +2222,6 @@ static CURLcode addexpect(struct Curl_easy data, struct dynbuf r)
	data->state.expect100header = FALSE;
	/* Avoid Expect: 100-continue if Upgrade: is used */
	if(data->req.upgr101 == UPGR101_INIT) {
-	struct HTTP *http = data->req.p.http;
	/* For really small puts we don't use Expect: headers at all, and for
	the somewhat bigger ones we allow the app to disable it. Just make
	sure that the expect100header is always set to the preferred value
@@ -2138,8 +2232,11 @@ static CURLcode addexpect(struct Curl_easy data, struct dynbuf r)
	Curl_compareheader(ptr, STRCONST("Expect:"),
	STRCONST("100-continue"));
	}
-	else if(http->postsize > EXPECT_100_THRESHOLD \|\| http->postsize < 0)
-	return expect100(data, r);
+	else {
+	curl_off_t client_len = Curl_creader_client_length(data);
+	if(client_len > EXPECT_100_THRESHOLD \|\| client_len < 0)
+	return expect100(data, r);
+	}
	}
	return CURLE_OK;
	}
@@ -2148,85 +2245,48 @@ CURLcode Curl_http_req_complete(struct Curl_easy *data,
	struct dynbuf *r, Curl_HttpReq httpreq)
	{
	CURLcode result = CURLE_OK;
-	struct HTTP *http = data->req.p.http;
+	curl_off_t req_clen;

+	DEBUGASSERT(data->conn);
+	#ifndef USE_HYPER
	if(data->req.upload_chunky) {
	result = Curl_httpchunk_add_reader(data);
	if(result)
	return result;
	}
+	#endif

-	DEBUGASSERT(data->conn);
+	/* Get the request body length that has been set up */
+	req_clen = Curl_creader_total_length(data);
	switch(httpreq) {
-	case HTTPREQ_PUT: /* Let's PUT the data to the server! */
-
-	if(data->req.authneg)
-	http->postsize = 0;
-	else
-	http->postsize = data->state.infilesize;
-
-	if((http->postsize != -1) && !data->req.upload_chunky &&
-	(data->req.authneg \|\|
-	!Curl_checkheaders(data, STRCONST("Content-Length")))) {
-	/* only add Content-Length if not uploading chunked */
-	result = Curl_dyn_addf(r, "Content-Length: %" CURL_FORMAT_CURL_OFF_T
-	"\r\n", http->postsize);
-	if(result)
-	goto out;
-	}
-
-	result = addexpect(data, r);
-	if(result)
-	goto out;
-
-	/* end of headers */
-	result = Curl_dyn_addn(r, STRCONST("\r\n"));
-	if(result)
-	goto out;
-
-	/* set the upload size to the progress meter */
-	Curl_pgrsSetUploadSize(data, http->postsize);
-	if(!http->postsize)
-	result = Client_reader_set_null(data);
-	else
-	result = Client_reader_set_fread(data, data->state.infilesize);
-	break;
-
+	case HTTPREQ_PUT:
+	case HTTPREQ_POST:
	#if !defined(CURL_DISABLE_MIME) \|\| !defined(CURL_DISABLE_FORM_API)
	case HTTPREQ_POST_FORM:
	case HTTPREQ_POST_MIME:
-	/* This is form posting using mime data. */
-	if(data->req.authneg) {
-	/* nothing to post! */
-	result = Curl_dyn_addn(r, STRCONST("Content-Length: 0\r\n\r\n"));
-	if(!result)
-	result = Client_reader_set_null(data);
-	if(result)
-	return result;
-	/* setup variables for the upcoming transfer */
-	Curl_xfer_setup(data, FIRSTSOCKET, -1, TRUE, -1);
-	break;
-	}
-
-	data->state.infilesize = http->postsize;
-
+	#endif
	/* We only set Content-Length and allow a custom Content-Length if
	we don't upload data chunked, as RFC2616 forbids us to set both
-	kinds of headers (Transfer-Encoding: chunked and Content-Length) */
-	if(http->postsize != -1 && !data->req.upload_chunky &&
-	(!Curl_checkheaders(data, STRCONST("Content-Length")))) {
+	kinds of headers (Transfer-Encoding: chunked and Content-Length).
+	We do not override a custom "Content-Length" header, but during
+	authentication negotiation that header is suppressed.
+	*/
+	if(req_clen >= 0 && !data->req.upload_chunky &&
+	(data->req.authneg \|\|
+	!Curl_checkheaders(data, STRCONST("Content-Length")))) {
	/* we allow replacing this header if not during auth negotiation,
	although it isn't very wise to actually set your own */
	result = Curl_dyn_addf(r,
	"Content-Length: %" CURL_FORMAT_CURL_OFF_T
-	"\r\n", http->postsize);
-	if(result)
-	goto out;
+	"\r\n", req_clen);
	}
+	if(result)
+	goto out;

	#ifndef CURL_DISABLE_MIME
	/* Output mime-generated headers. */
-	{
+	if(data->state.mimepost &&
+	((httpreq == HTTPREQ_POST_FORM) \|\| (httpreq == HTTPREQ_POST_MIME))) {
	struct curl_slist *hdr;

	for(hdr = data->state.mimepost->curlheaders; hdr; hdr = hdr->next) {
@@ -2236,93 +2296,26 @@ CURLcode Curl_http_req_complete(struct Curl_easy *data,
	}
	}
	#endif
-
-	result = addexpect(data, r);
-	if(result)
-	goto out;
-
-	/* make the request end in a true CRLF */
-	result = Curl_dyn_addn(r, STRCONST("\r\n"));
-	if(result)
-	goto out;
-
-	/* set the upload size to the progress meter */
-	Curl_pgrsSetUploadSize(data, http->postsize);
-	if(!http->postsize)
-	result = Client_reader_set_null(data);
-	else {
-	/* Read from mime structure. We could do a special client reader
-	* for this, but replacing the callback seems to work fine. */
-	data->state.fread_func = (curl_read_callback) Curl_mime_read;
-	data->state.in = (void *) data->state.mimepost;
-	result = Client_reader_set_fread(data, data->state.infilesize);
-	}
-	break;
-	#endif
-	case HTTPREQ_POST:
-	/* this is the simple POST, using x-www-form-urlencoded style */
-
-	if(data->req.authneg)
-	http->postsize = 0;
-	else
-	/* the size of the post body */
-	http->postsize = data->state.infilesize;
-
-	/* We only set Content-Length and allow a custom Content-Length if
-	we don't upload data chunked, as RFC2616 forbids us to set both
-	kinds of headers (Transfer-Encoding: chunked and Content-Length) */
-	if((http->postsize != -1) && !data->req.upload_chunky &&
-	(data->req.authneg \|\|
-	!Curl_checkheaders(data, STRCONST("Content-Length")))) {
-	/* we allow replacing this header if not during auth negotiation,
-	although it isn't very wise to actually set your own */
-	result = Curl_dyn_addf(r, "Content-Length: %" CURL_FORMAT_CURL_OFF_T
-	"\r\n", http->postsize);
-	if(result)
-	goto out;
-	}
-
-	if(!Curl_checkheaders(data, STRCONST("Content-Type"))) {
-	result = Curl_dyn_addn(r, STRCONST("Content-Type: application/"
-	"x-www-form-urlencoded\r\n"));
-	if(result)
-	goto out;
+	if(httpreq == HTTPREQ_POST) {
+	if(!Curl_checkheaders(data, STRCONST("Content-Type"))) {
+	result = Curl_dyn_addn(r, STRCONST("Content-Type: application/"
+	"x-www-form-urlencoded\r\n"));
+	if(result)
+	goto out;
+	}
	}
-
	result = addexpect(data, r);
	if(result)
	goto out;
-
-	result = Curl_dyn_addn(r, STRCONST("\r\n"));
-	if(result)
-	goto out;
-
-	if(!http->postsize) {
-	Curl_pgrsSetUploadSize(data, 0);
-	result = Client_reader_set_null(data);
-	}
-	else if(data->set.postfields) {
-	Curl_pgrsSetUploadSize(data, http->postsize);
-	if(http->postsize > 0)
-	result = Client_reader_set_buf(data, data->set.postfields,
-	(size_t)http->postsize);
-	else
-	result = Client_reader_set_null(data);
-	}
-	else { /* we read the bytes from the callback */
-	Curl_pgrsSetUploadSize(data, http->postsize);
-	result = Client_reader_set_fread(data, http->postsize);
-	}
	break;
-
	default:
-	/* HTTP GET/HEAD download, has no body, needs no Content-Length */
-	result = Curl_dyn_addn(r, STRCONST("\r\n"));
-	if(!result)
-	result = Client_reader_set_null(data);
	break;
	}

+	/* end of headers */
+	result = Curl_dyn_addn(r, STRCONST("\r\n"));
+	Curl_pgrsSetUploadSize(data, req_clen);
+
	out:
	if(!result) {
	/* setup variables for the upcoming transfer */
@@ -2427,7 +2420,7 @@ CURLcode Curl_http_range(struct Curl_easy *data,
	}
	else if((httpreq == HTTPREQ_POST \|\| httpreq == HTTPREQ_PUT) &&
	!Curl_checkheaders(data, STRCONST("Content-Range"))) {
-
+	curl_off_t req_clen = Curl_creader_total_length(data);
	/* if a line like this was already allocated, free the previous one */
	free(data->state.aptr.rangeline);

@@ -2438,25 +2431,28 @@ CURLcode Curl_http_range(struct Curl_easy *data,
	data->state.aptr.rangeline =
	aprintf("Content-Range: bytes 0-%" CURL_FORMAT_CURL_OFF_T
	"/%" CURL_FORMAT_CURL_OFF_T "\r\n",
-	data->state.infilesize - 1, data->state.infilesize);
+	req_clen - 1, req_clen);

	}
	else if(data->state.resume_from) {
	/* This is because "resume" was selected */
-	curl_off_t total_expected_size =
-	data->state.resume_from + data->state.infilesize;
+	/* TODO: not sure if we want to send this header during authentication
+	* negotiation, but test1084 checks for it. In which case we have a
+	* "null" client reader installed that gives an unexpected length. */
+	curl_off_t total_len = data->req.authneg?
+	data->state.infilesize :
+	(data->state.resume_from + req_clen);
	data->state.aptr.rangeline =
	aprintf("Content-Range: bytes %s%" CURL_FORMAT_CURL_OFF_T
	"/%" CURL_FORMAT_CURL_OFF_T "\r\n",
-	data->state.range, total_expected_size-1,
-	total_expected_size);
+	data->state.range, total_len-1, total_len);
	}
	else {
	/* Range was selected and then we just pass the incoming range and
	append total size */
	data->state.aptr.rangeline =
	aprintf("Content-Range: bytes %s/%" CURL_FORMAT_CURL_OFF_T "\r\n",
-	data->state.range, data->state.infilesize);
+	data->state.range, req_clen);
	}
	if(!data->state.aptr.rangeline)
	return CURLE_OUT_OF_MEMORY;
@@ -2465,87 +2461,6 @@ CURLcode Curl_http_range(struct Curl_easy *data,
	return CURLE_OK;
	}

-	CURLcode Curl_http_resume(struct Curl_easy *data,
-	struct connectdata *conn,
-	Curl_HttpReq httpreq)
-	{
-	if((HTTPREQ_POST == httpreq \|\| HTTPREQ_PUT == httpreq) &&
-	data->state.resume_from) {
-	/**********************************************************************
-	* Resuming upload in HTTP means that we PUT or POST and that we have
-	* got a resume_from value set. The resume value has already created
-	* a Range: header that will be passed along. We need to "fast forward"
-	* the file the given number of bytes and decrease the assume upload
-	* file size before we continue this venture in the dark lands of HTTP.
-	* Resuming mime/form posting at an offset > 0 has no sense and is ignored.
-	*********************************************************************/
-
-	if(data->state.resume_from < 0) {
-	/*
-	* This is meant to get the size of the present remote-file by itself.
-	* We don't support this now. Bail out!
-	*/
-	data->state.resume_from = 0;
-	}
-
-	if(data->state.resume_from && !data->state.followlocation) {
-	/* only act on the first request */
-
-	/* Now, let's read off the proper amount of bytes from the
-	input. */
-	int seekerr = CURL_SEEKFUNC_CANTSEEK;
-	if(conn->seek_func) {
-	Curl_set_in_callback(data, true);
-	seekerr = conn->seek_func(conn->seek_client, data->state.resume_from,
-	SEEK_SET);
-	Curl_set_in_callback(data, false);
-	}
-
-	if(seekerr != CURL_SEEKFUNC_OK) {
-	curl_off_t passed = 0;
-
-	if(seekerr != CURL_SEEKFUNC_CANTSEEK) {
-	failf(data, "Could not seek stream");
-	return CURLE_READ_ERROR;
-	}
-	/* when seekerr == CURL_SEEKFUNC_CANTSEEK (can't seek to offset) */
-	do {
-	char scratch[4*1024];
-	size_t readthisamountnow =
-	(data->state.resume_from - passed > (curl_off_t)sizeof(scratch)) ?
-	sizeof(scratch) :
-	curlx_sotouz(data->state.resume_from - passed);
-
-	size_t actuallyread =
-	data->state.fread_func(scratch, 1, readthisamountnow,
-	data->state.in);
-
-	passed += actuallyread;
-	if((actuallyread == 0) \|\| (actuallyread > readthisamountnow)) {
-	/* this checks for greater-than only to make sure that the
-	CURL_READFUNC_ABORT return code still aborts */
-	failf(data, "Could only read %" CURL_FORMAT_CURL_OFF_T
-	" bytes from the input", passed);
-	return CURLE_READ_ERROR;
-	}
-	} while(passed < data->state.resume_from);
-	}
-
-	/* now, decrease the size of the read */
-	if(data->state.infilesize>0) {
-	data->state.infilesize -= data->state.resume_from;
-
-	if(data->state.infilesize <= 0) {
-	failf(data, "File already completely uploaded");
-	return CURLE_PARTIAL_FILE;
-	}
-	}
-	/* we've passed, proceed as normal */
-	}
-	}
-	return CURLE_OK;
-	}
-
	CURLcode Curl_http_firstwrite(struct Curl_easy *data,
	struct connectdata *conn,
	bool *done)
@@ -2754,17 +2669,13 @@ CURLcode Curl_http(struct Curl_easy data, bool done)
	goto fail;
	#endif

-	result = Curl_http_body(data, conn, httpreq, &te);
+	result = Curl_http_req_set_reader(data, httpreq, &te);
	if(result)
	goto fail;

	p_accept = Curl_checkheaders(data,
	STRCONST("Accept"))?NULL:"Accept: /\r\n";

-	result = Curl_http_resume(data, conn, httpreq);
-	if(result)
-	goto fail;
-
	result = Curl_http_range(data, httpreq);
	if(result)
	goto fail;
@@ -2882,14 +2793,8 @@ CURLcode Curl_http(struct Curl_easy data, bool done)
	result = Curl_add_custom_headers(data, FALSE, &req);

	if(!result) {
-	if((httpreq == HTTPREQ_GET) \|\|
-	(httpreq == HTTPREQ_HEAD))
-	Curl_pgrsSetUploadSize(data, 0); /* nothing */
-
	/* req_send takes ownership of the 'req' memory on success */
	result = Curl_http_req_complete(data, &req, httpreq);
-	if(!result && data->req.upload_chunky)
-	result = Curl_httpchunk_add_reader(data);
	if(!result)
	result = Curl_req_send(data, &req);
	}
@@ -3736,7 +3641,7 @@ static CURLcode http_rw_headers(struct Curl_easy *data,

	if(k->httpcode >= 300) {
	if((!data->req.authneg) && !conn->bits.close &&
-	!data->state.rewindbeforesend) {
+	!Curl_creader_will_rewind(data)) {
	/*
	* General treatment of errors when about to send data. Including :
	* "417 Expectation Failed", while waiting for 100-continue.
@@ -3805,7 +3710,7 @@ static CURLcode http_rw_headers(struct Curl_easy *data,
	}
	}

-	if(data->state.rewindbeforesend && !Curl_req_done_sending(data)) {
+	if(Curl_creader_will_rewind(data) && !Curl_req_done_sending(data)) {
	/* We rewind before next send, continue sending now */
	infof(data, "Keep sending data to get tossed away");
	k->keepon \|= KEEP_SEND;

lib/http.h+5 -8

@@ -105,9 +105,9 @@ CURLcode Curl_http_statusline(struct Curl_easy *data,
	CURLcode Curl_http_header(struct Curl_easy data, struct connectdata conn,
	char *headp);
	CURLcode Curl_transferencode(struct Curl_easy *data);
-	CURLcode Curl_http_body(struct Curl_easy data, struct connectdata conn,
-	Curl_HttpReq httpreq,
-	const char **teep);
+	CURLcode Curl_http_req_set_reader(struct Curl_easy *data,
+	Curl_HttpReq httpreq,
+	const char **tep);
	CURLcode Curl_http_req_complete(struct Curl_easy *data,
	struct dynbuf *r, Curl_HttpReq httpreq);
	bool Curl_use_http_1_1plus(const struct Curl_easy *data,
@@ -119,9 +119,6 @@ CURLcode Curl_http_cookies(struct Curl_easy *data,
	#else
	#define Curl_http_cookies(a,b,c) CURLE_OK
	#endif
-	CURLcode Curl_http_resume(struct Curl_easy *data,
-	struct connectdata *conn,
-	Curl_HttpReq httpreq);
	CURLcode Curl_http_range(struct Curl_easy *data,
	Curl_HttpReq httpreq);
	CURLcode Curl_http_firstwrite(struct Curl_easy *data,
@@ -188,11 +185,11 @@ CURLcode Curl_http_auth_act(struct Curl_easy *data);
	* HTTP unique setup
	***************************************************************************/
	struct HTTP {
-	curl_off_t postsize; /* off_t to handle large file sizes */
-
	#ifndef CURL_DISABLE_HTTP
	void h2_ctx; / HTTP/2 implementation context */
	void h3_ctx; / HTTP/3 implementation context */
+	#else
+	char unused;
	#endif
	};

lib/http_chunks.c+12 -0

@@ -624,6 +624,15 @@ static CURLcode cr_chunked_read(struct Curl_easy *data,
	return CURLE_OK;
	}

+	static curl_off_t cr_chunked_total_length(struct Curl_easy *data,
+	struct Curl_creader *reader)
+	{
+	/* this reader changes length depending on input */
+	(void)data;
+	(void)reader;
+	return -1;
+	}
+
	/* HTTP chunked Transfer-Encoding encoder */
	const struct Curl_crtype Curl_httpchunk_encoder = {
	"chunked",
@@ -631,6 +640,9 @@ const struct Curl_crtype Curl_httpchunk_encoder = {
	cr_chunked_read,
	cr_chunked_close,
	Curl_creader_def_needs_rewind,
+	cr_chunked_total_length,
+	Curl_creader_def_resume_from,
+	Curl_creader_def_rewind,
	sizeof(struct chunked_reader)
	};

lib/multi.c+0 -90

@@ -1816,93 +1816,6 @@ static CURLcode protocol_connect(struct Curl_easy *data,
	return result; /* pass back status */
	}

-	/*
-	* readrewind() rewinds the read stream. This is typically used for HTTP
-	* POST/PUT with multi-pass authentication when a sending was denied and a
-	* resend is necessary.
-	*/
-	static CURLcode readrewind(struct Curl_easy *data)
-	{
-	#if !defined(CURL_DISABLE_MIME) \|\| !defined(CURL_DISABLE_FORM_API)
-	curl_mimepart *mimepart = &data->set.mimepost;
-	#endif
-	DEBUGASSERT(data->conn);
-
-	data->state.rewindbeforesend = FALSE; /* we rewind now */
-
-	/* explicitly switch off sending data on this connection now since we are
-	about to restart a new transfer and thus we want to avoid inadvertently
-	sending more data on the existing connection until the next transfer
-	starts */
-	data->req.keepon &= ~KEEP_SEND;
-
-	/* We have sent away data. If not using CURLOPT_POSTFIELDS or
-	CURLOPT_HTTPPOST, call app to rewind
-	*/
-	#if !defined(CURL_DISABLE_HTTP) && !defined(CURL_DISABLE_MIME)
-	if(data->conn->handler->protocol & PROTO_FAMILY_HTTP) {
-	if(data->state.mimepost)
-	mimepart = data->state.mimepost;
-	}
-	#endif
-	if(data->set.postfields \|\|
-	(data->state.httpreq == HTTPREQ_GET) \|\|
-	(data->state.httpreq == HTTPREQ_HEAD))
-	; /* no need to rewind */
-	#if !defined(CURL_DISABLE_MIME) \|\| !defined(CURL_DISABLE_FORM_API)
-	else if(data->state.httpreq == HTTPREQ_POST_MIME \|\|
-	data->state.httpreq == HTTPREQ_POST_FORM) {
-	CURLcode result = Curl_mime_rewind(mimepart);
-	if(result) {
-	failf(data, "Cannot rewind mime/post data");
-	return result;
-	}
-	}
-	#endif
-	else {
-	if(data->set.seek_func) {
-	int err;
-
-	Curl_set_in_callback(data, true);
-	err = (data->set.seek_func)(data->set.seek_client, 0, SEEK_SET);
-	Curl_set_in_callback(data, false);
-	if(err) {
-	failf(data, "seek callback returned error %d", (int)err);
-	return CURLE_SEND_FAIL_REWIND;
-	}
-	}
-	else if(data->set.ioctl_func) {
-	curlioerr err;
-
-	Curl_set_in_callback(data, true);
-	err = (data->set.ioctl_func)(data, CURLIOCMD_RESTARTREAD,
-	data->set.ioctl_client);
-	Curl_set_in_callback(data, false);
-	infof(data, "the ioctl callback returned %d", (int)err);
-
-	if(err) {
-	failf(data, "ioctl callback returned error %d", (int)err);
-	return CURLE_SEND_FAIL_REWIND;
-	}
-	}
-	else {
-	/* If no CURLOPT_READFUNCTION is used, we know that we operate on a
-	given FILE * stream and we can actually attempt to rewind that
-	ourselves with fseek() */
-	if(data->state.fread_func == (curl_read_callback)fread) {
-	if(-1 != fseek(data->state.in, 0, SEEK_SET))
-	/* successful rewind */
-	return CURLE_OK;
-	}
-
-	/* no callback set or failure above, makes us fail at once */
-	failf(data, "necessary data rewind wasn't possible");
-	return CURLE_SEND_FAIL_REWIND;
-	}
-	}
-	return CURLE_OK;
-	}
-
	/*
	* Curl_preconnect() is called immediately before a connect starts. When a
	* redirect is followed, this is then called multiple times during a single
@@ -2169,9 +2082,6 @@ static CURLMcode multi_runsingle(struct Curl_multi *multi,
	break;

	case MSTATE_PROTOCONNECT:
-	if(data->state.rewindbeforesend)
-	result = readrewind(data);
-
	if(!result && data->conn->bits.reuse) {
	/* ftp seems to hang when protoconnect on reused connection
	* since we handle PROTOCONNECT in general inside the filers, it

lib/request.c+49 -15

@@ -49,8 +49,13 @@ CURLcode Curl_req_init(struct SingleRequest *req)
	CURLcode Curl_req_start(struct SingleRequest *req,
	struct Curl_easy *data)
	{
+	CURLcode result;
+
	req->start = Curl_now();
-	Curl_client_reset(data);
+	result = Curl_client_start(data);
+	if(result)
+	return result;
+
	if(!req->sendbuf_init) {
	Curl_bufq_init2(&req->sendbuf, data->set.upload_buffer_size, 1,
	BUFQ_OPT_SOFT_LIMIT);
@@ -82,14 +87,15 @@ CURLcode Curl_req_done(struct SingleRequest *req,

	void Curl_req_reset(struct SingleRequest req, struct Curl_easy data)
	{
-	struct bufq savebuf;
-	bool save_init;
+	struct curltime t0 = {0, 0};

	/* This is a bit ugly. `req->p` is a union and we assume we can
	* free this safely without leaks. */
	Curl_safefree(req->p.http);
	Curl_safefree(req->newurl);
	Curl_client_reset(data);
+	if(req->sendbuf_init)
+	Curl_bufq_reset(&req->sendbuf);

	#ifndef CURL_DISABLE_DOH
	if(req->doh) {
@@ -97,17 +103,45 @@ void Curl_req_reset(struct SingleRequest req, struct Curl_easy data)
	Curl_close(&req->doh->probe[1].easy);
	}
	#endif
-
-	savebuf = req->sendbuf;
-	save_init = req->sendbuf_init;
-
-	memset(req, 0, sizeof(*req));
-	data->req.size = data->req.maxdownload = -1;
-	data->req.no_body = data->set.opt_no_body;
-	if(save_init) {
-	req->sendbuf = savebuf;
-	req->sendbuf_init = save_init;
-	}
+	/* Can no longer memset() this struct as we need to keep some state */
+	req->size = -1;
+	req->maxdownload = -1;
+	req->bytecount = 0;
+	req->writebytecount = 0;
+	req->start = t0;
+	req->headerbytecount = 0;
+	req->allheadercount = 0;
+	req->deductheadercount = 0;
+	req->headerline = 0;
+	req->offset = 0;
+	req->httpcode = 0;
+	req->keepon = 0;
+	req->start100 = t0;
+	req->exp100 = EXP100_SEND_DATA;
+	req->upgr101 = UPGR101_INIT;
+	req->timeofdoc = 0;
+	req->bodywrites = 0;
+	req->location = NULL;
+	req->newurl = NULL;
+	#ifndef CURL_DISABLE_COOKIES
+	req->setcookies = 0;
+	#endif
+	req->header = FALSE;
+	req->content_range = FALSE;
+	req->download_done = FALSE;
+	req->eos_written = FALSE;
+	req->eos_read = FALSE;
+	req->upload_done = FALSE;
+	req->upload_aborted = FALSE;
+	req->ignorebody = FALSE;
+	req->http_bodyless = FALSE;
+	req->chunk = FALSE;
+	req->ignore_cl = FALSE;
+	req->upload_chunky = FALSE;
+	req->getheader = FALSE;
+	req->forbidchunk = FALSE;
+	req->no_body = data->set.opt_no_body;
+	req->authneg = FALSE;
	}

	void Curl_req_free(struct SingleRequest req, struct Curl_easy data)
@@ -118,7 +152,7 @@ void Curl_req_free(struct SingleRequest req, struct Curl_easy data)
	Curl_safefree(req->newurl);
	if(req->sendbuf_init)
	Curl_bufq_free(&req->sendbuf);
-	Curl_client_reset(data);
+	Curl_client_cleanup(data);

	#ifndef CURL_DISABLE_DOH
	if(req->doh) {

lib/request.h+1 -2

@@ -119,8 +119,6 @@ struct SingleRequest {
	#ifndef CURL_DISABLE_DOH
	struct dohdata doh; / DoH specific data for this request */
	#endif
-	char fread_eof[2]; /* the body read callback (index 0) returned EOF or
-	the trailer read callback (index 1) returned EOF */
	#ifndef CURL_DISABLE_COOKIES
	unsigned char setcookies;
	#endif
@@ -129,6 +127,7 @@ struct SingleRequest {
	BIT(download_done); /* set to TRUE when download is complete */
	BIT(eos_written); /* iff EOS has been written to client */
	BIT(eos_read); /* iff EOS has been read from the client */
+	BIT(rewind_read); /* iff reader needs rewind at next start */
	BIT(upload_done); /* set to TRUE when all request data has been sent */
	BIT(upload_aborted); /* set to TRUE when upload was aborted. Will also
	* show `upload_done` as TRUE. */

lib/rtsp.c+19 -18

@@ -225,8 +225,6 @@ static CURLcode rtsp_do(struct Curl_easy data, bool done)
	Curl_RtspReq rtspreq = data->set.rtspreq;
	struct RTSP *rtsp = data->req.p.rtsp;
	struct dynbuf req_buffer;
-	curl_off_t postsize = 0; /* for ANNOUNCE and SET_PARAMETER */
-	curl_off_t putsize = 0; /* for ANNOUNCE and SET_PARAMETER */

	const char *p_request = NULL;
	const char *p_session_id = NULL;
@@ -499,38 +497,41 @@ static CURLcode rtsp_do(struct Curl_easy data, bool done)
	if(rtspreq == RTSPREQ_ANNOUNCE \|\|
	rtspreq == RTSPREQ_SET_PARAMETER \|\|
	rtspreq == RTSPREQ_GET_PARAMETER) {
+	curl_off_t req_clen; /* request content length */

	if(data->state.upload) {
-	putsize = data->state.infilesize;
+	req_clen = data->state.infilesize;
	data->state.httpreq = HTTPREQ_PUT;
-	result = Client_reader_set_fread(data, putsize);
+	result = Curl_creader_set_fread(data, req_clen);
	if(result)
	goto out;
	}
	else {
-	postsize = (data->state.infilesize != -1)?
-	data->state.infilesize:
-	(data->set.postfields? (curl_off_t)strlen(data->set.postfields):0);
-	data->state.httpreq = HTTPREQ_POST;
-	if(postsize > 0 && data->set.postfields)
-	result = Client_reader_set_buf(data, data->set.postfields,
-	(size_t)postsize);
-	else if(!postsize)
-	result = Client_reader_set_null(data);
-	else
-	result = Client_reader_set_fread(data, postsize);
+	if(data->set.postfields) {
+	size_t plen = strlen(data->set.postfields);
+	req_clen = (curl_off_t)plen;
+	result = Curl_creader_set_buf(data, data->set.postfields, plen);
+	}
+	else if(data->state.infilesize >= 0) {
+	req_clen = data->state.infilesize;
+	result = Curl_creader_set_fread(data, req_clen);
+	}
+	else {
+	req_clen = 0;
+	result = Curl_creader_set_null(data);
+	}
	if(result)
	goto out;
	}

-	if(putsize > 0 \|\| postsize > 0) {
+	if(req_clen > 0) {
	/* As stated in the http comments, it is probably not wise to
	* actually set a custom Content-Length in the headers */
	if(!Curl_checkheaders(data, STRCONST("Content-Length"))) {
	result =
	Curl_dyn_addf(&req_buffer,
	"Content-Length: %" CURL_FORMAT_CURL_OFF_T"\r\n",
-	(data->state.upload ? putsize : postsize));
+	req_clen);
	if(result)
	goto out;
	}
@@ -565,7 +566,7 @@ static CURLcode rtsp_do(struct Curl_easy data, bool done)
	}
	}
	else {
-	result = Client_reader_set_null(data);
+	result = Curl_creader_set_null(data);
	if(result)
	goto out;
	}

lib/sendf.c+332 -16

@@ -51,6 +51,7 @@
	#include "strdup.h"
	#include "http2.h"
	#include "progress.h"
+	#include "warnless.h"
	#include "ws.h"

	/* The last 3 #include files should be in this order */
@@ -112,9 +113,9 @@ static void cl_reset_reader(struct Curl_easy *data)
	}
	}

-	void Curl_client_reset(struct Curl_easy *data)
+	void Curl_client_cleanup(struct Curl_easy *data)
	{
-	DEBUGF(infof(data, "Curl_client_reset()"));
+	DEBUGF(infof(data, "Curl_client_cleanup()"));
	cl_reset_reader(data);
	cl_reset_writer(data);

@@ -122,6 +123,54 @@ void Curl_client_reset(struct Curl_easy *data)
	data->req.headerline = 0;
	}

+	void Curl_client_reset(struct Curl_easy *data)
+	{
+	if(data->req.rewind_read) {
+	/* already requested */
+	DEBUGF(infof(data, "Curl_client_reset(), will rewind_read"));
+	}
+	else {
+	DEBUGF(infof(data, "Curl_client_reset(), clear readers"));
+	cl_reset_reader(data);
+	}
+	cl_reset_writer(data);
+
+	data->req.bytecount = 0;
+	data->req.headerline = 0;
+	}
+
+	CURLcode Curl_client_start(struct Curl_easy *data)
+	{
+	if(data->req.rewind_read) {
+	struct Curl_creader *r = data->req.reader_stack;
+	CURLcode result = CURLE_OK;
+
+	DEBUGF(infof(data, "client start, rewind readers"));
+	while(r) {
+	result = r->crt->rewind(data, r);
+	if(result) {
+	failf(data, "rewind of client reader '%s' failed: %d",
+	r->crt->name, result);
+	return result;
+	}
+	r = r->next;
+	}
+	data->req.rewind_read = FALSE;
+	cl_reset_reader(data);
+	}
+	return CURLE_OK;
+	}
+
+	bool Curl_creader_will_rewind(struct Curl_easy *data)
+	{
+	return data->req.rewind_read;
+	}
+
+	void Curl_creader_set_rewind(struct Curl_easy *data, bool enable)
+	{
+	data->req.rewind_read = !!enable;
+	}
+
	/* Write data using an unencoding writer stack. "nbytes" is not
	allowed to be 0. */
	CURLcode Curl_cwriter_write(struct Curl_easy *data,
@@ -475,8 +524,35 @@ bool Curl_creader_def_needs_rewind(struct Curl_easy *data,
	return FALSE;
	}

+	curl_off_t Curl_creader_def_total_length(struct Curl_easy *data,
+	struct Curl_creader *reader)
+	{
+	return reader->next?
+	reader->next->crt->total_length(data, reader->next) : -1;
+	}
+
+	CURLcode Curl_creader_def_resume_from(struct Curl_easy *data,
+	struct Curl_creader *reader,
+	curl_off_t offset)
+	{
+	(void)data;
+	(void)reader;
+	(void)offset;
+	return CURLE_READ_ERROR;
+	}
+
+	CURLcode Curl_creader_def_rewind(struct Curl_easy *data,
+	struct Curl_creader *reader)
+	{
+	(void)data;
+	(void)reader;
+	return CURLE_OK;
+	}
+
	struct cr_in_ctx {
	struct Curl_creader super;
+	curl_read_callback read_cb;
+	void *cb_user_data;
	curl_off_t total_len;
	curl_off_t read_len;
	CURLcode error_result;
@@ -489,6 +565,8 @@ static CURLcode cr_in_init(struct Curl_easy data, struct Curl_creader reader)
	{
	struct cr_in_ctx ctx = (struct cr_in_ctx )reader;
	(void)data;
+	ctx->read_cb = data->state.fread_func;
+	ctx->cb_user_data = data->state.in;
	ctx->total_len = -1;
	ctx->read_len = 0;
	return CURLE_OK;
@@ -523,9 +601,9 @@ static CURLcode cr_in_read(struct Curl_easy *data,
	blen = (size_t)remain;
	}
	nread = 0;
-	if(data->state.fread_func && blen) {
+	if(ctx->read_cb && blen) {
	Curl_set_in_callback(data, true);
-	nread = data->state.fread_func(buf, 1, blen, data->state.in);
+	nread = ctx->read_cb(buf, 1, blen, ctx->cb_user_data);
	Curl_set_in_callback(data, false);
	ctx->has_used_cb = TRUE;
	}
@@ -596,12 +674,167 @@ static bool cr_in_needs_rewind(struct Curl_easy *data,
	return ctx->has_used_cb;
	}

+	static curl_off_t cr_in_total_length(struct Curl_easy *data,
+	struct Curl_creader *reader)
+	{
+	struct cr_in_ctx ctx = (struct cr_in_ctx )reader;
+	(void)data;
+	return ctx->total_len;
+	}
+
+	static CURLcode cr_in_resume_from(struct Curl_easy *data,
+	struct Curl_creader *reader,
+	curl_off_t offset)
+	{
+	struct cr_in_ctx ctx = (struct cr_in_ctx )reader;
+	int seekerr = CURL_SEEKFUNC_CANTSEEK;
+
+	DEBUGASSERT(data->conn);
+	/* already started reading? */
+	if(ctx->read_len)
+	return CURLE_READ_ERROR;
+
+	if(data->conn->seek_func) {
+	Curl_set_in_callback(data, true);
+	seekerr = data->conn->seek_func(data->conn->seek_client, offset, SEEK_SET);
+	Curl_set_in_callback(data, false);
+	}
+
+	if(seekerr != CURL_SEEKFUNC_OK) {
+	curl_off_t passed = 0;
+
+	if(seekerr != CURL_SEEKFUNC_CANTSEEK) {
+	failf(data, "Could not seek stream");
+	return CURLE_READ_ERROR;
+	}
+	/* when seekerr == CURL_SEEKFUNC_CANTSEEK (can't seek to offset) */
+	do {
+	char scratch[4*1024];
+	size_t readthisamountnow =
+	(offset - passed > (curl_off_t)sizeof(scratch)) ?
+	sizeof(scratch) :
+	curlx_sotouz(offset - passed);
+	size_t actuallyread;
+
+	Curl_set_in_callback(data, true);
+	actuallyread = ctx->read_cb(scratch, 1, readthisamountnow,
+	ctx->cb_user_data);
+	Curl_set_in_callback(data, false);
+
+	passed += actuallyread;
+	if((actuallyread == 0) \|\| (actuallyread > readthisamountnow)) {
+	/* this checks for greater-than only to make sure that the
+	CURL_READFUNC_ABORT return code still aborts */
+	failf(data, "Could only read %" CURL_FORMAT_CURL_OFF_T
+	" bytes from the input", passed);
+	return CURLE_READ_ERROR;
+	}
+	} while(passed < offset);
+	}
+
+	/* now, decrease the size of the read */
+	if(ctx->total_len > 0) {
+	ctx->total_len -= offset;
+
+	if(ctx->total_len <= 0) {
+	failf(data, "File already completely uploaded");
+	return CURLE_PARTIAL_FILE;
+	}
+	}
+	/* we've passed, proceed as normal */
+	return CURLE_OK;
+	}
+
+	static CURLcode cr_in_rewind(struct Curl_easy *data,
+	struct Curl_creader *reader)
+	{
+	struct cr_in_ctx ctx = (struct cr_in_ctx )reader;
+	/* TODO: I wonder if we should rather give mime its own client
+	* reader type. This is messy. */
+	#if !defined(CURL_DISABLE_MIME) \|\| !defined(CURL_DISABLE_FORM_API)
+	curl_mimepart *mimepart = &data->set.mimepost;
+	#endif
+
+	/* If we never invoked the callback, there is noting to rewind */
+	if(!ctx->has_used_cb)
+	return CURLE_OK;
+
+	/* We have sent away data. If not using CURLOPT_POSTFIELDS or
+	CURLOPT_HTTPPOST, call app to rewind
+	*/
+	#if !defined(CURL_DISABLE_HTTP) && !defined(CURL_DISABLE_MIME)
+	if(data->conn->handler->protocol & PROTO_FAMILY_HTTP) {
+	if(data->state.mimepost)
+	mimepart = data->state.mimepost;
+	}
+	#endif
+	#if !defined(CURL_DISABLE_MIME) \|\| !defined(CURL_DISABLE_FORM_API)
+	if(ctx->read_cb == (curl_read_callback)Curl_mime_read) {
+	CURLcode result = Curl_mime_rewind(mimepart);
+	DEBUGF(infof(data, "cr_in, rewind mime/post data -> %d", result));
+	if(result) {
+	failf(data, "Cannot rewind mime/post data");
+	}
+	return result;
+	}
+	#endif
+
+	/* With mime out of the way, handle "normal" fread callbacks */
+	if(data->set.seek_func) {
+	int err;
+
+	Curl_set_in_callback(data, true);
+	err = (data->set.seek_func)(data->set.seek_client, 0, SEEK_SET);
+	Curl_set_in_callback(data, false);
+	DEBUGF(infof(data, "cr_in, rewind via set.seek_func -> %d", err));
+	if(err) {
+	failf(data, "seek callback returned error %d", (int)err);
+	return CURLE_SEND_FAIL_REWIND;
+	}
+	}
+	else if(data->set.ioctl_func) {
+	curlioerr err;
+
+	Curl_set_in_callback(data, true);
+	err = (data->set.ioctl_func)(data, CURLIOCMD_RESTARTREAD,
+	data->set.ioctl_client);
+	Curl_set_in_callback(data, false);
+	DEBUGF(infof(data, "cr_in, rewind via set.ioctl_func -> %d", (int)err));
+	if(err) {
+	failf(data, "ioctl callback returned error %d", (int)err);
+	return CURLE_SEND_FAIL_REWIND;
+	}
+	}
+	else {
+	/* If no CURLOPT_READFUNCTION is used, we know that we operate on a
+	given FILE * stream and we can actually attempt to rewind that
+	ourselves with fseek() */
+	if(data->state.fread_func == (curl_read_callback)fread) {
+	int err = fseek(data->state.in, 0, SEEK_SET);
+	DEBUGF(infof(data, "cr_in, rewind via fseek -> %d(%d)",
+	(int)err, (int)errno));
+	if(-1 != err)
+	/* successful rewind */
+	return CURLE_OK;
+	}
+
+	/* no callback set or failure above, makes us fail at once */
+	failf(data, "necessary data rewind wasn't possible");
+	return CURLE_SEND_FAIL_REWIND;
+	}
+	return CURLE_OK;
+	}
+
+
	static const struct Curl_crtype cr_in = {
	"cr-in",
	cr_in_init,
	cr_in_read,
	Curl_creader_def_close,
	cr_in_needs_rewind,
+	cr_in_total_length,
+	cr_in_resume_from,
+	cr_in_rewind,
	sizeof(struct cr_in_ctx)
	};

@@ -730,12 +963,24 @@ static CURLcode cr_lc_read(struct Curl_easy *data,
	return result;
	}

+	static curl_off_t cr_lc_total_length(struct Curl_easy *data,
+	struct Curl_creader *reader)
+	{
+	/* this reader changes length depending on input */
+	(void)data;
+	(void)reader;
+	return -1;
+	}
+
	static const struct Curl_crtype cr_lc = {
	"cr-lineconv",
	cr_lc_init,
	cr_lc_read,
	cr_lc_close,
	Curl_creader_def_needs_rewind,
+	cr_lc_total_length,
+	Curl_creader_def_resume_from,
+	Curl_creader_def_rewind,
	sizeof(struct cr_lc_ctx)
	};

@@ -756,7 +1001,8 @@ static CURLcode cr_lc_add(struct Curl_easy *data)

	static CURLcode do_init_reader_stack(struct Curl_easy *data,
	const struct Curl_crtype *crt,
-	struct Curl_creader **preader)
+	struct Curl_creader **preader,
+	curl_off_t clen)
	{
	CURLcode result;

@@ -766,11 +1012,13 @@ static CURLcode do_init_reader_stack(struct Curl_easy *data,
	return result;
	data->req.reader_stack = *preader;

-	if(data->set.crlf
+	/* if we do not have 0 length init, and crlf conversion is wanted,
+	* add the reader for it */
+	if(clen && (data->set.crlf
	#ifdef CURL_DO_LINEEND_CONV
	\|\| data->state.prefer_ascii
	#endif
-	) {
+	)) {
	result = cr_lc_add(data);
	if(result)
	return result;
@@ -779,13 +1027,13 @@ static CURLcode do_init_reader_stack(struct Curl_easy *data,
	return result;
	}

-	CURLcode Client_reader_set_fread(struct Curl_easy *data, curl_off_t len)
+	CURLcode Curl_creader_set_fread(struct Curl_easy *data, curl_off_t len)
	{
	CURLcode result;
	struct Curl_creader *r;

	cl_reset_reader(data);
-	result = do_init_reader_stack(data, &cr_in, &r);
+	result = do_init_reader_stack(data, &cr_in, &r, len);
	if(!result && r) {
	struct cr_in_ctx ctx = (struct cr_in_ctx )r;
	DEBUGASSERT(r->crt == &cr_in);
@@ -801,7 +1049,7 @@ CURLcode Curl_creader_add(struct Curl_easy *data,
	struct Curl_creader **anchor = &data->req.reader_stack;

	if(!*anchor) {
-	result = Client_reader_set_fread(data, data->state.infilesize);
+	result = Curl_creader_set_fread(data, data->state.infilesize);
	if(result)
	return result;
	}
@@ -826,7 +1074,7 @@ CURLcode Curl_client_read(struct Curl_easy data, char buf, size_t blen,
	DEBUGASSERT(eos);

	if(!data->req.reader_stack) {
-	result = Client_reader_set_fread(data, data->state.infilesize);
+	result = Curl_creader_set_fread(data, data->state.infilesize);
	if(result)
	return result;
	DEBUGASSERT(data->req.reader_stack);
@@ -837,7 +1085,7 @@ CURLcode Curl_client_read(struct Curl_easy data, char buf, size_t blen,
	return result;
	}

-	bool Curl_client_read_needs_rewind(struct Curl_easy *data)
+	bool Curl_creader_needs_rewind(struct Curl_easy *data)
	{
	struct Curl_creader *reader = data->req.reader_stack;
	while(reader) {
@@ -862,21 +1110,33 @@ static CURLcode cr_null_read(struct Curl_easy *data,
	return CURLE_OK;
	}

+	static curl_off_t cr_null_total_length(struct Curl_easy *data,
+	struct Curl_creader *reader)
+	{
+	/* this reader changes length depending on input */
+	(void)data;
+	(void)reader;
+	return 0;
+	}
+
	static const struct Curl_crtype cr_null = {
	"cr-null",
	Curl_creader_def_init,
	cr_null_read,
	Curl_creader_def_close,
	Curl_creader_def_needs_rewind,
+	cr_null_total_length,
+	Curl_creader_def_resume_from,
+	Curl_creader_def_rewind,
	sizeof(struct Curl_creader)
	};

-	CURLcode Client_reader_set_null(struct Curl_easy *data)
+	CURLcode Curl_creader_set_null(struct Curl_easy *data)
	{
	struct Curl_creader *r;

	cl_reset_reader(data);
-	return do_init_reader_stack(data, &cr_null, &r);
+	return do_init_reader_stack(data, &cr_null, &r, 0);
	}

	struct cr_buf_ctx {
@@ -918,23 +1178,57 @@ static bool cr_buf_needs_rewind(struct Curl_easy *data,
	return ctx->index > 0;
	}

+	static curl_off_t cr_buf_total_length(struct Curl_easy *data,
+	struct Curl_creader *reader)
+	{
+	struct cr_buf_ctx ctx = (struct cr_buf_ctx )reader;
+	(void)data;
+	return (curl_off_t)ctx->blen;
+	}
+
+	static CURLcode cr_buf_resume_from(struct Curl_easy *data,
+	struct Curl_creader *reader,
+	curl_off_t offset)
+	{
+	struct cr_buf_ctx ctx = (struct cr_buf_ctx )reader;
+	size_t boffset;
+
+	(void)data;
+	DEBUGASSERT(data->conn);
+	/* already started reading? */
+	if(ctx->index)
+	return CURLE_READ_ERROR;
+	if(offset <= 0)
+	return CURLE_OK;
+	boffset = (size_t)offset;
+	if(boffset > ctx->blen)
+	return CURLE_READ_ERROR;
+
+	ctx->buf += boffset;
+	ctx->blen -= boffset;
+	return CURLE_OK;
+	}
+
	static const struct Curl_crtype cr_buf = {
	"cr-buf",
	Curl_creader_def_init,
	cr_buf_read,
	Curl_creader_def_close,
	cr_buf_needs_rewind,
+	cr_buf_total_length,
+	cr_buf_resume_from,
+	Curl_creader_def_rewind,
	sizeof(struct cr_buf_ctx)
	};

-	CURLcode Client_reader_set_buf(struct Curl_easy *data,
+	CURLcode Curl_creader_set_buf(struct Curl_easy *data,
	const char *buf, size_t blen)
	{
	CURLcode result;
	struct Curl_creader *r;

	cl_reset_reader(data);
-	result = do_init_reader_stack(data, &cr_buf, &r);
+	result = do_init_reader_stack(data, &cr_buf, &r, blen);
	if(!result && r) {
	struct cr_buf_ctx ctx = (struct cr_buf_ctx )r;
	DEBUGASSERT(r->crt == &cr_buf);
@@ -944,3 +1238,25 @@ CURLcode Client_reader_set_buf(struct Curl_easy *data,
	}
	return result;
	}
+
+	curl_off_t Curl_creader_total_length(struct Curl_easy *data)
+	{
+	struct Curl_creader *r = data->req.reader_stack;
+	return r? r->crt->total_length(data, r) : -1;
+	}
+
+	curl_off_t Curl_creader_client_length(struct Curl_easy *data)
+	{
+	struct Curl_creader *r = data->req.reader_stack;
+	while(r && r->phase != CURL_CR_CLIENT)
+	r = r->next;
+	return r? r->crt->total_length(data, r) : -1;
+	}
+
+	CURLcode Curl_creader_resume_from(struct Curl_easy *data, curl_off_t offset)
+	{
+	struct Curl_creader *r = data->req.reader_stack;
+	while(r && r->phase != CURL_CR_CLIENT)
+	r = r->next;
+	return r? r->crt->resume_from(data, r, offset) : CURLE_READ_ERROR;
+	}

lib/sendf.h+72 -6

@@ -61,8 +61,20 @@ CURLcode Curl_client_write(struct Curl_easy data, int type, const char ptr,
	/**
	* Free all resources related to client writing.
	*/
+	void Curl_client_cleanup(struct Curl_easy *data);
+
+	/**
+	* Reset readers and writer chains, keep rewind information
+	* when necessary.
+	*/
	void Curl_client_reset(struct Curl_easy *data);

+	/**
+	* A new request is starting, perform any ops like rewinding
+	* previous readers when needed.
+	*/
+	CURLcode Curl_client_start(struct Curl_easy *data);
+
	/**
	* Client Writers - a chain passing transfer BODY data to the client.
	* Main application: HTTP and related protocols
@@ -178,11 +190,16 @@ void Curl_cwriter_def_close(struct Curl_easy *data,
	/* Client Reader Type, provides the implementation */
	struct Curl_crtype {
	const char name; / writer name. */
-	CURLcode (do_init)(struct Curl_easy data, struct Curl_creader *writer);
+	CURLcode (do_init)(struct Curl_easy data, struct Curl_creader *reader);
	CURLcode (do_read)(struct Curl_easy data, struct Curl_creader *reader,
	char buf, size_t blen, size_t nread, bool *eos);
	void (do_close)(struct Curl_easy data, struct Curl_creader *reader);
	bool (needs_rewind)(struct Curl_easy data, struct Curl_creader *reader);
+	curl_off_t (total_length)(struct Curl_easy data,
+	struct Curl_creader *reader);
+	CURLcode (resume_from)(struct Curl_easy data,
+	struct Curl_creader *reader, curl_off_t offset);
+	CURLcode (rewind)(struct Curl_easy data, struct Curl_creader *reader);
	size_t creader_size; /* sizeof() allocated struct Curl_creader */
	};

@@ -212,6 +229,13 @@ void Curl_creader_def_close(struct Curl_easy *data,
	struct Curl_creader *reader);
	bool Curl_creader_def_needs_rewind(struct Curl_easy *data,
	struct Curl_creader *reader);
+	curl_off_t Curl_creader_def_total_length(struct Curl_easy *data,
+	struct Curl_creader *reader);
+	CURLcode Curl_creader_def_resume_from(struct Curl_easy *data,
+	struct Curl_creader *reader,
+	curl_off_t offset);
+	CURLcode Curl_creader_def_rewind(struct Curl_easy *data,
+	struct Curl_creader *reader);

	/**
	* Convenience method for calling `reader->do_read()` that
@@ -260,22 +284,64 @@ CURLcode Curl_client_read(struct Curl_easy data, char buf, size_t blen,
	* TRUE iff client reader needs rewing before it can be used for
	* a retry request.
	*/
-	bool Curl_client_read_needs_rewind(struct Curl_easy *data);
+	bool Curl_creader_needs_rewind(struct Curl_easy *data);
+
+	/**
+	* TRUE iff client reader will rewind at next start
+	*/
+	bool Curl_creader_will_rewind(struct Curl_easy *data);
+
+	/**
+	* En-/disable rewind of client reader at next start.
+	*/
+	void Curl_creader_set_rewind(struct Curl_easy *data, bool enable);
+
+	/**
+	* Get the total length of bytes provided by the installed readers.
+	* This is independent of the amount already delivered and is calculated
+	* by all readers in the stack. If a reader like "chunked" or
+	* "crlf conversion" is installed, the returned length will be -1.
+	* @return -1 if length is indeterminate
+	*/
+	curl_off_t Curl_creader_total_length(struct Curl_easy *data);
+
+	/**
+	* Get the total length of bytes provided by the reader at phase
+	* CURL_CR_CLIENT. This may not match the amount of bytes read
+	* for a request, depending if other, encoding readers are also installed.
+	* However it allows for rough estimation of the overall length.
+	* @return -1 if length is indeterminate
+	*/
+	curl_off_t Curl_creader_client_length(struct Curl_easy *data);
+
+	/**
+	* Ask the installed reader at phase CURL_CR_CLIENT to start
+	* reading from the given offset. On success, this will reduce
+	* the `total_length()` by the amount.
+	* @param date the transfer to read client bytes for
+	* param offset the offset where to start reads from, negative
+	* values will be ignored.
+	* @return CURLE_OK if offset could be set
+	* CURLE_READ_ERROR if not supported by reader or seek/read failed
+	* of offset larger then total length
+	* CURLE_PARTIAL_FILE if offset led to 0 total length
+	*/
+	CURLcode Curl_creader_resume_from(struct Curl_easy *data, curl_off_t offset);

	/**
	* Set the client reader to provide 0 bytes, immediate EOS.
	*/
-	CURLcode Client_reader_set_null(struct Curl_easy *data);
+	CURLcode Curl_creader_set_null(struct Curl_easy *data);

	/**
	* Set the client reader the reads from fread callback.
	*/
-	CURLcode Client_reader_set_fread(struct Curl_easy *data, curl_off_t len);
+	CURLcode Curl_creader_set_fread(struct Curl_easy *data, curl_off_t len);

	/**
	* Set the client reader the reads from the supplied buf (NOT COPIED).
	*/
-	CURLcode Client_reader_set_buf(struct Curl_easy *data,
-	const char *buf, size_t blen);
+	CURLcode Curl_creader_set_buf(struct Curl_easy *data,
+	const char *buf, size_t blen);

	#endif /* HEADER_CURL_SENDF_H */

lib/smtp.c+13 -1

@@ -748,7 +748,7 @@ static CURLcode smtp_perform_mail(struct Curl_easy *data)
	}

	/* Setup client reader for size and EOB conversion */
-	result = Client_reader_set_fread(data, data->state.infilesize);
+	result = Curl_creader_set_fread(data, data->state.infilesize);
	if(result)
	goto out;
	/* Add the client reader doing STMP EOB escaping */
@@ -1909,12 +1909,24 @@ static CURLcode cr_eob_read(struct Curl_easy *data,
	return CURLE_OK;
	}

+	static curl_off_t cr_eob_total_length(struct Curl_easy *data,
+	struct Curl_creader *reader)
+	{
+	/* this reader changes length depending on input */
+	(void)data;
+	(void)reader;
+	return -1;
+	}
+
	static const struct Curl_crtype cr_eob = {
	"cr-smtp-eob",
	cr_eob_init,
	cr_eob_read,
	cr_eob_close,
	Curl_creader_def_needs_rewind,
+	cr_eob_total_length,
+	Curl_creader_def_resume_from,
+	Curl_creader_def_rewind,
	sizeof(struct cr_eob_ctx)
	};

lib/transfer.c+3 -6

@@ -982,6 +982,7 @@ CURLcode Curl_follow(struct Curl_easy *data,
	&& !(data->set.keep_post & CURL_REDIR_POST_301)) {
	infof(data, "Switch from POST to GET");
	data->state.httpreq = HTTPREQ_GET;
+	Curl_creader_set_rewind(data, FALSE);
	}
	break;
	case 302: /* Found */
@@ -1007,6 +1008,7 @@ CURLcode Curl_follow(struct Curl_easy *data,
	&& !(data->set.keep_post & CURL_REDIR_POST_302)) {
	infof(data, "Switch from POST to GET");
	data->state.httpreq = HTTPREQ_GET;
+	Curl_creader_set_rewind(data, FALSE);
	}
	break;

@@ -1109,12 +1111,7 @@ CURLcode Curl_retry_request(struct Curl_easy data, char *url)
	prevent i.e HTTP transfers to return
	error just because nothing has been
	transferred! */
-
-
-	if(Curl_client_read_needs_rewind(data)) {
-	data->state.rewindbeforesend = TRUE;
-	infof(data, "state.rewindbeforesend = TRUE");
-	}
+	Curl_creader_set_rewind(data, TRUE);
	}
	return CURLE_OK;
	}

lib/urldata.h+0 -3

@@ -1387,9 +1387,6 @@ struct UrlState {
	BIT(url_alloc); /* URL string is malloc()'ed */
	BIT(referer_alloc); /* referer string is malloc()ed */
	BIT(wildcard_resolve); /* Set to true if any resolve change is a wildcard */
-	BIT(rewindbeforesend);/* TRUE when the sending couldn't be stopped even
-	though it will be discarded. We must call the data
-	rewind callback before trying to send again. */
	BIT(upload); /* upload request */
	BIT(internal); /* internal: true if this easy handle was created for
	internal use and the user does not have ownership of the

scripts/singleuse.pl+2 -1

@@ -46,7 +46,8 @@ my %wl = (
	'Curl_xfer_write_resp' => 'internal api',
	'Curl_creader_def_init' => 'internal api',
	'Curl_creader_def_close' => 'internal api',
-	);
+	'Curl_creader_def_total_length' => 'internal api',
+	);

	my %api = (
	'curl_easy_cleanup' => 'API',