transfer: readwrite improvements
—
$ git checkout -f 1cd2f0072fa482e25baa2051f4d2b373424d6d4e
Previous HEAD position was 891f1041d6 transfer: avoid unreachable expression
HEAD is now at 1cd2f0072f transfer: readwrite improvements
$ git clean -fdx
Removing Makefile
Removing Makefile.in
Removing aclocal.m4
Removing autom4te.cache/
Removing compile
Removing config.guess
Removing config.log
Removing config.status
Removing config.sub
Removing configure
Removing curl-config
Removing depcomp
Removing docs/Makefile
Removing docs/Makefile.in
Removing docs/cmdline-opts/Makefile
Removing docs/cmdline-opts/Makefile.in
Removing docs/curl.1
Removing docs/examples/.deps/
Removing docs/examples/Makefile
Removing docs/examples/Makefile.in
Removing docs/libcurl/Makefile
Removing docs/libcurl/Makefile.in
Removing docs/libcurl/opts/Makefile
Removing docs/libcurl/opts/Makefile.in
Removing include/Makefile
Removing include/Makefile.in
Removing include/curl/Makefile
Removing include/curl/Makefile.in
Removing install-sh
Removing lib/.deps/
Removing lib/.dirstamp
Removing lib/.libs/
Removing lib/Makefile
Removing lib/Makefile.in
Removing lib/base64.o
Removing lib/curl_config.h
Removing lib/curl_config.h.in
Removing lib/curl_multibyte.o
Removing lib/dynbuf.o
Removing lib/libcurl.la
Removing lib/libcurl.plist
Removing lib/libcurl.vers
Removing lib/libcurl_la-altsvc.lo
Removing lib/libcurl_la-altsvc.o
Removing lib/libcurl_la-amigaos.lo
Removing lib/libcurl_la-amigaos.o
Removing lib/libcurl_la-asyn-ares.lo
Removing lib/libcurl_la-asyn-ares.o
Removing lib/libcurl_la-asyn-thread.lo
Removing lib/libcurl_la-asyn-thread.o
Removing lib/libcurl_la-base64.lo
Removing lib/libcurl_la-base64.o
Removing lib/libcurl_la-bufq.lo
Removing lib/libcurl_la-bufq.o
Removing lib/libcurl_la-bufref.lo
Removing lib/libcurl_la-bufref.o
Removing lib/libcurl_la-c-hyper.lo
Removing lib/libcurl_la-c-hyper.o
Removing lib/libcurl_la-cf-h1-proxy.lo
Removing lib/libcurl_la-cf-h1-proxy.o
Removing lib/libcurl_la-cf-h2-proxy.lo
Removing lib/libcurl_la-cf-h2-proxy.o
Removing lib/libcurl_la-cf-haproxy.lo
Removing lib/libcurl_la-cf-haproxy.o
Removing lib/libcurl_la-cf-https-connect.lo
Removing lib/libcurl_la-cf-https-connect.o
Removing lib/libcurl_la-cf-socket.lo
Removing lib/libcurl_la-cf-socket.o
Removing lib/libcurl_la-cfilters.lo
Removing lib/libcurl_la-cfilters.o
Removing lib/libcurl_la-conncache.lo
Removing lib/libcurl_la-conncache.o
Removing lib/libcurl_la-connect.lo
Removing lib/libcurl_la-connect.o
Removing lib/libcurl_la-content_encoding.lo
Removing lib/libcurl_la-content_encoding.o
Removing lib/libcurl_la-cookie.lo
Removing lib/libcurl_la-cookie.o
Removing lib/libcurl_la-curl_addrinfo.lo
Removing lib/libcurl_la-curl_addrinfo.o
Removing lib/libcurl_la-curl_des.lo
Removing lib/libcurl_la-curl_des.o
Removing lib/libcurl_la-curl_endian.lo
Removing lib/libcurl_la-curl_endian.o
Removing lib/libcurl_la-curl_fnmatch.lo
Removing lib/libcurl_la-curl_fnmatch.o
Removing lib/libcurl_la-curl_get_line.lo
Removing lib/libcurl_la-curl_get_line.o
Removing lib/libcurl_la-curl_gethostname.lo
Removing lib/libcurl_la-curl_gethostname.o
Removing lib/libcurl_la-curl_gssapi.lo
Removing lib/libcurl_la-curl_gssapi.o
Removing lib/libcurl_la-curl_memrchr.lo
Removing lib/libcurl_la-curl_memrchr.o
Removing lib/libcurl_la-curl_multibyte.lo
Removing lib/libcurl_la-curl_multibyte.o
Removing lib/libcurl_la-curl_ntlm_core.lo
Removing lib/libcurl_la-curl_ntlm_core.o
Removing lib/libcurl_la-curl_ntlm_wb.lo
Removing lib/libcurl_la-curl_ntlm_wb.o
Removing lib/libcurl_la-curl_path.lo
Removing lib/libcurl_la-curl_path.o
Removing lib/libcurl_la-curl_range.lo
Removing lib/libcurl_la-curl_range.o
Removing lib/libcurl_la-curl_rtmp.lo
Removing lib/libcurl_la-curl_rtmp.o
Removing lib/libcurl_la-curl_sasl.lo
Removing lib/libcurl_la-curl_sasl.o
Removing lib/libcurl_la-curl_sspi.lo
Removing lib/libcurl_la-curl_sspi.o
Removing lib/libcurl_la-curl_threads.lo
Removing lib/libcurl_la-curl_threads.o
Removing lib/libcurl_la-curl_trc.lo
Removing lib/libcurl_la-curl_trc.o
Removing lib/libcurl_la-dict.lo
Removing lib/libcurl_la-dict.o
Removing lib/libcurl_la-doh.lo
Removing lib/libcurl_la-doh.o
Removing lib/libcurl_la-dynbuf.lo
Removing lib/libcurl_la-dynbuf.o
Removing lib/libcurl_la-dynhds.lo
Removing lib/libcurl_la-dynhds.o
Removing lib/libcurl_la-easy.lo
Removing lib/libcurl_la-easy.o
Removing lib/libcurl_la-easygetopt.lo
Removing lib/libcurl_la-easygetopt.o
Removing lib/libcurl_la-easyoptions.lo
Removing lib/libcurl_la-easyoptions.o
Removing lib/libcurl_la-escape.lo
Removing lib/libcurl_la-escape.o
Removing lib/libcurl_la-file.lo
Removing lib/libcurl_la-file.o
Removing lib/libcurl_la-fileinfo.lo
Removing lib/libcurl_la-fileinfo.o
Removing lib/libcurl_la-fopen.lo
Removing lib/libcurl_la-fopen.o
Removing lib/libcurl_la-formdata.lo
Removing lib/libcurl_la-formdata.o
Removing lib/libcurl_la-ftp.lo
Removing lib/libcurl_la-ftp.o
Removing lib/libcurl_la-ftplistparser.lo
Removing lib/libcurl_la-ftplistparser.o
Removing lib/libcurl_la-getenv.lo
Removing lib/libcurl_la-getenv.o
Removing lib/libcurl_la-getinfo.lo
Removing lib/libcurl_la-getinfo.o
Removing lib/libcurl_la-gopher.lo
Removing lib/libcurl_la-gopher.o
Removing lib/libcurl_la-hash.lo
Removing lib/libcurl_la-hash.o
Removing lib/libcurl_la-headers.lo
Removing lib/libcurl_la-headers.o
Removing lib/libcurl_la-hmac.lo
Removing lib/libcurl_la-hmac.o
Removing lib/libcurl_la-hostasyn.lo
Removing lib/libcurl_la-hostasyn.o
Removing lib/libcurl_la-hostip.lo
Removing lib/libcurl_la-hostip.o
Removing lib/libcurl_la-hostip4.lo
Removing lib/libcurl_la-hostip4.o
Removing lib/libcurl_la-hostip6.lo
Removing lib/libcurl_la-hostip6.o
Removing lib/libcurl_la-hostsyn.lo
Removing lib/libcurl_la-hostsyn.o
Removing lib/libcurl_la-hsts.lo
Removing lib/libcurl_la-hsts.o
Removing lib/libcurl_la-http.lo
Removing lib/libcurl_la-http.o
Removing lib/libcurl_la-http1.lo
Removing lib/libcurl_la-http1.o
Removing lib/libcurl_la-http2.lo
Removing lib/libcurl_la-http2.o
Removing lib/libcurl_la-http_aws_sigv4.lo
Removing lib/libcurl_la-http_aws_sigv4.o
Removing lib/libcurl_la-http_chunks.lo
Removing lib/libcurl_la-http_chunks.o
Removing lib/libcurl_la-http_digest.lo
Removing lib/libcurl_la-http_digest.o
Removing lib/libcurl_la-http_negotiate.lo
Removing lib/libcurl_la-http_negotiate.o
Removing lib/libcurl_la-http_ntlm.lo
Removing lib/libcurl_la-http_ntlm.o
Removing lib/libcurl_la-http_proxy.lo
Removing lib/libcurl_la-http_proxy.o
Removing lib/libcurl_la-idn.lo
Removing lib/libcurl_la-idn.o
Removing lib/libcurl_la-if2ip.lo
Removing lib/libcurl_la-if2ip.o
Removing lib/libcurl_la-imap.lo
Removing lib/libcurl_la-imap.o
Removing lib/libcurl_la-inet_ntop.lo
Removing lib/libcurl_la-inet_ntop.o
Removing lib/libcurl_la-inet_pton.lo
Removing lib/libcurl_la-inet_pton.o
Removing lib/libcurl_la-krb5.lo
Removing lib/libcurl_la-krb5.o
Removing lib/libcurl_la-ldap.lo
Removing lib/libcurl_la-ldap.o
Removing lib/libcurl_la-llist.lo
Removing lib/libcurl_la-llist.o
Removing lib/libcurl_la-macos.lo
Removing lib/libcurl_la-macos.o
Removing lib/libcurl_la-md4.lo
Removing lib/libcurl_la-md4.o
Removing lib/libcurl_la-md5.lo
Removing lib/libcurl_la-md5.o
Removing lib/libcurl_la-memdebug.lo
Removing lib/libcurl_la-memdebug.o
Removing lib/libcurl_la-mime.lo
Removing lib/libcurl_la-mime.o
Removing lib/libcurl_la-mprintf.lo
Removing lib/libcurl_la-mprintf.o
Removing lib/libcurl_la-mqtt.lo
Removing lib/libcurl_la-mqtt.o
Removing lib/libcurl_la-multi.lo
Removing lib/libcurl_la-multi.o
Removing lib/libcurl_la-netrc.lo
Removing lib/libcurl_la-netrc.o
Removing lib/libcurl_la-nonblock.lo
Removing lib/libcurl_la-nonblock.o
Removing lib/libcurl_la-noproxy.lo
Removing lib/libcurl_la-noproxy.o
Removing lib/libcurl_la-openldap.lo
Removing lib/libcurl_la-openldap.o
Removing lib/libcurl_la-parsedate.lo
Removing lib/libcurl_la-parsedate.o
Removing lib/libcurl_la-pingpong.lo
Removing lib/libcurl_la-pingpong.o
Removing lib/libcurl_la-pop3.lo
Removing lib/libcurl_la-pop3.o
Removing lib/libcurl_la-progress.lo
Removing lib/libcurl_la-progress.o
Removing lib/libcurl_la-psl.lo
Removing lib/libcurl_la-psl.o
Removing lib/libcurl_la-rand.lo
Removing lib/libcurl_la-rand.o
Removing lib/libcurl_la-rename.lo
Removing lib/libcurl_la-rename.o
Removing lib/libcurl_la-rtsp.lo
Removing lib/libcurl_la-rtsp.o
Removing lib/libcurl_la-select.lo
Removing lib/libcurl_la-select.o
Removing lib/libcurl_la-sendf.lo
Removing lib/libcurl_la-sendf.o
Removing lib/libcurl_la-setopt.lo
Removing lib/libcurl_la-setopt.o
Removing lib/libcurl_la-sha256.lo
Removing lib/libcurl_la-sha256.o
Removing lib/libcurl_la-share.lo
Removing lib/libcurl_la-share.o
Removing lib/libcurl_la-slist.lo
Removing lib/libcurl_la-slist.o
Removing lib/libcurl_la-smb.lo
Removing lib/libcurl_la-smb.o
Removing lib/libcurl_la-smtp.lo
Removing lib/libcurl_la-smtp.o
Removing lib/libcurl_la-socketpair.lo
Removing lib/libcurl_la-socketpair.o
Removing lib/libcurl_la-socks.lo
Removing lib/libcurl_la-socks.o
Removing lib/libcurl_la-socks_gssapi.lo
Removing lib/libcurl_la-socks_gssapi.o
Removing lib/libcurl_la-socks_sspi.lo
Removing lib/libcurl_la-socks_sspi.o
Removing lib/libcurl_la-speedcheck.lo
Removing lib/libcurl_la-speedcheck.o
Removing lib/libcurl_la-splay.lo
Removing lib/libcurl_la-splay.o
Removing lib/libcurl_la-strcase.lo
Removing lib/libcurl_la-strcase.o
Removing lib/libcurl_la-strdup.lo
Removing lib/libcurl_la-strdup.o
Removing lib/libcurl_la-strerror.lo
Removing lib/libcurl_la-strerror.o
Removing lib/libcurl_la-strtok.lo
Removing lib/libcurl_la-strtok.o
Removing lib/libcurl_la-strtoofft.lo
Removing lib/libcurl_la-strtoofft.o
Removing lib/libcurl_la-system_win32.lo
Removing lib/libcurl_la-system_win32.o
Removing lib/libcurl_la-telnet.lo
Removing lib/libcurl_la-telnet.o
Removing lib/libcurl_la-tftp.lo
Removing lib/libcurl_la-tftp.o
Removing lib/libcurl_la-timediff.lo
Removing lib/libcurl_la-timediff.o
Removing lib/libcurl_la-timeval.lo
Removing lib/libcurl_la-timeval.o
Removing lib/libcurl_la-transfer.lo
Removing lib/libcurl_la-transfer.o
Removing lib/libcurl_la-url.lo
Removing lib/libcurl_la-url.o
Removing lib/libcurl_la-urlapi.lo
Removing lib/libcurl_la-urlapi.o
Removing lib/libcurl_la-version.lo
Removing lib/libcurl_la-version.o
Removing lib/libcurl_la-version_win32.lo
Removing lib/libcurl_la-version_win32.o
Removing lib/libcurl_la-warnless.lo
Removing lib/libcurl_la-warnless.o
Removing lib/libcurl_la-ws.lo
Removing lib/libcurl_la-ws.o
Removing lib/nonblock.o
Removing lib/stamp-h1
Removing lib/strtoofft.o
Removing lib/timediff.o
Removing lib/vauth/.deps/
Removing lib/vauth/.dirstamp
Removing lib/vauth/libcurl_la-cleartext.lo
Removing lib/vauth/libcurl_la-cleartext.o
Removing lib/vauth/libcurl_la-cram.lo
Removing lib/vauth/libcurl_la-cram.o
Removing lib/vauth/libcurl_la-digest.lo
Removing lib/vauth/libcurl_la-digest.o
Removing lib/vauth/libcurl_la-digest_sspi.lo
Removing lib/vauth/libcurl_la-digest_sspi.o
Removing lib/vauth/libcurl_la-gsasl.lo
Removing lib/vauth/libcurl_la-gsasl.o
Removing lib/vauth/libcurl_la-krb5_gssapi.lo
Removing lib/vauth/libcurl_la-krb5_gssapi.o
Removing lib/vauth/libcurl_la-krb5_sspi.lo
Removing lib/vauth/libcurl_la-krb5_sspi.o
Removing lib/vauth/libcurl_la-ntlm.lo
Removing lib/vauth/libcurl_la-ntlm.o
Removing lib/vauth/libcurl_la-ntlm_sspi.lo
Removing lib/vauth/libcurl_la-ntlm_sspi.o
Removing lib/vauth/libcurl_la-oauth2.lo
Removing lib/vauth/libcurl_la-oauth2.o
Removing lib/vauth/libcurl_la-spnego_gssapi.lo
Removing lib/vauth/libcurl_la-spnego_gssapi.o
Removing lib/vauth/libcurl_la-spnego_sspi.lo
Removing lib/vauth/libcurl_la-spnego_sspi.o
Removing lib/vauth/libcurl_la-vauth.lo
Removing lib/vauth/libcurl_la-vauth.o
Removing lib/version_win32.o
Removing lib/vquic/.deps/
Removing lib/vquic/.dirstamp
Removing lib/vquic/libcurl_la-curl_msh3.lo
Removing lib/vquic/libcurl_la-curl_msh3.o
Removing lib/vquic/libcurl_la-curl_ngtcp2.lo
Removing lib/vquic/libcurl_la-curl_ngtcp2.o
Removing lib/vquic/libcurl_la-curl_quiche.lo
Removing lib/vquic/libcurl_la-curl_quiche.o
Removing lib/vquic/libcurl_la-vquic.lo
Removing lib/vquic/libcurl_la-vquic.o
Removing lib/vssh/.deps/
Removing lib/vssh/.dirstamp
Removing lib/vssh/libcurl_la-libssh.lo
Removing lib/vssh/libcurl_la-libssh.o
Removing lib/vssh/libcurl_la-libssh2.lo
Removing lib/vssh/libcurl_la-libssh2.o
Removing lib/vssh/libcurl_la-wolfssh.lo
Removing lib/vssh/libcurl_la-wolfssh.o
Removing lib/vtls/.deps/
Removing lib/vtls/.dirstamp
Removing lib/vtls/libcurl_la-bearssl.lo
Removing lib/vtls/libcurl_la-bearssl.o
Removing lib/vtls/libcurl_la-gtls.lo
Removing lib/vtls/libcurl_la-gtls.o
Removing lib/vtls/libcurl_la-hostcheck.lo
Removing lib/vtls/libcurl_la-hostcheck.o
Removing lib/vtls/libcurl_la-keylog.lo
Removing lib/vtls/libcurl_la-keylog.o
Removing lib/vtls/libcurl_la-mbedtls.lo
Removing lib/vtls/libcurl_la-mbedtls.o
Removing lib/vtls/libcurl_la-mbedtls_threadlock.lo
Removing lib/vtls/libcurl_la-mbedtls_threadlock.o
Removing lib/vtls/libcurl_la-openssl.lo
Removing lib/vtls/libcurl_la-openssl.o
Removing lib/vtls/libcurl_la-rustls.lo
Removing lib/vtls/libcurl_la-rustls.o
Removing lib/vtls/libcurl_la-schannel.lo
Removing lib/vtls/libcurl_la-schannel.o
Removing lib/vtls/libcurl_la-schannel_verify.lo
Removing lib/vtls/libcurl_la-schannel_verify.o
Removing lib/vtls/libcurl_la-sectransp.lo
Removing lib/vtls/libcurl_la-sectransp.o
Removing lib/vtls/libcurl_la-vtls.lo
Removing lib/vtls/libcurl_la-vtls.o
Removing lib/vtls/libcurl_la-wolfssl.lo
Removing lib/vtls/libcurl_la-wolfssl.o
Removing lib/vtls/libcurl_la-x509asn1.lo
Removing lib/vtls/libcurl_la-x509asn1.o
Removing lib/warnless.o
Removing libcurl.pc
Removing libtool
Removing ltmain.sh
Removing m4/libtool.m4
Removing m4/ltoptions.m4
Removing m4/ltsugar.m4
Removing m4/ltversion.m4
Removing m4/lt~obsolete.m4
Removing missing
Removing packages/Makefile
Removing packages/Makefile.in
Removing packages/vms/Makefile
Removing packages/vms/Makefile.in
Removing scripts/Makefile
Removing scripts/Makefile.in
Removing src/.deps/
Removing src/.libs/
Removing src/Makefile
Removing src/Makefile.in
Removing src/curl
Removing src/slist_wc.o
Removing src/tool_binmode.o
Removing src/tool_bname.o
Removing src/tool_cb_dbg.o
Removing src/tool_cb_hdr.o
Removing src/tool_cb_prg.o
Removing src/tool_cb_rea.o
Removing src/tool_cb_see.o
Removing src/tool_cb_wrt.o
Removing src/tool_cfgable.o
Removing src/tool_dirhie.o
Removing src/tool_doswin.o
Removing src/tool_easysrc.o
Removing src/tool_filetime.o
Removing src/tool_findfile.o
Removing src/tool_formparse.o
Removing src/tool_getparam.o
Removing src/tool_getpass.o
Removing src/tool_help.o
Removing src/tool_helpers.o
Removing src/tool_hugehelp.c
Removing src/tool_hugehelp.o
Removing src/tool_ipfs.o
Removing src/tool_libinfo.o
Removing src/tool_listhelp.o
Removing src/tool_main.o
Removing src/tool_msgs.o
Removing src/tool_operate.o
Removing src/tool_operhlp.o
Removing src/tool_paramhlp.o
Removing src/tool_parsecfg.o
Removing src/tool_progress.o
Removing src/tool_setopt.o
Removing src/tool_sleep.o
Removing src/tool_stderr.o
Removing src/tool_strdup.o
Removing src/tool_urlglob.o
Removing src/tool_util.o
Removing src/tool_vms.o
Removing src/tool_writeout.o
Removing src/tool_writeout_json.o
Removing src/tool_xattr.o
Removing src/var.o
Removing test-driver
Removing tests/Makefile
Removing tests/Makefile.in
Removing tests/certs/Makefile
Removing tests/certs/Makefile.in
Removing tests/certs/scripts/Makefile
Removing tests/certs/scripts/Makefile.in
Removing tests/config
Removing tests/configurehelp.pm
Removing tests/data/Makefile
Removing tests/data/Makefile.in
Removing tests/http/Makefile
Removing tests/http/Makefile.in
Removing tests/http/clients/.deps/
Removing tests/http/clients/Makefile
Removing tests/http/clients/Makefile.in
Removing tests/http/config.ini
Removing tests/libtest/.deps/
Removing tests/libtest/Makefile
Removing tests/libtest/Makefile.in
Removing tests/server/.deps/
Removing tests/server/Makefile
Removing tests/server/Makefile.in
Removing tests/unit/.deps/
Removing tests/unit/Makefile
Removing tests/unit/Makefile.in
$ autoreconf -fi
libtoolize: putting auxiliary files in '.'.
libtoolize: copying file './ltmain.sh'
libtoolize: putting macros in AC_CONFIG_MACRO_DIRS, 'm4'.
libtoolize: copying file 'm4/libtool.m4'
libtoolize: copying file 'm4/ltoptions.m4'
libtoolize: copying file 'm4/ltsugar.m4'
libtoolize: copying file 'm4/ltversion.m4'
libtoolize: copying file 'm4/lt~obsolete.m4'
libtoolize: Remember to add 'LT_INIT' to configure.ac.
configure.ac:123: installing './compile'
configure.ac:424: installing './config.guess'
configure.ac:424: installing './config.sub'
configure.ac:123: installing './install-sh'
configure.ac:129: installing './missing'
docs/examples/Makefile.am: installing './depcomp'
parallel-tests: installing './test-driver'
$ bash -c find . -name config.guess -exec cp /usr/share/misc/config.guess {} \;
$ bash -c find . -name config.sub -exec cp /usr/share/misc/config.sub {} \;
$ chmod +x configure
$ ./configure --disable-shared --without-ssl --disable-docs
checking whether to enable maintainer-specific portions of Makefiles... no
checking whether make supports nested variables... yes
checking whether to enable debug build options... no
checking whether to enable compiler optimizer... (assumed) yes
checking whether to enable strict compiler warnings... no
checking whether to enable compiler warnings as errors... no
checking whether to enable curl debug memory tracking... no
checking whether to enable hiding of library internal symbols... yes
checking whether to enable c-ares for DNS lookups... no
checking whether to disable dependency on -lrt... (assumed no)
checking whether to enable ECH support... no
checking for path separator... :
checking for sed... /usr/bin/sed
checking for grep... /usr/bin/grep
checking that grep -E works... yes
checking for ar... /usr/bin/ar
checking for a BSD-compatible install... /usr/bin/install -c
checking for gcc... ccache gcc
checking whether the C compiler works... yes
checking for C compiler default output file name... a.out
checking for suffix of executables...
checking whether we are cross compiling... no
checking for suffix of object files... o
checking whether the compiler supports GNU C... yes
checking whether ccache gcc accepts -g... yes
checking for ccache gcc option to enable C11 features... none needed
checking whether ccache gcc understands -c and -o together... yes
checking how to run the C preprocessor... ccache gcc -E
checking for stdio.h... yes
checking for stdlib.h... yes
checking for string.h... yes
checking for inttypes.h... yes
checking for stdint.h... yes
checking for strings.h... yes
checking for sys/stat.h... yes
checking for sys/types.h... yes
checking for unistd.h... yes
checking for stdatomic.h... yes
checking if _Atomic is available... yes
checking for a sed that does not truncate output... (cached) /usr/bin/sed
checking for code coverage support... no
checking whether build environment is sane... yes
checking for a race-free mkdir -p... /usr/bin/mkdir -p
checking for gawk... gawk
checking whether make sets $(MAKE)... yes
checking whether make supports the include directive... yes (GNU style)
checking dependency style of ccache gcc... gcc3
checking curl version... 8.5.0-DEV
checking for httpd... no
checking for apache2... no
checking for apachectl... no
checking for apxs... no
configure: httpd/apache2 not in PATH, http tests disabled
configure: apxs not in PATH, http tests disabled
checking for nghttpx... no
checking for caddy... no
checking build system type... x86_64-pc-linux-gnu
checking host system type... x86_64-pc-linux-gnu
checking for grep that handles long lines and -e... (cached) /usr/bin/grep
checking for egrep... /usr/bin/grep -E
checking if OS is AIX (to define _ALL_SOURCE)... no
checking if _THREAD_SAFE is already defined... no
checking if _THREAD_SAFE is actually needed... no
checking if _THREAD_SAFE is onwards defined... no
checking if _REENTRANT is already defined... no
checking if _REENTRANT is actually needed... no
checking if _REENTRANT is onwards defined... no
checking for special C compiler options needed for large files... no
checking for _FILE_OFFSET_BITS value needed for large files... no
checking how to print strings... printf
checking for a sed that does not truncate output... (cached) /usr/bin/sed
checking for fgrep... /usr/bin/grep -F
checking for ld used by ccache gcc... /usr/bin/ld
checking if the linker (/usr/bin/ld) is GNU ld... yes
checking for BSD- or MS-compatible name lister (nm)... /usr/bin/nm -B
checking the name lister (/usr/bin/nm -B) interface... BSD nm
checking whether ln -s works... yes
checking the maximum length of command line arguments... 1572864
checking how to convert x86_64-pc-linux-gnu file names to x86_64-pc-linux-gnu format... func_convert_file_noop
checking how to convert x86_64-pc-linux-gnu file names to toolchain format... func_convert_file_noop
checking for /usr/bin/ld option to reload object files... -r
checking for objdump... objdump
checking how to recognize dependent libraries... pass_all
checking for dlltool... no
checking how to associate runtime and link libraries... printf %s\n
checking for archiver @FILE support... @
checking for strip... strip
checking for ranlib... ranlib
checking command to parse /usr/bin/nm -B output from ccache gcc object... ok
checking for sysroot... no
checking for a working dd... /usr/bin/dd
checking how to truncate binary pipes... /usr/bin/dd bs=4096 count=1
checking for mt... mt
checking if mt is a manifest tool... no
checking for dlfcn.h... yes
checking for objdir... .libs
checking if ccache gcc supports -fno-rtti -fno-exceptions... no
checking for ccache gcc option to produce PIC... -fPIC -DPIC
checking if ccache gcc PIC flag -fPIC -DPIC works... yes
checking if ccache gcc static flag -static works... yes
checking if ccache gcc supports -c -o file.o... yes
checking if ccache gcc supports -c -o file.o... (cached) yes
checking whether the ccache gcc linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes
checking dynamic linker characteristics... GNU/Linux ld.so
checking how to hardcode library paths into programs... immediate
checking whether stripping libraries is possible... yes
checking if libtool supports shared libraries... yes
checking whether to build shared libraries... no
checking whether to build static libraries... yes
checking whether to build shared libraries with -version-info... yes
checking whether to build shared libraries with -no-undefined... no
checking whether to build shared libraries with -mimpure-text... no
checking whether to build shared libraries with PIC... yes
checking whether to build static libraries with PIC... yes
checking whether to build shared libraries only... no
checking whether to build static libraries only... yes
checking for windres... no
checking for inline... inline
checking if cpp -P is needed... yes
checking if cpp -P works... yes
checking if compiler is DEC/Compaq/HP C... no
checking if compiler is HP-UX C... no
checking if compiler is IBM C... no
checking if compiler is Intel C... no
checking if compiler is clang... no
checking if compiler is GNU C... yes
checking 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 if compiler accepts some basic options... yes
configure: compiler options added: -Werror-implicit-function-declaration
checking if compiler optimizer assumed setting might be used... yes
checking if compiler accepts optimizer enabling options... yes
configure: compiler options added: -O2
checking if compiler accepts strict warning options... yes
configure: compiler options added: -Wno-system-headers
checking if compiler halts on compilation errors... yes
checking if compiler halts on negative sized arrays... yes
checking if compiler halts on function prototype mismatch... yes
checking if compiler supports hiding library internal symbols... yes
checking for windows.h... no
checking whether build target is a native Windows one... no
checking whether build target supports WIN32 file API... no
checking whether build target supports WIN32 crypto API... no
checking for good-to-use Darwin CFLAGS... no
checking whether to link macOS CoreFoundation, CoreServices, and SystemConfiguration frameworks... no
checking to see if the compiler supports __builtin_available()... no
checking whether to support http... yes
checking whether to support ftp... yes
checking whether to support file... yes
checking whether to support ldap... yes
checking whether to support ldaps... yes
checking whether to support rtsp... yes
checking whether to support proxies... yes
checking whether to support dict... yes
checking whether to support telnet... yes
checking whether to support tftp... yes
checking whether to support pop3... yes
checking whether to support imap... yes
checking whether to support smb... yes
checking whether to support smtp... yes
checking whether to support gopher... yes
checking whether to support mqtt... no
checking whether to provide built-in manual... yes
checking whether to enable generation of C code... yes
checking whether to use libgcc... no
checking if X/Open network library is required... no
checking for gethostbyname... yes
checking for windows.h... (cached) no
checking for winsock2.h... (cached) no
checking for proto/bsdsocket.h... no
checking for connect in libraries... yes
checking for sys/types.h... (cached) yes
checking for sys/time.h... yes
checking for monotonic clock_gettime... yes
checking for clock_gettime in libraries... no additional lib required
checking if monotonic clock_gettime works... yes
checking for sys/types.h... (cached) yes
checking for sys/time.h... (cached) yes
checking for raw monotonic clock_gettime... yes
checking for pkg-config... /usr/bin/pkg-config
checking for zlib options with pkg-config... found
checking for zlib.h... yes
configure: found both libz and libz.h header
checking for BrotliDecoderDecompress in -lbrotlidec... no
checking for brotli/decode.h... no
checking for ZSTD_createDStream in -lzstd... no
checking for zstd.h... no
checking for lber.h... no
checking for ldap.h... no
checking for ldap_ssl.h... no
checking for LDAP libraries... cannot find LDAP libraries
checking whether to enable IPv6... yes
checking if struct sockaddr_in6 has sin6_scope_id member... yes
checking if argv can be written to... yes
checking if GSS-API support is requested... no
checking whether to enable Windows native SSL/TLS... no
checking whether to enable Secure Transport... no
checking whether to enable Amiga native SSL/TLS (AmiSSL v5)... no
checking for library containing psl_builtin... -lpsl
checking for library containing gsasl_init... no
checking for RTMP_Init in -lrtmp... no
checking whether versioned symbols are wanted... no
checking whether to enable Windows native IDN (Windows native builds only)... no
checking whether to build with libidn2... (assumed) yes
checking for pkg-config... (cached) /usr/bin/pkg-config
checking for libidn2 options with pkg-config... no
configure: IDN_LIBS: "-lidn2"
configure: IDN_LDFLAGS: ""
configure: IDN_CPPFLAGS: ""
configure: IDN_DIR: ""
checking if idn2_lookup_ul can be linked... no
checking for idn2.h... no
checking for pkg-config... (cached) /usr/bin/pkg-config
checking for libnghttp2 options with pkg-config... no
checking for nghttp2_session_get_stream_local_window_size in -lnghttp2... no
checking for pkg-config... (cached) /usr/bin/pkg-config
checking for fish options with pkg-config... no
checking for sys/types.h... (cached) yes
checking for sys/time.h... (cached) yes
checking for sys/select.h... yes
checking for sys/socket.h... yes
checking for sys/ioctl.h... yes
checking for unistd.h... (cached) yes
checking for stdlib.h... (cached) yes
checking for arpa/inet.h... yes
checking for net/if.h... yes
checking for netinet/in.h... yes
checking for netinet/in6.h... no
checking for sys/un.h... yes
checking for linux/tcp.h... yes
checking for netinet/tcp.h... yes
checking for netinet/udp.h... yes
checking for netdb.h... yes
checking for sys/sockio.h... no
checking for sys/stat.h... (cached) yes
checking for sys/param.h... yes
checking for termios.h... yes
checking for termio.h... yes
checking for fcntl.h... yes
checking for io.h... no
checking for pwd.h... yes
checking for utime.h... yes
checking for sys/utime.h... no
checking for sys/poll.h... yes
checking for poll.h... yes
checking for socket.h... no
checking for sys/resource.h... yes
checking for libgen.h... yes
checking for locale.h... yes
checking for stdbool.h... yes
checking for sys/filio.h... no
checking for sys/wait.h... yes
checking for setjmp.h... yes
checking for an ANSI C-conforming const... yes
checking for size_t... yes
checking for sys/types.h... (cached) yes
checking for sys/time.h... (cached) yes
checking for sys/socket.h... (cached) yes
checking for struct timeval... yes
checking run-time libs availability... fine
checking size of size_t... 8
checking size of long... 8
checking size of int... 4
checking size of time_t... 8
checking size of off_t... 8
checking size of curl_off_t... 8
checking size of curl_socket_t... 4
checking for long long... yes
checking for ssize_t... yes
checking for bool... yes
checking for sa_family_t... yes
checking for suseconds_t... yes
checking if time_t is unsigned... no
checking for sys/types.h... (cached) yes
checking for poll.h... (cached) yes
checking for sys/poll.h... (cached) yes
checking for in_addr_t... yes
checking for struct sockaddr_storage... yes
checking for sys/select.h... (cached) yes
checking for sys/socket.h... (cached) yes
checking for select... yes
checking for sys/types.h... (cached) yes
checking for sys/socket.h... (cached) yes
checking for recv... yes
checking for sys/types.h... (cached) yes
checking for sys/socket.h... (cached) yes
checking for send... yes
checking for sys/types.h... (cached) yes
checking for sys/socket.h... (cached) yes
checking for MSG_NOSIGNAL... yes
checking for sys/types.h... (cached) yes
checking for unistd.h... (cached) yes
checking if alarm can be linked... yes
checking if alarm is prototyped... yes
checking if alarm is compilable... yes
checking if alarm usage allowed... yes
checking if alarm might be used... yes
checking for sys/types.h... (cached) yes
checking for strings.h... (cached) yes
checking for sys/types.h... (cached) yes
checking for libgen.h... (cached) yes
checking if basename can be linked... yes
checking if basename is prototyped... yes
checking if basename is compilable... yes
checking if basename usage allowed... yes
checking if basename might be used... yes
checking for sys/types.h... (cached) yes
checking for socket.h... (cached) no
checking if closesocket can be linked... no
checking if closesocket might be used... no
checking for sys/types.h... (cached) yes
checking for sys/socket.h... (cached) yes
checking if CloseSocket can be linked... no
checking if CloseSocket might be used... no
checking for sys/types.h... (cached) yes
checking for unistd.h... (cached) yes
checking for fcntl.h... (cached) yes
checking if fcntl can be linked... yes
checking if fcntl is prototyped... yes
checking if fcntl is compilable... yes
checking if fcntl usage allowed... yes
checking if fcntl might be used... yes
checking if fcntl O_NONBLOCK is compilable... yes
checking if fcntl O_NONBLOCK usage allowed... yes
checking if fcntl O_NONBLOCK might be used... yes
checking for windows.h... (cached) no
checking for winsock2.h... (cached) no
checking for ws2tcpip.h... (cached) no
checking for sys/types.h... (cached) yes
checking for netdb.h... (cached) yes
checking if freeaddrinfo can be linked... yes
checking if freeaddrinfo is prototyped... yes
checking if freeaddrinfo is compilable... yes
checking if freeaddrinfo usage allowed... yes
checking if freeaddrinfo might be used... yes
checking for sys/types.h... (cached) yes
checking for sys/xattr.h... yes
checking if fsetxattr can be linked... yes
checking if fsetxattr is prototyped... yes
checking if fsetxattr takes 5 args.... yes
checking if fsetxattr is compilable... yes
checking if fsetxattr usage allowed... yes
checking if fsetxattr might be used... yes
checking if ftruncate can be linked... yes
checking if ftruncate is prototyped... yes
checking if ftruncate is compilable... yes
checking if ftruncate usage allowed... yes
checking if ftruncate might be used... yes
checking for sys/types.h... (cached) yes
checking if getaddrinfo can be linked... yes
checking if getaddrinfo is prototyped... yes
checking if getaddrinfo is compilable... yes
checking if getaddrinfo seems to work... yes
checking if getaddrinfo usage allowed... yes
checking if getaddrinfo might be used... yes
checking if getaddrinfo is threadsafe... yes
checking if gethostbyname can be linked... yes
checking if gethostbyname is prototyped... yes
checking if gethostbyname is compilable... yes
checking if gethostbyname usage allowed... yes
checking if gethostbyname might be used... yes
checking if gethostbyname_r can be linked... yes
checking if gethostbyname_r is prototyped... yes
checking if gethostbyname_r takes 3 args.... no
checking if gethostbyname_r takes 5 args.... no
checking if gethostbyname_r takes 6 args.... yes
checking if gethostbyname_r is compilable... yes
checking if gethostbyname_r usage allowed... yes
checking if gethostbyname_r might be used... yes
checking if gethostname can be linked... yes
checking if gethostname is prototyped... yes
checking if gethostname is compilable... yes
checking for gethostname arg 2 data type... size_t
checking if gethostname usage allowed... yes
checking if gethostname might be used... yes
checking if getpeername can be linked... yes
checking if getpeername is prototyped... yes
checking if getpeername is compilable... yes
checking if getpeername usage allowed... yes
checking if getpeername might be used... yes
checking if getsockname can be linked... yes
checking if getsockname is prototyped... yes
checking if getsockname is compilable... yes
checking if getsockname usage allowed... yes
checking if getsockname might be used... yes
checking for net/if.h... (cached) yes
checking if if_nametoindex can be linked... yes
checking if if_nametoindex is prototyped... yes
checking if if_nametoindex is compilable... yes
checking if if_nametoindex usage allowed... yes
checking if if_nametoindex might be used... yes
checking for sys/types.h... (cached) yes
checking for sys/socket.h... (cached) yes
checking for netinet/in.h... (cached) yes
checking for ifaddrs.h... yes
checking if getifaddrs can be linked... yes
checking if getifaddrs is prototyped... yes
checking if getifaddrs is compilable... yes
checking if getifaddrs seems to work... yes
checking if getifaddrs usage allowed... yes
checking if getifaddrs might be used... yes
checking for sys/types.h... (cached) yes
checking for sys/time.h... (cached) yes
checking if gmtime_r can be linked... yes
checking if gmtime_r is prototyped... yes
checking if gmtime_r is compilable... yes
checking if gmtime_r seems to work... yes
checking if gmtime_r usage allowed... yes
checking if gmtime_r might be used... yes
checking for sys/types.h... (cached) yes
checking for sys/socket.h... (cached) yes
checking for netinet/in.h... (cached) yes
checking for arpa/inet.h... (cached) yes
checking if inet_ntop can be linked... yes
checking if inet_ntop is prototyped... yes
checking if inet_ntop is compilable... yes
checking if inet_ntop seems to work... yes
checking if inet_ntop usage allowed... yes
checking if inet_ntop might be used... yes
checking if inet_pton can be linked... yes
checking if inet_pton is prototyped... yes
checking if inet_pton is compilable... yes
checking if inet_pton seems to work... yes
checking if inet_pton usage allowed... yes
checking if inet_pton might be used... yes
checking for sys/types.h... (cached) yes
checking for unistd.h... (cached) yes
checking for sys/socket.h... (cached) yes
checking for sys/ioctl.h... (cached) yes
checking for stropts.h... no
checking if ioctl can be linked... yes
checking if ioctl is prototyped... yes
checking if ioctl is compilable... yes
checking if ioctl usage allowed... yes
checking if ioctl might be used... yes
checking if ioctl FIONBIO is compilable... yes
checking if ioctl FIONBIO usage allowed... yes
checking if ioctl FIONBIO might be used... yes
checking if ioctl SIOCGIFADDR is compilable... yes
checking if ioctl SIOCGIFADDR usage allowed... yes
checking if ioctl SIOCGIFADDR might be used... yes
checking if ioctlsocket can be linked... no
checking if ioctlsocket might be used... no
checking if IoctlSocket can be linked... no
checking if IoctlSocket might be used... no
checking if memrchr can be linked... yes
checking if memrchr is prototyped... no
checking if memrchr might be used... no
checking if poll can be linked... yes
checking if poll is prototyped... yes
checking if poll is compilable... yes
checking if poll seems to work... yes
checking if poll usage allowed... yes
checking if poll might be used... yes
checking for sys/types.h... (cached) yes
checking if sigaction can be linked... yes
checking if sigaction is prototyped... yes
checking if sigaction is compilable... yes
checking if sigaction usage allowed... yes
checking if sigaction might be used... yes
checking if siginterrupt can be linked... yes
checking if siginterrupt is prototyped... yes
checking if siginterrupt is compilable... yes
checking if siginterrupt usage allowed... yes
checking if siginterrupt might be used... yes
checking if signal can be linked... yes
checking if signal is prototyped... yes
checking if signal is compilable... yes
checking if signal usage allowed... yes
checking if signal might be used... yes
checking for sys/types.h... (cached) yes
checking if sigsetjmp can be linked... no
checking if sigsetjmp seems a macro... yes
checking if sigsetjmp is compilable... yes
checking if sigsetjmp usage allowed... yes
checking if sigsetjmp might be used... yes
checking if socket can be linked... yes
checking if socket is prototyped... yes
checking if socket is compilable... yes
checking if socket usage allowed... yes
checking if socket might be used... yes
checking if socketpair can be linked... yes
checking if socketpair is prototyped... yes
checking if socketpair is compilable... yes
checking if socketpair usage allowed... yes
checking if socketpair might be used... yes
checking if strcasecmp can be linked... yes
checking if strcasecmp is prototyped... yes
checking if strcasecmp is compilable... yes
checking if strcasecmp usage allowed... yes
checking if strcasecmp might be used... yes
checking if strcmpi can be linked... no
checking if strcmpi might be used... no
checking if strdup can be linked... yes
checking if strdup is prototyped... yes
checking if strdup is compilable... yes
checking if strdup usage allowed... yes
checking if strdup might be used... yes
checking if strerror_r can be linked... yes
checking if strerror_r is prototyped... yes
checking if strerror_r is compilable... yes
checking if strerror_r is glibc like... no
checking if strerror_r is POSIX like... yes
checking if strerror_r seems to work... yes
checking if strerror_r usage allowed... yes
checking if strerror_r might be used... yes
checking if stricmp can be linked... no
checking if stricmp might be used... no
checking if strtok_r can be linked... yes
checking if strtok_r is prototyped... yes
checking if strtok_r is compilable... yes
checking if strtok_r usage allowed... yes
checking if strtok_r might be used... yes
checking if strtoll can be linked... yes
checking if strtoll is prototyped... yes
checking if strtoll is compilable... yes
checking if strtoll usage allowed... yes
checking if strtoll might be used... yes
checking for ccache gcc options needed to detect all undeclared functions... none needed
checking whether getpwuid_r is declared... yes
checking for _fseeki64... no
checking deeper for _fseeki64... but still no
checking for arc4random... no
checking deeper for arc4random... but still no
checking for fchmod... yes
checking for fnmatch... yes
checking for fseeko... yes
checking for geteuid... yes
checking for getpass_r... no
checking deeper for getpass_r... but still no
checking for getppid... yes
checking for getpwuid... yes
checking for getpwuid_r... yes
checking for getrlimit... yes
checking for gettimeofday... yes
checking for if_nametoindex... yes
checking for mach_absolute_time... no
checking deeper for mach_absolute_time... but still no
checking for pipe... yes
checking for sched_yield... yes
checking for sendmsg... yes
checking for setlocale... yes
checking for setmode... no
checking deeper for setmode... but still no
checking for setrlimit... yes
checking for snprintf... yes
checking for utime... yes
checking for utimes... yes
checking whether fseeko is declared... yes
checking how to set a socket into non-blocking mode... fcntl O_NONBLOCK
checking for perl... /usr/bin/perl
checking for gnroff... no
checking for nroff... /usr/bin/nroff
checking how to use *nroff to get plain text from man pages... -man
checking whether to enable the threaded resolver... yes
checking whether to use POSIX threads for threaded resolver... auto
checking for pthread.h... yes
checking for pthread_create... yes
checking convert -I options to -isystem... yes
checking whether to enable verbose strings... yes
checking whether to enable SSPI support (Windows native builds only)... no
checking whether to enable basic authentication method... yes
checking whether to enable bearer authentication method... yes
checking whether to enable digest authentication method... yes
checking whether to enable kerberos authentication method... yes
checking whether to enable negotiate authentication method... yes
checking whether to enable aws sig methods... yes
checking whether to support NTLM... yes
checking whether to enable NTLM delegation to winbind's helper... no
checking whether to enable TLS-SRP authentication... yes
checking whether to enable Unix domain sockets... auto
checking for struct sockaddr_un.sun_path... yes
checking whether to support cookies... yes
checking whether to support socketpair... yes
checking whether to support HTTP authentication... yes
checking whether to support DoH... yes
checking whether to support the MIME API... yes
checking whether to support binding connections locally... yes
checking whether to support the form API... yes
checking whether to support date parsing... yes
checking whether to support netrc parsing... yes
checking whether to support progress-meter... yes
checking whether to support DNS shuffling... yes
checking whether to support curl_easy_option*... yes
checking whether to support alt-svc... yes
checking whether to support headers-api... yes
configure: disables HSTS due to lack of SSL
checking whether to support WebSockets... no
checking whether hiding of library internal symbols will actually happen... yes
checking if this build supports HTTPS-proxy... no
checking that generated files are newer than configure... done
configure: creating ./config.status
config.status: creating Makefile
config.status: creating docs/Makefile
config.status: creating docs/examples/Makefile
config.status: creating docs/libcurl/Makefile
config.status: creating docs/libcurl/opts/Makefile
config.status: creating docs/cmdline-opts/Makefile
config.status: creating include/Makefile
config.status: creating include/curl/Makefile
config.status: creating src/Makefile
config.status: creating lib/Makefile
config.status: creating scripts/Makefile
config.status: creating lib/libcurl.vers
config.status: creating lib/libcurl.plist
config.status: creating tests/Makefile
config.status: creating tests/config
config.status: creating tests/certs/Makefile
config.status: creating tests/certs/scripts/Makefile
config.status: creating tests/data/Makefile
config.status: creating tests/server/Makefile
config.status: creating tests/libtest/Makefile
config.status: creating tests/unit/Makefile
config.status: creating tests/http/config.ini
config.status: creating tests/http/Makefile
config.status: creating tests/http/clients/Makefile
config.status: creating packages/Makefile
config.status: creating packages/vms/Makefile
config.status: creating curl-config
config.status: creating libcurl.pc
config.status: creating lib/curl_config.h
config.status: executing depfiles commands
config.status: executing libtool commands
configure: Configured to build curl/libcurl:
Host setup: x86_64-pc-linux-gnu
Install prefix: /usr/local
Compiler: ccache gcc
CFLAGS: -Werror-implicit-function-declaration -O2 -Wno-system-headers
CPPFLAGS:
LDFLAGS:
LIBS: -lpsl -lz
curl version: 8.5.0-DEV
SSL: no (--with-{openssl,gnutls,mbedtls,wolfssl,schannel,secure-transport,amissl,bearssl,rustls} )
SSH: no (--with-{libssh,libssh2})
zlib: enabled
brotli: no (--with-brotli)
zstd: no (--with-zstd)
GSS-API: no (--with-gssapi)
GSASL: no (libgsasl not found)
TLS-SRP: no (--enable-tls-srp)
resolver: POSIX threaded
IPv6: enabled
Unix sockets: enabled
IDN: no (--with-{libidn2,winidn})
Build libcurl: Shared=no, Static=yes
Built-in manual: enabled
--libcurl option: enabled (--disable-libcurl-option)
Verbose errors: enabled (--disable-verbose)
Code coverage: disabled
SSPI: no (--enable-sspi)
ca cert bundle: no
ca cert path:
ca fallback:
LDAP: no (--enable-ldap / --with-ldap-lib / --with-lber-lib)
LDAPS: no (--enable-ldaps)
RTSP: enabled
RTMP: no (--with-librtmp)
PSL: enabled
Alt-svc: enabled (--disable-alt-svc)
Headers API: enabled (--disable-headers-api)
HSTS: no (--enable-hsts)
HTTP1: enabled (internal)
HTTP2: no (--with-nghttp2)
HTTP3: no (--with-ngtcp2 --with-nghttp3, --with-quiche, --with-msh3)
ECH: no (--enable-ech)
WebSockets: no (--enable-websockets)
Protocols: DICT FILE FTP GOPHER HTTP IMAP MQTT POP3 RTSP SMTP TELNET TFTP
Features: AsynchDNS IPv6 Largefile PSL UnixSockets alt-svc libz threadsafe
configure: WARNING: unrecognized options: --disable-docs
configure: WARNING: Cannot find libraries for LDAP support: LDAP disabled
configure: WARNING: libgsasl was not found
configure: WARNING: Cannot find libraries for IDN support: IDN disabled
configure: WARNING: unrecognized options: --disable-docs
$ make -j3
Making all in lib
make[1]: Entering directory '/root/asi_db/builds/curl/_worktrees/w0/lib'
make all-am
make[2]: Entering directory '/root/asi_db/builds/curl/_worktrees/w0/lib'
CC libcurl_la-altsvc.lo
CC libcurl_la-amigaos.lo
CC libcurl_la-asyn-ares.lo
CC libcurl_la-asyn-thread.lo
CC libcurl_la-base64.lo
CC libcurl_la-bufq.lo
CC libcurl_la-bufref.lo
CC libcurl_la-c-hyper.lo
CC libcurl_la-cf-h1-proxy.lo
CC libcurl_la-cf-h2-proxy.lo
CC libcurl_la-cf-haproxy.lo
CC libcurl_la-cf-https-connect.lo
CC libcurl_la-cf-socket.lo
CC libcurl_la-cfilters.lo
CC libcurl_la-conncache.lo
CC libcurl_la-connect.lo
CC libcurl_la-content_encoding.lo
CC libcurl_la-cookie.lo
CC libcurl_la-curl_addrinfo.lo
CC libcurl_la-curl_des.lo
CC libcurl_la-curl_endian.lo
CC libcurl_la-curl_fnmatch.lo
CC libcurl_la-curl_get_line.lo
CC libcurl_la-curl_gethostname.lo
CC libcurl_la-curl_gssapi.lo
CC libcurl_la-curl_memrchr.lo
CC libcurl_la-curl_multibyte.lo
CC libcurl_la-curl_ntlm_core.lo
CC libcurl_la-curl_ntlm_wb.lo
CC libcurl_la-curl_path.lo
CC libcurl_la-curl_range.lo
CC libcurl_la-curl_rtmp.lo
CC libcurl_la-curl_sasl.lo
CC libcurl_la-curl_sspi.lo
CC libcurl_la-curl_threads.lo
CC libcurl_la-curl_trc.lo
CC libcurl_la-dict.lo
CC libcurl_la-doh.lo
CC libcurl_la-dynbuf.lo
CC libcurl_la-dynhds.lo
CC libcurl_la-easy.lo
CC libcurl_la-easygetopt.lo
CC libcurl_la-easyoptions.lo
CC libcurl_la-escape.lo
CC libcurl_la-file.lo
CC libcurl_la-fileinfo.lo
CC libcurl_la-fopen.lo
CC libcurl_la-formdata.lo
CC libcurl_la-ftp.lo
CC libcurl_la-ftplistparser.lo
CC libcurl_la-getenv.lo
CC libcurl_la-getinfo.lo
CC libcurl_la-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-rtsp.lo
CC libcurl_la-select.lo
CC libcurl_la-sendf.lo
CC libcurl_la-setopt.lo
CC libcurl_la-sha256.lo
CC libcurl_la-share.lo
CC libcurl_la-slist.lo
CC libcurl_la-smb.lo
CC libcurl_la-smtp.lo
CC libcurl_la-socketpair.lo
CC libcurl_la-socks.lo
CC libcurl_la-socks_gssapi.lo
CC libcurl_la-socks_sspi.lo
CC libcurl_la-speedcheck.lo
CC libcurl_la-splay.lo
CC libcurl_la-strcase.lo
CC libcurl_la-strdup.lo
CC libcurl_la-strerror.lo
CC libcurl_la-strtok.lo
CC libcurl_la-strtoofft.lo
CC libcurl_la-system_win32.lo
CC libcurl_la-telnet.lo
CC libcurl_la-tftp.lo
CC libcurl_la-timediff.lo
CC libcurl_la-timeval.lo
CC libcurl_la-transfer.lo
CC libcurl_la-url.lo
CC libcurl_la-urlapi.lo
CC libcurl_la-version.lo
CC libcurl_la-version_win32.lo
CC libcurl_la-warnless.lo
CC libcurl_la-ws.lo
CC vauth/libcurl_la-cleartext.lo
CC vauth/libcurl_la-cram.lo
CC vauth/libcurl_la-digest.lo
CC vauth/libcurl_la-digest_sspi.lo
CC vauth/libcurl_la-gsasl.lo
CC vauth/libcurl_la-krb5_gssapi.lo
CC vauth/libcurl_la-krb5_sspi.lo
CC vauth/libcurl_la-ntlm.lo
CC vauth/libcurl_la-ntlm_sspi.lo
CC vauth/libcurl_la-oauth2.lo
CC vauth/libcurl_la-spnego_gssapi.lo
CC vauth/libcurl_la-spnego_sspi.lo
CC vauth/libcurl_la-vauth.lo
CC vtls/libcurl_la-bearssl.lo
CC vtls/libcurl_la-gtls.lo
CC vtls/libcurl_la-hostcheck.lo
CC vtls/libcurl_la-keylog.lo
CC vtls/libcurl_la-mbedtls.lo
CC vtls/libcurl_la-mbedtls_threadlock.lo
CC vtls/libcurl_la-openssl.lo
CC vtls/libcurl_la-rustls.lo
CC vtls/libcurl_la-schannel.lo
CC vtls/libcurl_la-schannel_verify.lo
CC vtls/libcurl_la-sectransp.lo
CC vtls/libcurl_la-vtls.lo
CC vtls/libcurl_la-wolfssl.lo
CC vtls/libcurl_la-x509asn1.lo
CC vquic/libcurl_la-curl_msh3.lo
CC vquic/libcurl_la-curl_ngtcp2.lo
CC vquic/libcurl_la-curl_quiche.lo
CC vquic/libcurl_la-vquic.lo
CC vssh/libcurl_la-libssh.lo
CC vssh/libcurl_la-libssh2.lo
CC vssh/libcurl_la-wolfssh.lo
CCLD libcurl.la
make[2]: Leaving directory '/root/asi_db/builds/curl/_worktrees/w0/lib'
make[1]: Leaving directory '/root/asi_db/builds/curl/_worktrees/w0/lib'
Making all in src
make[1]: Entering directory '/root/asi_db/builds/curl/_worktrees/w0/src'
Making all in ../docs
make[2]: Entering directory '/root/asi_db/builds/curl/_worktrees/w0/docs'
Making all in .
make[3]: Entering directory '/root/asi_db/builds/curl/_worktrees/w0/docs'
if test "..x" != "..x" -a -e "./curl.1"; then \
/usr/bin/install -c -m 644 "./curl.1" /root/asi_db/builds/curl/_worktrees/w0/docs/curl.1 \
&& touch -r "./curl.1" /root/asi_db/builds/curl/_worktrees/w0/docs/curl.1; fi
cd cmdline-opts && make
make[4]: Entering directory '/root/asi_db/builds/curl/_worktrees/w0/docs/cmdline-opts'
GENERATE ../../docs/curl.1
make[4]: Leaving directory '/root/asi_db/builds/curl/_worktrees/w0/docs/cmdline-opts'
make[3]: Leaving directory '/root/asi_db/builds/curl/_worktrees/w0/docs'
Making all in cmdline-opts
make[3]: Entering directory '/root/asi_db/builds/curl/_worktrees/w0/docs/cmdline-opts'
make[3]: Nothing to be done for 'all'.
make[3]: Leaving directory '/root/asi_db/builds/curl/_worktrees/w0/docs/cmdline-opts'
make[2]: Leaving directory '/root/asi_db/builds/curl/_worktrees/w0/docs'
make[2]: Entering directory '/root/asi_db/builds/curl/_worktrees/w0/src'
CC tool_binmode.o
CC slist_wc.o
CC tool_bname.o
CC tool_cb_dbg.o
CC tool_cb_hdr.o
CC tool_cb_prg.o
CC tool_cb_rea.o
CC tool_cb_see.o
CC tool_cb_wrt.o
CC tool_cfgable.o
CC tool_dirhie.o
CC tool_doswin.o
CC tool_easysrc.o
CC tool_filetime.o
CC tool_findfile.o
CC tool_formparse.o
CC tool_getparam.o
CC tool_getpass.o
CC tool_help.o
CC tool_helpers.o
HUGE tool_hugehelp.c
CC tool_ipfs.o
CC tool_libinfo.o
CC tool_listhelp.o
CC tool_main.o
CC tool_msgs.o
CC tool_operate.o
CC tool_operhlp.o
CC tool_paramhlp.o
CC tool_parsecfg.o
CC tool_progress.o
CC tool_setopt.o
CC tool_sleep.o
CC tool_stderr.o
CC tool_strdup.o
CC tool_urlglob.o
CC tool_util.o
CC tool_vms.o
CC tool_writeout.o
CC tool_writeout_json.o
CC tool_xattr.o
CC var.o
CC ../lib/base64.o
CC ../lib/curl_multibyte.o
CC ../lib/dynbuf.o
CC ../lib/nonblock.o
CC ../lib/strtoofft.o
CC ../lib/timediff.o
CC ../lib/version_win32.o
CC ../lib/warnless.o
CC tool_hugehelp.o
CCLD curl
make[2]: Leaving directory '/root/asi_db/builds/curl/_worktrees/w0/src'
make[1]: Leaving directory '/root/asi_db/builds/curl/_worktrees/w0/src'
make[1]: Entering directory '/root/asi_db/builds/curl/_worktrees/w0'
make[1]: Nothing to be done for 'all-am'.
make[1]: Leaving directory '/root/asi_db/builds/curl/_worktrees/w0'
| @@ -386,12 +386,12 @@ static CURLcode recv_CONNECT_resp(struct Curl_cfilter *cf, | |
| return CURLE_OK; | |
| while(ts->keepon) { | |
| - | ssize_t gotbytes; |
| + | ssize_t nread; |
| char byte; | |
| /* Read one byte at a time to avoid a race condition. Wait at most one | |
| second before looping to ensure continuous pgrsUpdates. */ | |
| - | result = Curl_read(data, tunnelsocket, &byte, 1, &gotbytes); |
| + | result = Curl_read(data, tunnelsocket, &byte, 1, &nread); |
| if(result == CURLE_AGAIN) | |
| /* socket buffer drained, return */ | |
| return CURLE_OK; | |
| @@ -404,7 +404,7 @@ static CURLcode recv_CONNECT_resp(struct Curl_cfilter *cf, | |
| break; | |
| } | |
| - | if(gotbytes <= 0) { |
| + | if(nread <= 0) { |
| if(data->set.proxyauth && data->state.authproxy.avail && | |
| data->state.aptr.proxyuserpwd) { | |
| /* proxy auth was requested and there was proxy auth available, | |
| @@ -437,11 +437,11 @@ static CURLcode recv_CONNECT_resp(struct Curl_cfilter *cf, | |
| properly to know when the end of the body is reached */ | |
| CHUNKcode r; | |
| CURLcode extra; | |
| - | ssize_t tookcareof = 0; |
| + | size_t consumed = 0; |
| /* now parse the chunked piece of data so that we can | |
| properly tell when the stream ends */ | |
| - | r = Curl_httpchunk_read(data, &byte, 1, &tookcareof, &extra); |
| + | r = Curl_httpchunk_read(data, &byte, 1, &consumed, &extra); |
| if(r == CHUNKE_STOP) { | |
| /* we're done reading chunks! */ | |
| infof(data, "chunk reading DONE"); | |
| @@ -499,6 +499,7 @@ static CURLcode recv_CONNECT_resp(struct Curl_cfilter *cf, | |
| else if(ts->chunked_encoding) { | |
| CHUNKcode r; | |
| CURLcode extra; | |
| + | size_t consumed = 0; |
| infof(data, "Ignore chunked response-body"); | |
| @@ -513,8 +514,7 @@ static CURLcode recv_CONNECT_resp(struct Curl_cfilter *cf, | |
| /* now parse the chunked piece of data so that we can properly | |
| tell when the stream ends */ | |
| - | r = Curl_httpchunk_read(data, linep + 1, 1, &gotbytes, |
| - | &extra); |
| + | r = Curl_httpchunk_read(data, linep + 1, 1, &consumed, &extra); |
| if(r == CHUNKE_STOP) { | |
| /* we're done reading chunks! */ | |
| infof(data, "chunk reading DONE"); | |
| @@ -3995,36 +3995,32 @@ CURLcode Curl_bump_headersize(struct Curl_easy *data, | |
| */ | |
| CURLcode Curl_http_readwrite_headers(struct Curl_easy *data, | |
| struct connectdata *conn, | |
| - | ssize_t *nread, |
| + | const char *buf, size_t blen, |
| + | size_t *pconsumed, |
| bool *stop_reading) | |
| { | |
| CURLcode result; | |
| struct SingleRequest *k = &data->req; | |
| - | ssize_t onread = *nread; |
| - | char *ostr = k->str; |
| char *headp; | |
| - | char *str_start; |
| char *end_ptr; | |
| /* header line within buffer loop */ | |
| *stop_reading = FALSE; | |
| + | *pconsumed = 0; |
| do { | |
| - | size_t rest_length; |
| - | size_t full_length; |
| + | size_t line_length; |
| int writetype; | |
| - | /* str_start is start of line within buf */ |
| - | str_start = k->str; |
| - | |
| /* data is in network encoding so use 0x0a instead of '\n' */ | |
| - | end_ptr = memchr(str_start, 0x0a, *nread); |
| + | end_ptr = memchr(buf, 0x0a, blen); |
| if(!end_ptr) { | |
| /* Not a complete header line within buffer, append the data to | |
| the end of the headerbuff. */ | |
| - | result = Curl_dyn_addn(&data->state.headerb, str_start, *nread); |
| + | result = Curl_dyn_addn(&data->state.headerb, buf, blen); |
| if(result) | |
| return result; | |
| + | *pconsumed += blen; |
| if(!k->headerline) { | |
| /* check if this looks like a protocol header */ | |
| @@ -4036,31 +4032,28 @@ CURLcode Curl_http_readwrite_headers(struct Curl_easy *data, | |
| if(st == STATUS_BAD) { | |
| /* this is not the beginning of a protocol first header line */ | |
| k->header = FALSE; | |
| - | k->badheader = HEADER_ALLBAD; |
| + | k->badheader = TRUE; |
| streamclose(conn, "bad HTTP: No end-of-message indicator"); | |
| if(!data->set.http09_allowed) { | |
| failf(data, "Received HTTP/0.9 when not allowed"); | |
| return CURLE_UNSUPPORTED_PROTOCOL; | |
| } | |
| - | break; |
| + | goto out; |
| } | |
| } | |
| - | *nread = 0; |
| - | break; /* read more and try again */ |
| + | goto out; /* read more and try again */ |
| } | |
| /* decrease the size of the remaining (supposed) header line */ | |
| - | rest_length = (end_ptr - k->str) + 1; |
| - | *nread -= (ssize_t)rest_length; |
| - | |
| - | k->str = end_ptr + 1; /* move past new line */ |
| - | |
| - | full_length = k->str - str_start; |
| - | |
| - | result = Curl_dyn_addn(&data->state.headerb, str_start, full_length); |
| + | line_length = (end_ptr - buf) + 1; |
| + | result = Curl_dyn_addn(&data->state.headerb, buf, line_length); |
| if(result) | |
| return result; | |
| + | blen -= line_length; |
| + | buf += line_length; |
| + | *pconsumed += line_length; |
| + | |
| /**** | |
| * We now have a FULL header line in 'headerb'. | |
| *****/ | |
| @@ -4078,14 +4071,12 @@ CURLcode Curl_http_readwrite_headers(struct Curl_easy *data, | |
| return CURLE_UNSUPPORTED_PROTOCOL; | |
| } | |
| k->header = FALSE; | |
| - | if(*nread) |
| + | if(blen) |
| /* since there's more, this is a partial bad header */ | |
| - | k->badheader = HEADER_PARTHEADER; |
| + | k->badheader = TRUE; |
| else { | |
| /* this was all we read so it's all a bad header */ | |
| - | k->badheader = HEADER_ALLBAD; |
| - | *nread = onread; |
| - | k->str = ostr; |
| + | k->badheader = TRUE; |
| return CURLE_OK; | |
| } | |
| break; | |
| @@ -4139,22 +4130,23 @@ CURLcode Curl_http_readwrite_headers(struct Curl_easy *data, | |
| /* switch to http2 now. The bytes after response headers | |
| are also processed here, otherwise they are lost. */ | |
| - | result = Curl_http2_upgrade(data, conn, FIRSTSOCKET, |
| - | k->str, *nread); |
| + | result = Curl_http2_upgrade(data, conn, FIRSTSOCKET, buf, blen); |
| if(result) | |
| return result; | |
| - | *nread = 0; |
| + | *pconsumed += blen; |
| + | blen = 0; |
| } | |
| #ifdef USE_WEBSOCKETS | |
| else if(k->upgr101 == UPGR101_WS) { | |
| /* verify the response */ | |
| - | result = Curl_ws_accept(data, k->str, *nread); |
| + | result = Curl_ws_accept(data, buf, blen); |
| if(result) | |
| return result; | |
| k->header = FALSE; /* no more header to parse! */ | |
| if(data->set.connect_only) { | |
| k->keepon &= ~KEEP_RECV; /* read no more content */ | |
| - | *nread = 0; |
| + | *pconsumed += blen; |
| + | blen = 0; |
| } | |
| } | |
| #endif | |
| @@ -4393,8 +4385,10 @@ CURLcode Curl_http_readwrite_headers(struct Curl_easy *data, | |
| k->keepon &= ~KEEP_RECV; | |
| } | |
| - | Curl_debug(data, CURLINFO_HEADER_IN, str_start, headerlen); |
| - | break; /* exit header line loop */ |
| + | Curl_debug(data, CURLINFO_HEADER_IN, |
| + | Curl_dyn_ptr(&data->state.headerb), |
| + | Curl_dyn_len(&data->state.headerb)); |
| + | goto out; /* exit header line loop */ |
| } | |
| /* We continue reading headers, reset the line-based header */ | |
| @@ -4583,12 +4577,12 @@ CURLcode Curl_http_readwrite_headers(struct Curl_easy *data, | |
| Curl_dyn_reset(&data->state.headerb); | |
| } | |
| - | while(*k->str); /* header line within buffer */ |
| + | while(blen); |
| /* We might have reached the end of the header part here, but | |
| there might be a non-header part left in the end of the read | |
| buffer. */ | |
| - | |
| + | out: |
| return CURLE_OK; | |
| } | |
| @@ -227,7 +227,8 @@ CURLcode Curl_http_size(struct Curl_easy *data); | |
| CURLcode Curl_http_readwrite_headers(struct Curl_easy *data, | |
| struct connectdata *conn, | |
| - | ssize_t *nread, |
| + | const char *buf, size_t blen, |
| + | size_t *pconsumed, |
| bool *stop_reading); | |
| /** | |
| @@ -98,9 +98,9 @@ void Curl_httpchunk_init(struct Curl_easy *data) | |
| * For example, 0x0d and 0x0a are used instead of '\r' and '\n'. | |
| */ | |
| CHUNKcode Curl_httpchunk_read(struct Curl_easy *data, | |
| - | char *datap, |
| - | ssize_t datalen, |
| - | ssize_t *wrote, |
| + | char *buf, |
| + | size_t blen, |
| + | size_t *pconsumed, |
| CURLcode *extrap) | |
| { | |
| CURLcode result = CURLE_OK; | |
| @@ -108,28 +108,27 @@ CHUNKcode Curl_httpchunk_read(struct Curl_easy *data, | |
| struct Curl_chunker *ch = &conn->chunk; | |
| struct SingleRequest *k = &data->req; | |
| size_t piece; | |
| - | curl_off_t length = (curl_off_t)datalen; |
| - | *wrote = 0; /* nothing's written yet */ |
| + | *pconsumed = 0; /* nothing's written yet */ |
| /* the original data is written to the client, but we go on with the | |
| chunk read process, to properly calculate the content length */ | |
| if(data->set.http_te_skip && !k->ignorebody) { | |
| - | result = Curl_client_write(data, CLIENTWRITE_BODY, datap, datalen); |
| + | result = Curl_client_write(data, CLIENTWRITE_BODY, buf, blen); |
| if(result) { | |
| *extrap = result; | |
| return CHUNKE_PASSTHRU_ERROR; | |
| } | |
| } | |
| - | while(length) { |
| + | while(blen) { |
| switch(ch->state) { | |
| case CHUNK_HEX: | |
| - | if(ISXDIGIT(*datap)) { |
| + | if(ISXDIGIT(*buf)) { |
| if(ch->hexindex < CHUNK_MAXNUM_LEN) { | |
| - | ch->hexbuffer[ch->hexindex] = *datap; |
| - | datap++; |
| - | length--; |
| + | ch->hexbuffer[ch->hexindex] = *buf; |
| + | buf++; |
| + | blen--; |
| ch->hexindex++; | |
| } | |
| else { | |
| @@ -143,7 +142,7 @@ CHUNKcode Curl_httpchunk_read(struct Curl_easy *data, | |
| a hexadecimal digit. */ | |
| return CHUNKE_ILLEGAL_HEX; | |
| - | /* length and datap are unmodified */ |
| + | /* blen and buf are unmodified */ |
| ch->hexbuffer[ch->hexindex] = 0; | |
| if(curlx_strtoofft(ch->hexbuffer, &endptr, 16, &ch->datasize)) | |
| @@ -154,7 +153,7 @@ CHUNKcode Curl_httpchunk_read(struct Curl_easy *data, | |
| case CHUNK_LF: | |
| /* waiting for the LF after a chunk size */ | |
| - | if(*datap == 0x0a) { |
| + | if(*buf == 0x0a) { |
| /* we're now expecting data to come, unless size was zero! */ | |
| if(0 == ch->datasize) { | |
| ch->state = CHUNK_TRAILER; /* now check for trailers */ | |
| @@ -163,19 +162,21 @@ CHUNKcode Curl_httpchunk_read(struct Curl_easy *data, | |
| ch->state = CHUNK_DATA; | |
| } | |
| - | datap++; |
| - | length--; |
| + | buf++; |
| + | blen--; |
| break; | |
| case CHUNK_DATA: | |
| - | /* We expect 'datasize' of data. We have 'length' right now, it can be |
| + | /* We expect 'datasize' of data. We have 'blen' right now, it can be |
| more or less than 'datasize'. Get the smallest piece. | |
| */ | |
| - | piece = curlx_sotouz((ch->datasize >= length)?length:ch->datasize); |
| + | piece = blen; |
| + | if(ch->datasize < (curl_off_t)blen) |
| + | piece = curlx_sotouz(ch->datasize); |
| /* Write the data portion available */ | |
| if(!data->set.http_te_skip && !k->ignorebody) { | |
| - | result = Curl_client_write(data, CLIENTWRITE_BODY, datap, piece); |
| + | result = Curl_client_write(data, CLIENTWRITE_BODY, buf, piece); |
| if(result) { | |
| *extrap = result; | |
| @@ -183,10 +184,10 @@ CHUNKcode Curl_httpchunk_read(struct Curl_easy *data, | |
| } | |
| } | |
| - | *wrote += piece; |
| + | *pconsumed += piece; |
| ch->datasize -= piece; /* decrease amount left to expect */ | |
| - | datap += piece; /* move read pointer forward */ |
| - | length -= piece; /* decrease space left in this round */ |
| + | buf += piece; /* move read pointer forward */ |
| + | blen -= piece; /* decrease space left in this round */ |
| if(0 == ch->datasize) | |
| /* end of data this round, we now expect a trailing CRLF */ | |
| @@ -194,18 +195,18 @@ CHUNKcode Curl_httpchunk_read(struct Curl_easy *data, | |
| break; | |
| case CHUNK_POSTLF: | |
| - | if(*datap == 0x0a) { |
| + | if(*buf == 0x0a) { |
| /* The last one before we go back to hex state and start all over. */ | |
| Curl_httpchunk_init(data); /* sets state back to CHUNK_HEX */ | |
| } | |
| - | else if(*datap != 0x0d) |
| + | else if(*buf != 0x0d) |
| return CHUNKE_BAD_CHUNK; | |
| - | datap++; |
| - | length--; |
| + | buf++; |
| + | blen--; |
| break; | |
| case CHUNK_TRAILER: | |
| - | if((*datap == 0x0d) || (*datap == 0x0a)) { |
| + | if((*buf == 0x0d) || (*buf == 0x0a)) { |
| char *tr = Curl_dyn_ptr(&conn->trailer); | |
| /* this is the end of a trailer, but if the trailer was zero bytes | |
| there was no trailer and we move on */ | |
| @@ -229,7 +230,7 @@ CHUNKcode Curl_httpchunk_read(struct Curl_easy *data, | |
| } | |
| Curl_dyn_reset(&conn->trailer); | |
| ch->state = CHUNK_TRAILER_CR; | |
| - | if(*datap == 0x0a) |
| + | if(*buf == 0x0a) |
| /* already on the LF */ | |
| break; | |
| } | |
| @@ -240,19 +241,19 @@ CHUNKcode Curl_httpchunk_read(struct Curl_easy *data, | |
| } | |
| } | |
| else { | |
| - | result = Curl_dyn_addn(&conn->trailer, datap, 1); |
| + | result = Curl_dyn_addn(&conn->trailer, buf, 1); |
| if(result) | |
| return CHUNKE_OUT_OF_MEMORY; | |
| } | |
| - | datap++; |
| - | length--; |
| + | buf++; |
| + | blen--; |
| break; | |
| case CHUNK_TRAILER_CR: | |
| - | if(*datap == 0x0a) { |
| + | if(*buf == 0x0a) { |
| ch->state = CHUNK_TRAILER_POSTCR; | |
| - | datap++; |
| - | length--; |
| + | buf++; |
| + | blen--; |
| } | |
| else | |
| return CHUNKE_BAD_CHUNK; | |
| @@ -261,27 +262,27 @@ CHUNKcode Curl_httpchunk_read(struct Curl_easy *data, | |
| case CHUNK_TRAILER_POSTCR: | |
| /* We enter this state when a CR should arrive so we expect to | |
| have to first pass a CR before we wait for LF */ | |
| - | if((*datap != 0x0d) && (*datap != 0x0a)) { |
| + | if((*buf != 0x0d) && (*buf != 0x0a)) { |
| /* not a CR then it must be another header in the trailer */ | |
| ch->state = CHUNK_TRAILER; | |
| break; | |
| } | |
| - | if(*datap == 0x0d) { |
| + | if(*buf == 0x0d) { |
| /* skip if CR */ | |
| - | datap++; |
| - | length--; |
| + | buf++; |
| + | blen--; |
| } | |
| /* now wait for the final LF */ | |
| ch->state = CHUNK_STOP; | |
| break; | |
| case CHUNK_STOP: | |
| - | if(*datap == 0x0a) { |
| - | length--; |
| + | if(*buf == 0x0a) { |
| + | blen--; |
| /* Record the length of any data left in the end of the buffer | |
| even if there's no more chunks to read */ | |
| - | ch->datasize = curlx_sotouz(length); |
| + | ch->datasize = blen; |
| return CHUNKE_STOP; /* return stop */ | |
| } | |
| @@ -93,8 +93,8 @@ struct Curl_chunker { | |
| /* The following functions are defined in http_chunks.c */ | |
| void Curl_httpchunk_init(struct Curl_easy *data); | |
| - | CHUNKcode Curl_httpchunk_read(struct Curl_easy *data, char *datap, |
| - | ssize_t length, ssize_t *wrote, |
| + | CHUNKcode Curl_httpchunk_read(struct Curl_easy *data, char *buf, |
| + | size_t blen, size_t *pconsumed, |
| CURLcode *passthru); | |
| #endif /* HEADER_CURL_HTTP_CHUNKS_H */ | |
| @@ -59,14 +59,19 @@ static int rtsp_getsock_do(struct Curl_easy *data, | |
| /* | |
| * Parse and write out any available RTP data. | |
| - | * |
| - | * nread: amount of data left after k->str. will be modified if RTP |
| - | * data is parsed and k->str is moved up |
| - | * readmore: whether or not the RTP parser needs more data right away |
| + | * @param data the transfer |
| + | * @param conn the connection |
| + | * @param buf data read from connection |
| + | * @param blen amount of data in buf |
| + | * @param consumed out, number of blen consumed |
| + | * @param readmore out, TRUE iff complete buf was consumed and more data |
| + | * is needed |
| */ | |
| static CURLcode rtsp_rtp_readwrite(struct Curl_easy *data, | |
| struct connectdata *conn, | |
| - | ssize_t *nread, |
| + | const char *buf, |
| + | size_t blen, |
| + | size_t *pconsumed, |
| bool *readmore); | |
| static CURLcode rtsp_setup_connection(struct Curl_easy *data, | |
| @@ -754,14 +759,14 @@ out: | |
| static CURLcode rtsp_rtp_readwrite(struct Curl_easy *data, | |
| struct connectdata *conn, | |
| - | ssize_t *nread, |
| + | const char *buf, |
| + | size_t blen, |
| + | size_t *pconsumed, |
| bool *readmore) | |
| { | |
| struct rtsp_conn *rtspc = &(conn->proto.rtspc); | |
| CURLcode result = CURLE_OK; | |
| size_t consumed = 0; | |
| - | char *buf; |
| - | size_t blen; |
| bool in_body; | |
| if(!data->req.header) | |
| @@ -770,11 +775,8 @@ static CURLcode rtsp_rtp_readwrite(struct Curl_easy *data, | |
| (data->req.size >= 0) && | |
| (data->req.bytecount < data->req.size); | |
| - | DEBUGASSERT(*nread >= 0); |
| - | blen = (size_t)(*nread); |
| - | buf = data->req.str; |
| *readmore = FALSE; | |
| - | |
| + | *pconsumed = 0; |
| if(!blen) { | |
| goto out; | |
| } | |
| @@ -784,6 +786,7 @@ static CURLcode rtsp_rtp_readwrite(struct Curl_easy *data, | |
| result = rtsp_filter_rtp(data, conn, buf, blen, in_body, &consumed); | |
| if(result) | |
| goto out; | |
| + | *pconsumed += consumed; |
| buf += consumed; | |
| blen -= consumed; | |
| } | |
| @@ -791,16 +794,16 @@ static CURLcode rtsp_rtp_readwrite(struct Curl_easy *data, | |
| /* we want to parse headers, do so */ | |
| if(data->req.header && blen) { | |
| bool stop_reading; | |
| + | |
| rtspc->in_header = TRUE; | |
| - | data->req.str = buf; |
| - | *nread = blen; |
| - | result = Curl_http_readwrite_headers(data, conn, nread, &stop_reading); |
| + | result = Curl_http_readwrite_headers(data, conn, buf, blen, |
| + | &consumed, &stop_reading); |
| if(result) | |
| goto out; | |
| - | DEBUGASSERT(*nread >= 0); |
| - | blen = (size_t)(*nread); |
| - | buf = data->req.str; |
| + | *pconsumed += consumed; |
| + | buf += consumed; |
| + | blen -= consumed; |
| if(!data->req.header) | |
| rtspc->in_header = FALSE; | |
| @@ -813,13 +816,10 @@ static CURLcode rtsp_rtp_readwrite(struct Curl_easy *data, | |
| result = rtsp_filter_rtp(data, conn, buf, blen, in_body, &consumed); | |
| if(result) | |
| goto out; | |
| - | buf += consumed; |
| - | blen -= consumed; |
| + | *pconsumed += consumed; |
| } | |
| } | |
| - | data->req.str = buf; |
| - | *nread = blen; |
| if(rtspc->state != RTP_PARSE_SKIP) | |
| *readmore = TRUE; | |
| @@ -413,6 +413,26 @@ bool Curl_meets_timecondition(struct Curl_easy *data, time_t timeofdoc) | |
| return TRUE; | |
| } | |
| + | static size_t get_max_body_write_len(struct Curl_easy *data) |
| + | { |
| + | if(data->req.maxdownload != -1) { |
| + | /* How much more are we allowed to write? */ |
| + | curl_off_t remain_diff; |
| + | remain_diff = data->req.maxdownload - data->req.bytecount; |
| + | if(remain_diff < 0) { |
| + | /* already written too much! */ |
| + | return 0; |
| + | } |
| + | else if(remain_diff > SSIZE_T_MAX) { |
| + | return SIZE_T_MAX; |
| + | } |
| + | else { |
| + | return (size_t)remain_diff; |
| + | } |
| + | } |
| + | return SIZE_T_MAX; |
| + | } |
| + | |
| /* | |
| * Go ahead and do a read if we have a readable socket or if | |
| * the stream was rewound (in which case we have data in a | |
| @@ -428,16 +448,15 @@ static CURLcode readwrite_data(struct Curl_easy *data, | |
| bool *comeback) | |
| { | |
| CURLcode result = CURLE_OK; | |
| - | ssize_t nread; /* number of bytes read */ |
| - | ssize_t n_to_write; |
| - | bool readmore = FALSE; /* used by RTP to signal for more data */ |
| + | char *buf, *excess_data; |
| + | size_t blen, hd_data_len, excess_len; |
| + | size_t consumed; |
| int maxloops = 100; | |
| curl_off_t max_recv = data->set.max_recv_speed? | |
| data->set.max_recv_speed : CURL_OFF_T_MAX; | |
| - | char *buf = data->state.buffer; |
| bool data_eof_handled = FALSE; | |
| - | DEBUGASSERT(buf); |
| + | DEBUGASSERT(data->state.buffer); |
| *done = FALSE; | |
| *comeback = FALSE; | |
| @@ -445,9 +464,7 @@ static CURLcode readwrite_data(struct Curl_easy *data, | |
| read or we get a CURLE_AGAIN */ | |
| do { | |
| bool is_empty_data = FALSE; | |
| - | size_t excess = 0; /* excess bytes read */ |
| - | size_t buffersize = data->set.buffer_size; |
| - | size_t bytestoread = buffersize; |
| + | size_t bytestoread = data->set.buffer_size; |
| /* For HTTP/2 and HTTP/3, read data without caring about the content | |
| length. This is safe because body in HTTP/2 is always segmented | |
| thanks to its framing layer. Meanwhile, we have to call Curl_read | |
| @@ -456,31 +473,40 @@ static CURLcode readwrite_data(struct Curl_easy *data, | |
| bool is_http3 = Curl_conn_is_http3(data, conn, FIRSTSOCKET); | |
| data_eof_handled = is_http3 || Curl_conn_is_http2(data, conn, FIRSTSOCKET); | |
| - | if(!data_eof_handled && k->size != -1 && !k->header) { |
| - | /* make sure we don't read too much */ |
| + | /* Each loop iteration starts with a fresh buffer and handles |
| + | * all data read into it. */ |
| + | buf = data->state.buffer; |
| + | blen = 0; |
| + | excess_data = NULL; |
| + | excess_len = 0; |
| + | |
| + | /* If we are reading BODY data and the connection does NOT handle EOF |
| + | * and we know the size of the BODY data, limit the read amount */ |
| + | if(!k->header && !data_eof_handled && k->size != -1) { |
| curl_off_t totalleft = k->size - k->bytecount; | |
| - | if(totalleft < (curl_off_t)bytestoread) |
| + | if(totalleft <= 0) |
| + | bytestoread = 0; |
| + | else if(totalleft < (curl_off_t)bytestoread) |
| bytestoread = (size_t)totalleft; | |
| } | |
| if(bytestoread) { | |
| /* receive data from the network! */ | |
| + | ssize_t nread; /* number of bytes read */ |
| result = Curl_read(data, conn->sockfd, buf, bytestoread, &nread); | |
| - | |
| - | /* read would've blocked */ |
| if(CURLE_AGAIN == result) { | |
| result = CURLE_OK; | |
| break; /* get out of loop */ | |
| } | |
| - | |
| - | if(result>0) |
| + | else if(result) |
| goto out; | |
| + | DEBUGASSERT(nread >= 0); |
| + | blen = (size_t)nread; |
| } | |
| else { | |
| /* read nothing but since we wanted nothing we consider this an OK | |
| situation to proceed from */ | |
| DEBUGF(infof(data, "readwrite_data: we're done")); | |
| - | nread = 0; |
| } | |
| if(!k->bytecount) { | |
| @@ -492,12 +518,17 @@ static CURLcode readwrite_data(struct Curl_easy *data, | |
| *didwhat |= KEEP_RECV; | |
| /* indicates data of zero size, i.e. empty file */ | |
| - | is_empty_data = ((nread == 0) && (k->bodywrites == 0)) ? TRUE : FALSE; |
| - | |
| - | if(0 < nread || is_empty_data) { |
| - | buf[nread] = 0; |
| + | is_empty_data = ((blen == 0) && (k->bodywrites == 0)) ? TRUE : FALSE; |
| + | |
| + | if(0 < blen || is_empty_data) { |
| + | /* data->state.buffer is allocated 1 byte larger than |
| + | * data->set.buffer_size admits. *wink* */ |
| + | /* TODO: we should really not rely on this being 0-terminated, since |
| + | * the actual data read might contain 0s. */ |
| + | buf[blen] = 0; |
| } | |
| - | if(!nread) { |
| + | |
| + | if(!blen) { |
| /* if we receive 0 or less here, either the data transfer is done or the | |
| server closed the connection and we bail out from this! */ | |
| if(data_eof_handled) | |
| @@ -509,46 +540,55 @@ static CURLcode readwrite_data(struct Curl_easy *data, | |
| break; | |
| } | |
| - | /* Default buffer to use when we write the buffer, it may be changed |
| - | in the flow below before the actual storing is done. */ |
| - | k->str = buf; |
| - | |
| if(conn->handler->readwrite) { | |
| - | result = conn->handler->readwrite(data, conn, &nread, &readmore); |
| + | bool readmore = FALSE; /* indicates data is incomplete, need more */ |
| + | consumed = 0; |
| + | result = conn->handler->readwrite(data, conn, buf, blen, |
| + | &consumed, &readmore); |
| if(result) | |
| goto out; | |
| if(readmore) | |
| break; | |
| + | buf += consumed; |
| + | blen -= consumed; |
| } | |
| #ifndef CURL_DISABLE_HTTP | |
| /* Since this is a two-state thing, we check if we are parsing | |
| headers at the moment or not. */ | |
| if(k->header) { | |
| - | /* we are in parse-the-header-mode */ |
| bool stop_reading = FALSE; | |
| - | result = Curl_http_readwrite_headers(data, conn, &nread, &stop_reading); |
| + | |
| + | consumed = 0; |
| + | result = Curl_http_readwrite_headers(data, conn, buf, blen, |
| + | &consumed, &stop_reading); |
| if(result) | |
| goto out; | |
| + | buf += consumed; |
| + | blen -= consumed; |
| if(conn->handler->readwrite && | |
| - | (k->maxdownload <= 0 && nread > 0)) { |
| - | result = conn->handler->readwrite(data, conn, &nread, &readmore); |
| + | (k->maxdownload <= 0 && blen > 0)) { |
| + | bool readmore = FALSE; /* indicates data is incomplete, need more */ |
| + | consumed = 0; |
| + | result = conn->handler->readwrite(data, conn, buf, blen, |
| + | &consumed, &readmore); |
| if(result) | |
| goto out; | |
| if(readmore) | |
| break; | |
| + | buf += consumed; |
| + | blen -= consumed; |
| } | |
| if(stop_reading) { | |
| /* We've stopped dealing with input, get out of the do-while loop */ | |
| - | |
| - | if(nread > 0) { |
| + | if(blen > 0) { |
| infof(data, | |
| "Excess found:" | |
| - | " excess = %zd" |
| + | " excess = %zu" |
| " url = %s (zero-length body)", | |
| - | nread, data->state.up.path); |
| + | blen, data->state.up.path); |
| } | |
| break; | |
| @@ -560,13 +600,13 @@ static CURLcode readwrite_data(struct Curl_easy *data, | |
| /* This is not an 'else if' since it may be a rest from the header | |
| parsing, where the beginning of the buffer is headers and the end | |
| is non-headers. */ | |
| - | if(!k->header && (nread > 0 || is_empty_data)) { |
| + | if(!k->header && (blen > 0 || is_empty_data)) { |
| - | if(data->req.no_body && nread > 0) { |
| + | if(data->req.no_body && blen > 0) { |
| /* data arrives although we want none, bail out */ | |
| streamclose(conn, "ignoring body"); | |
| - | DEBUGF(infof(data, "did not want a BODY, but seeing %zd bytes", |
| - | nread)); |
| + | DEBUGF(infof(data, "did not want a BODY, but seeing %zu bytes", |
| + | blen)); |
| *done = TRUE; | |
| result = CURLE_WEIRD_SERVER_REPLY; | |
| goto out; | |
| @@ -590,12 +630,13 @@ static CURLcode readwrite_data(struct Curl_easy *data, | |
| /* | |
| * Here comes a chunked transfer flying and we need to decode this | |
| * properly. While the name says read, this function both reads | |
| - | * and writes away the data. The returned 'nread' holds the number |
| - | * of actual data it wrote to the client. |
| + | * and writes away the data. |
| */ | |
| CURLcode extra; | |
| - | CHUNKcode res = |
| - | Curl_httpchunk_read(data, k->str, nread, &nread, &extra); |
| + | CHUNKcode res; |
| + | |
| + | consumed = 0; |
| + | res = Curl_httpchunk_read(data, buf, blen, &consumed, &extra); |
| if(CHUNKE_OK < res) { | |
| if(CHUNKE_PASSTHRU_ERROR == res) { | |
| @@ -607,9 +648,14 @@ static CURLcode readwrite_data(struct Curl_easy *data, | |
| result = CURLE_RECV_ERROR; | |
| goto out; | |
| } | |
| - | if(CHUNKE_STOP == res) { |
| + | |
| + | buf += consumed; |
| + | blen -= consumed; |
| + | if(CHUNKE_STOP == res) { |
| /* we're done reading chunks! */ | |
| k->keepon &= ~KEEP_RECV; /* read no more */ | |
| + | /* chunks read successfully, download is complete */ |
| + | k->download_done = TRUE; |
| /* N number of bytes at the end of the str buffer that weren't | |
| written to the client. */ | |
| @@ -623,43 +669,59 @@ static CURLcode readwrite_data(struct Curl_easy *data, | |
| } | |
| #endif /* CURL_DISABLE_HTTP */ | |
| - | /* Account for body content stored in the header buffer */ |
| - | n_to_write = nread; |
| - | if((k->badheader == HEADER_PARTHEADER) && !k->ignorebody) { |
| - | n_to_write += Curl_dyn_len(&data->state.headerb); |
| - | } |
| - | |
| - | if((-1 != k->maxdownload) && |
| - | (k->bytecount + n_to_write >= k->maxdownload)) { |
| - | |
| - | excess = (size_t)(k->bytecount + n_to_write - k->maxdownload); |
| - | if(excess > 0 && !k->ignorebody) { |
| - | infof(data, |
| - | "Excess found in a read:" |
| - | " excess = %zu" |
| - | ", size = %" CURL_FORMAT_CURL_OFF_T |
| - | ", maxdownload = %" CURL_FORMAT_CURL_OFF_T |
| - | ", bytecount = %" CURL_FORMAT_CURL_OFF_T, |
| - | excess, k->size, k->maxdownload, k->bytecount); |
| - | connclose(conn, "excess found in a read"); |
| - | } |
| + | /* If we know how much to download, have we reached the last bytes? */ |
| + | if(-1 != k->maxdownload) { |
| + | size_t max_write_len = get_max_body_write_len(data); |
| + | |
| + | /* Account for body content stillin the header buffer */ |
| + | hd_data_len = k->badheader? Curl_dyn_len(&data->state.headerb) : 0; |
| + | if(blen + hd_data_len >= max_write_len) { |
| + | /* We have all download bytes, but do we have too many? */ |
| + | excess_len = (blen + hd_data_len) - max_write_len; |
| + | if(excess_len > 0 && !k->ignorebody) { |
| + | infof(data, |
| + | "Excess found in a read:" |
| + | " excess = %zu" |
| + | ", size = %" CURL_FORMAT_CURL_OFF_T |
| + | ", maxdownload = %" CURL_FORMAT_CURL_OFF_T |
| + | ", bytecount = %" CURL_FORMAT_CURL_OFF_T, |
| + | excess_len, k->size, k->maxdownload, k->bytecount); |
| + | connclose(conn, "excess found in a read"); |
| + | } |
| - | nread = (ssize_t) (k->maxdownload - k->bytecount); |
| - | if(nread < 0) /* this should be unusual */ |
| - | nread = 0; |
| + | if(!excess_len) { |
| + | /* no excess bytes, perfect! */ |
| + | excess_data = NULL; |
| + | } |
| + | else if(hd_data_len >= excess_len) { |
| + | /* uh oh, header body data already exceeds, the whole `buf` |
| + | * is excess data */ |
| + | excess_len = blen; |
| + | excess_data = buf; |
| + | blen = 0; |
| + | } |
| + | else { |
| + | /* `buf` bytes exceed, shorten and set `excess_data` */ |
| + | excess_len -= hd_data_len; |
| + | DEBUGASSERT(blen >= excess_len); |
| + | blen -= excess_len; |
| + | excess_data = buf + blen; |
| + | } |
| - | /* HTTP/3 over QUIC should keep reading until QUIC connection |
| - | is closed. In contrast to HTTP/2 which can stop reading |
| - | from TCP connection, HTTP/3 over QUIC needs ACK from server |
| - | to ensure stream closure. It should keep reading. */ |
| - | if(!is_http3) { |
| - | k->keepon &= ~KEEP_RECV; /* we're done reading */ |
| + | /* HTTP/3 over QUIC should keep reading until QUIC connection |
| + | is closed. In contrast to HTTP/2 which can stop reading |
| + | from TCP connection, HTTP/3 over QUIC needs ACK from server |
| + | to ensure stream closure. It should keep reading. */ |
| + | if(!is_http3) { |
| + | k->keepon &= ~KEEP_RECV; /* we're done reading */ |
| + | } |
| + | k->download_done = TRUE; |
| } | |
| } | |
| - | max_recv -= nread; |
| + | max_recv -= blen; |
| - | if(!k->chunk && (nread || k->badheader || is_empty_data)) { |
| + | if(!k->chunk && (blen || k->badheader || is_empty_data)) { |
| /* If this is chunky transfer, it was already written */ | |
| if(k->badheader) { | |
| @@ -668,37 +730,27 @@ static CURLcode readwrite_data(struct Curl_easy *data, | |
| size_t headlen = Curl_dyn_len(&data->state.headerb); | |
| /* Don't let excess data pollute body writes */ | |
| - | if(k->maxdownload == -1 || (curl_off_t)headlen <= k->maxdownload) |
| - | result = Curl_client_write(data, CLIENTWRITE_BODY, |
| - | Curl_dyn_ptr(&data->state.headerb), |
| - | headlen); |
| - | else |
| - | result = Curl_client_write(data, CLIENTWRITE_BODY, |
| - | Curl_dyn_ptr(&data->state.headerb), |
| - | (size_t)k->maxdownload); |
| + | if(k->maxdownload != -1 && (curl_off_t)headlen > k->maxdownload) |
| + | headlen = (size_t)k->maxdownload; |
| + | result = Curl_client_write(data, CLIENTWRITE_BODY, |
| + | Curl_dyn_ptr(&data->state.headerb), |
| + | headlen); |
| if(result) | |
| goto out; | |
| } | |
| - | if(k->badheader < HEADER_ALLBAD) { |
| - | /* This switch handles various content encodings. If there's an |
| - | error here, be sure to check over the almost identical code |
| - | in http_chunks.c. |
| - | Make sure that ALL_CONTENT_ENCODINGS contains all the |
| - | encodings handled here. */ |
| - | if(nread) { |
| + | |
| + | if(blen) { |
| #ifndef CURL_DISABLE_POP3 | |
| - | if(conn->handler->protocol & PROTO_FAMILY_POP3) { |
| - | result = k->ignorebody? CURLE_OK : |
| - | Curl_pop3_write(data, k->str, nread); |
| - | } |
| - | else |
| - | #endif /* CURL_DISABLE_POP3 */ |
| - | result = Curl_client_write(data, CLIENTWRITE_BODY, k->str, |
| - | nread); |
| + | if(conn->handler->protocol & PROTO_FAMILY_POP3) { |
| + | result = k->ignorebody? CURLE_OK : |
| + | Curl_pop3_write(data, buf, blen); |
| } | |
| + | else |
| + | #endif /* CURL_DISABLE_POP3 */ |
| + | result = Curl_client_write(data, CLIENTWRITE_BODY, buf, blen); |
| } | |
| - | k->badheader = HEADER_NORMAL; /* taken care of now */ |
| + | k->badheader = FALSE; /* taken care of now */ |
| if(result) | |
| goto out; | |
| @@ -706,45 +758,25 @@ static CURLcode readwrite_data(struct Curl_easy *data, | |
| } /* if(!header and data to read) */ | |
| - | if(excess > 0 && !k->ignorebody) { |
| - | if(conn->handler->readwrite) { |
| - | /* Give protocol handler a chance to do something with it */ |
| - | k->str += nread; |
| - | if(&k->str[excess] > &buf[data->set.buffer_size]) { |
| - | /* the excess amount was too excessive(!), make sure |
| - | it doesn't read out of buffer */ |
| - | excess = &buf[data->set.buffer_size] - k->str; |
| - | } |
| - | nread = (ssize_t)excess; |
| - | result = conn->handler->readwrite(data, conn, &nread, &readmore); |
| - | if(result) |
| - | goto out; |
| + | if(conn->handler->readwrite && excess_data) { |
| + | bool readmore = FALSE; /* indicates data is incomplete, need more */ |
| - | if(readmore) { |
| - | DEBUGASSERT(nread == 0); |
| - | k->keepon |= KEEP_RECV; /* we're not done reading */ |
| - | } |
| - | else if(nread == 0) |
| - | break; |
| - | /* protocol handler did not consume all excess data */ |
| - | excess = nread; |
| - | } |
| - | if(excess) { |
| - | infof(data, |
| - | "Excess found in a read:" |
| - | " excess = %zu" |
| - | ", size = %" CURL_FORMAT_CURL_OFF_T |
| - | ", maxdownload = %" CURL_FORMAT_CURL_OFF_T |
| - | ", bytecount = %" CURL_FORMAT_CURL_OFF_T, |
| - | excess, k->size, k->maxdownload, k->bytecount); |
| - | connclose(conn, "excess found in a read"); |
| - | } |
| + | consumed = 0; |
| + | result = conn->handler->readwrite(data, conn, excess_data, excess_len, |
| + | &consumed, &readmore); |
| + | if(result) |
| + | goto out; |
| + | |
| + | if(readmore) |
| + | k->keepon |= KEEP_RECV; /* we're not done reading */ |
| + | break; |
| } | |
| if(is_empty_data) { | |
| /* if we received nothing, the server closed the connection and we | |
| are done */ | |
| k->keepon &= ~KEEP_RECV; | |
| + | k->download_done = TRUE; |
| } | |
| if((k->keepon & KEEP_RECV_PAUSE) || !(k->keepon & KEEP_RECV)) { | |
| @@ -672,16 +672,8 @@ struct SingleRequest { | |
| counter to make only a 100 reply (without | |
| a following second response code) result | |
| in a CURLE_GOT_NOTHING error code */ | |
| - | enum { |
| - | HEADER_NORMAL, /* no bad header at all */ |
| - | HEADER_PARTHEADER, /* part of the chunk is a bad header, the rest |
| - | is normal data */ |
| - | HEADER_ALLBAD /* all was believed to be header */ |
| - | } badheader; /* the header was deemed bad and will be |
| - | written as body */ |
| int headerline; /* counts header lines to better track the | |
| first one */ | |
| - | char *str; /* within buf */ |
| curl_off_t offset; /* possible resume offset read from the | |
| Content-Range: header */ | |
| int httpcode; /* error code from the 'HTTP/1.? XXX' or | |
| @@ -740,7 +732,9 @@ struct SingleRequest { | |
| #endif | |
| unsigned char writer_stack_depth; /* Unencoding stack depth. */ | |
| BIT(header); /* incoming data has HTTP header */ | |
| + | BIT(badheader); /* header parsing found sth not a header */ |
| BIT(content_range); /* set TRUE if Content-Range: was found */ | |
| + | BIT(download_done); /* set to TRUE when download is complete */ |
| BIT(upload_done); /* set to TRUE when doing chunked transfer-encoding | |
| upload and we're uploading the last chunk */ | |
| BIT(ignorebody); /* we read a response-body but we ignore it! */ | |
| @@ -824,7 +818,8 @@ struct Curl_handler { | |
| /* If used, this function gets called from transfer.c:readwrite_data() to | |
| allow the protocol to do extra reads/writes */ | |
| CURLcode (*readwrite)(struct Curl_easy *data, struct connectdata *conn, | |
| - | ssize_t *nread, bool *readmore); |
| + | const char *buf, size_t blen, |
| + | size_t *pconsumed, bool *readmore); |
| /* This function can perform various checks on the connection. See | |
| CONNCHECK_* for more information about the checks that can be performed, | |