← Commit list

331b89a319

Stefan Eissing

2023-09-04

SUCCESS Duration: 99s

Subject

http2: polish things around POST

Binary

Download Binary (836 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 331b89a319d0067fa1e6441719307cfef9c7960f
Previous HEAD position was 519b1cf97b multi: more efficient pollfd count for poll
HEAD is now at 331b89a319 http2: polish things around POST

$ git clean -fdx
Removing Makefile
Removing Makefile.in
Removing aclocal.m4
Removing autom4te.cache/
Removing compile
Removing config.guess
Removing config.log
Removing config.status
Removing config.sub
Removing configure
Removing curl-config
Removing depcomp
Removing docs/Makefile
Removing docs/Makefile.in
Removing docs/cmdline-opts/Makefile
Removing docs/cmdline-opts/Makefile.in
Removing docs/curl.1
Removing docs/examples/.deps/
Removing docs/examples/Makefile
Removing docs/examples/Makefile.in
Removing docs/libcurl/Makefile
Removing docs/libcurl/Makefile.in
Removing docs/libcurl/opts/Makefile
Removing docs/libcurl/opts/Makefile.in
Removing include/Makefile
Removing include/Makefile.in
Removing include/curl/Makefile
Removing include/curl/Makefile.in
Removing install-sh
Removing lib/.deps/
Removing lib/.dirstamp
Removing lib/.libs/
Removing lib/Makefile
Removing lib/Makefile.in
Removing lib/base64.o
Removing lib/curl_config.h
Removing lib/curl_config.h.in
Removing lib/curl_multibyte.o
Removing lib/dynbuf.o
Removing lib/libcurl.la
Removing lib/libcurl.plist
Removing lib/libcurl.vers
Removing lib/libcurl_la-altsvc.lo
Removing lib/libcurl_la-altsvc.o
Removing lib/libcurl_la-amigaos.lo
Removing lib/libcurl_la-amigaos.o
Removing lib/libcurl_la-asyn-ares.lo
Removing lib/libcurl_la-asyn-ares.o
Removing lib/libcurl_la-asyn-thread.lo
Removing lib/libcurl_la-asyn-thread.o
Removing lib/libcurl_la-base64.lo
Removing lib/libcurl_la-base64.o
Removing lib/libcurl_la-bufq.lo
Removing lib/libcurl_la-bufq.o
Removing lib/libcurl_la-bufref.lo
Removing lib/libcurl_la-bufref.o
Removing lib/libcurl_la-c-hyper.lo
Removing lib/libcurl_la-c-hyper.o
Removing lib/libcurl_la-cf-h1-proxy.lo
Removing lib/libcurl_la-cf-h1-proxy.o
Removing lib/libcurl_la-cf-h2-proxy.lo
Removing lib/libcurl_la-cf-h2-proxy.o
Removing lib/libcurl_la-cf-haproxy.lo
Removing lib/libcurl_la-cf-haproxy.o
Removing lib/libcurl_la-cf-https-connect.lo
Removing lib/libcurl_la-cf-https-connect.o
Removing lib/libcurl_la-cf-socket.lo
Removing lib/libcurl_la-cf-socket.o
Removing lib/libcurl_la-cfilters.lo
Removing lib/libcurl_la-cfilters.o
Removing lib/libcurl_la-conncache.lo
Removing lib/libcurl_la-conncache.o
Removing lib/libcurl_la-connect.lo
Removing lib/libcurl_la-connect.o
Removing lib/libcurl_la-content_encoding.lo
Removing lib/libcurl_la-content_encoding.o
Removing lib/libcurl_la-cookie.lo
Removing lib/libcurl_la-cookie.o
Removing lib/libcurl_la-curl_addrinfo.lo
Removing lib/libcurl_la-curl_addrinfo.o
Removing lib/libcurl_la-curl_des.lo
Removing lib/libcurl_la-curl_des.o
Removing lib/libcurl_la-curl_endian.lo
Removing lib/libcurl_la-curl_endian.o
Removing lib/libcurl_la-curl_fnmatch.lo
Removing lib/libcurl_la-curl_fnmatch.o
Removing lib/libcurl_la-curl_get_line.lo
Removing lib/libcurl_la-curl_get_line.o
Removing lib/libcurl_la-curl_gethostname.lo
Removing lib/libcurl_la-curl_gethostname.o
Removing lib/libcurl_la-curl_gssapi.lo
Removing lib/libcurl_la-curl_gssapi.o
Removing lib/libcurl_la-curl_memrchr.lo
Removing lib/libcurl_la-curl_memrchr.o
Removing lib/libcurl_la-curl_multibyte.lo
Removing lib/libcurl_la-curl_multibyte.o
Removing lib/libcurl_la-curl_ntlm_core.lo
Removing lib/libcurl_la-curl_ntlm_core.o
Removing lib/libcurl_la-curl_ntlm_wb.lo
Removing lib/libcurl_la-curl_ntlm_wb.o
Removing lib/libcurl_la-curl_path.lo
Removing lib/libcurl_la-curl_path.o
Removing lib/libcurl_la-curl_range.lo
Removing lib/libcurl_la-curl_range.o
Removing lib/libcurl_la-curl_rtmp.lo
Removing lib/libcurl_la-curl_rtmp.o
Removing lib/libcurl_la-curl_sasl.lo
Removing lib/libcurl_la-curl_sasl.o
Removing lib/libcurl_la-curl_sspi.lo
Removing lib/libcurl_la-curl_sspi.o
Removing lib/libcurl_la-curl_threads.lo
Removing lib/libcurl_la-curl_threads.o
Removing lib/libcurl_la-curl_trc.lo
Removing lib/libcurl_la-curl_trc.o
Removing lib/libcurl_la-dict.lo
Removing lib/libcurl_la-dict.o
Removing lib/libcurl_la-doh.lo
Removing lib/libcurl_la-doh.o
Removing lib/libcurl_la-dynbuf.lo
Removing lib/libcurl_la-dynbuf.o
Removing lib/libcurl_la-dynhds.lo
Removing lib/libcurl_la-dynhds.o
Removing lib/libcurl_la-easy.lo
Removing lib/libcurl_la-easy.o
Removing lib/libcurl_la-easygetopt.lo
Removing lib/libcurl_la-easygetopt.o
Removing lib/libcurl_la-easyoptions.lo
Removing lib/libcurl_la-easyoptions.o
Removing lib/libcurl_la-escape.lo
Removing lib/libcurl_la-escape.o
Removing lib/libcurl_la-file.lo
Removing lib/libcurl_la-file.o
Removing lib/libcurl_la-fileinfo.lo
Removing lib/libcurl_la-fileinfo.o
Removing lib/libcurl_la-fopen.lo
Removing lib/libcurl_la-fopen.o
Removing lib/libcurl_la-formdata.lo
Removing lib/libcurl_la-formdata.o
Removing lib/libcurl_la-ftp.lo
Removing lib/libcurl_la-ftp.o
Removing lib/libcurl_la-ftplistparser.lo
Removing lib/libcurl_la-ftplistparser.o
Removing lib/libcurl_la-getenv.lo
Removing lib/libcurl_la-getenv.o
Removing lib/libcurl_la-getinfo.lo
Removing lib/libcurl_la-getinfo.o
Removing lib/libcurl_la-gopher.lo
Removing lib/libcurl_la-gopher.o
Removing lib/libcurl_la-hash.lo
Removing lib/libcurl_la-hash.o
Removing lib/libcurl_la-headers.lo
Removing lib/libcurl_la-headers.o
Removing lib/libcurl_la-hmac.lo
Removing lib/libcurl_la-hmac.o
Removing lib/libcurl_la-hostasyn.lo
Removing lib/libcurl_la-hostasyn.o
Removing lib/libcurl_la-hostip.lo
Removing lib/libcurl_la-hostip.o
Removing lib/libcurl_la-hostip4.lo
Removing lib/libcurl_la-hostip4.o
Removing lib/libcurl_la-hostip6.lo
Removing lib/libcurl_la-hostip6.o
Removing lib/libcurl_la-hostsyn.lo
Removing lib/libcurl_la-hostsyn.o
Removing lib/libcurl_la-hsts.lo
Removing lib/libcurl_la-hsts.o
Removing lib/libcurl_la-http.lo
Removing lib/libcurl_la-http.o
Removing lib/libcurl_la-http1.lo
Removing lib/libcurl_la-http1.o
Removing lib/libcurl_la-http2.lo
Removing lib/libcurl_la-http2.o
Removing lib/libcurl_la-http_aws_sigv4.lo
Removing lib/libcurl_la-http_aws_sigv4.o
Removing lib/libcurl_la-http_chunks.lo
Removing lib/libcurl_la-http_chunks.o
Removing lib/libcurl_la-http_digest.lo
Removing lib/libcurl_la-http_digest.o
Removing lib/libcurl_la-http_negotiate.lo
Removing lib/libcurl_la-http_negotiate.o
Removing lib/libcurl_la-http_ntlm.lo
Removing lib/libcurl_la-http_ntlm.o
Removing lib/libcurl_la-http_proxy.lo
Removing lib/libcurl_la-http_proxy.o
Removing lib/libcurl_la-idn.lo
Removing lib/libcurl_la-idn.o
Removing lib/libcurl_la-if2ip.lo
Removing lib/libcurl_la-if2ip.o
Removing lib/libcurl_la-imap.lo
Removing lib/libcurl_la-imap.o
Removing lib/libcurl_la-inet_ntop.lo
Removing lib/libcurl_la-inet_ntop.o
Removing lib/libcurl_la-inet_pton.lo
Removing lib/libcurl_la-inet_pton.o
Removing lib/libcurl_la-krb5.lo
Removing lib/libcurl_la-krb5.o
Removing lib/libcurl_la-ldap.lo
Removing lib/libcurl_la-ldap.o
Removing lib/libcurl_la-llist.lo
Removing lib/libcurl_la-llist.o
Removing lib/libcurl_la-macos.lo
Removing lib/libcurl_la-macos.o
Removing lib/libcurl_la-md4.lo
Removing lib/libcurl_la-md4.o
Removing lib/libcurl_la-md5.lo
Removing lib/libcurl_la-md5.o
Removing lib/libcurl_la-memdebug.lo
Removing lib/libcurl_la-memdebug.o
Removing lib/libcurl_la-mime.lo
Removing lib/libcurl_la-mime.o
Removing lib/libcurl_la-mprintf.lo
Removing lib/libcurl_la-mprintf.o
Removing lib/libcurl_la-mqtt.lo
Removing lib/libcurl_la-mqtt.o
Removing lib/libcurl_la-multi.lo
Removing lib/libcurl_la-multi.o
Removing lib/libcurl_la-netrc.lo
Removing lib/libcurl_la-netrc.o
Removing lib/libcurl_la-nonblock.lo
Removing lib/libcurl_la-nonblock.o
Removing lib/libcurl_la-noproxy.lo
Removing lib/libcurl_la-noproxy.o
Removing lib/libcurl_la-openldap.lo
Removing lib/libcurl_la-openldap.o
Removing lib/libcurl_la-parsedate.lo
Removing lib/libcurl_la-parsedate.o
Removing lib/libcurl_la-pingpong.lo
Removing lib/libcurl_la-pingpong.o
Removing lib/libcurl_la-pop3.lo
Removing lib/libcurl_la-pop3.o
Removing lib/libcurl_la-progress.lo
Removing lib/libcurl_la-progress.o
Removing lib/libcurl_la-psl.lo
Removing lib/libcurl_la-psl.o
Removing lib/libcurl_la-rand.lo
Removing lib/libcurl_la-rand.o
Removing lib/libcurl_la-rename.lo
Removing lib/libcurl_la-rename.o
Removing lib/libcurl_la-rtsp.lo
Removing lib/libcurl_la-rtsp.o
Removing lib/libcurl_la-select.lo
Removing lib/libcurl_la-select.o
Removing lib/libcurl_la-sendf.lo
Removing lib/libcurl_la-sendf.o
Removing lib/libcurl_la-setopt.lo
Removing lib/libcurl_la-setopt.o
Removing lib/libcurl_la-sha256.lo
Removing lib/libcurl_la-sha256.o
Removing lib/libcurl_la-share.lo
Removing lib/libcurl_la-share.o
Removing lib/libcurl_la-slist.lo
Removing lib/libcurl_la-slist.o
Removing lib/libcurl_la-smb.lo
Removing lib/libcurl_la-smb.o
Removing lib/libcurl_la-smtp.lo
Removing lib/libcurl_la-smtp.o
Removing lib/libcurl_la-socketpair.lo
Removing lib/libcurl_la-socketpair.o
Removing lib/libcurl_la-socks.lo
Removing lib/libcurl_la-socks.o
Removing lib/libcurl_la-socks_gssapi.lo
Removing lib/libcurl_la-socks_gssapi.o
Removing lib/libcurl_la-socks_sspi.lo
Removing lib/libcurl_la-socks_sspi.o
Removing lib/libcurl_la-speedcheck.lo
Removing lib/libcurl_la-speedcheck.o
Removing lib/libcurl_la-splay.lo
Removing lib/libcurl_la-splay.o
Removing lib/libcurl_la-strcase.lo
Removing lib/libcurl_la-strcase.o
Removing lib/libcurl_la-strdup.lo
Removing lib/libcurl_la-strdup.o
Removing lib/libcurl_la-strerror.lo
Removing lib/libcurl_la-strerror.o
Removing lib/libcurl_la-strtok.lo
Removing lib/libcurl_la-strtok.o
Removing lib/libcurl_la-strtoofft.lo
Removing lib/libcurl_la-strtoofft.o
Removing lib/libcurl_la-system_win32.lo
Removing lib/libcurl_la-system_win32.o
Removing lib/libcurl_la-telnet.lo
Removing lib/libcurl_la-telnet.o
Removing lib/libcurl_la-tftp.lo
Removing lib/libcurl_la-tftp.o
Removing lib/libcurl_la-timediff.lo
Removing lib/libcurl_la-timediff.o
Removing lib/libcurl_la-timeval.lo
Removing lib/libcurl_la-timeval.o
Removing lib/libcurl_la-transfer.lo
Removing lib/libcurl_la-transfer.o
Removing lib/libcurl_la-url.lo
Removing lib/libcurl_la-url.o
Removing lib/libcurl_la-urlapi.lo
Removing lib/libcurl_la-urlapi.o
Removing lib/libcurl_la-version.lo
Removing lib/libcurl_la-version.o
Removing lib/libcurl_la-version_win32.lo
Removing lib/libcurl_la-version_win32.o
Removing lib/libcurl_la-warnless.lo
Removing lib/libcurl_la-warnless.o
Removing lib/libcurl_la-ws.lo
Removing lib/libcurl_la-ws.o
Removing lib/nonblock.o
Removing lib/stamp-h1
Removing lib/strtoofft.o
Removing lib/timediff.o
Removing lib/vauth/.deps/
Removing lib/vauth/.dirstamp
Removing lib/vauth/libcurl_la-cleartext.lo
Removing lib/vauth/libcurl_la-cleartext.o
Removing lib/vauth/libcurl_la-cram.lo
Removing lib/vauth/libcurl_la-cram.o
Removing lib/vauth/libcurl_la-digest.lo
Removing lib/vauth/libcurl_la-digest.o
Removing lib/vauth/libcurl_la-digest_sspi.lo
Removing lib/vauth/libcurl_la-digest_sspi.o
Removing lib/vauth/libcurl_la-gsasl.lo
Removing lib/vauth/libcurl_la-gsasl.o
Removing lib/vauth/libcurl_la-krb5_gssapi.lo
Removing lib/vauth/libcurl_la-krb5_gssapi.o
Removing lib/vauth/libcurl_la-krb5_sspi.lo
Removing lib/vauth/libcurl_la-krb5_sspi.o
Removing lib/vauth/libcurl_la-ntlm.lo
Removing lib/vauth/libcurl_la-ntlm.o
Removing lib/vauth/libcurl_la-ntlm_sspi.lo
Removing lib/vauth/libcurl_la-ntlm_sspi.o
Removing lib/vauth/libcurl_la-oauth2.lo
Removing lib/vauth/libcurl_la-oauth2.o
Removing lib/vauth/libcurl_la-spnego_gssapi.lo
Removing lib/vauth/libcurl_la-spnego_gssapi.o
Removing lib/vauth/libcurl_la-spnego_sspi.lo
Removing lib/vauth/libcurl_la-spnego_sspi.o
Removing lib/vauth/libcurl_la-vauth.lo
Removing lib/vauth/libcurl_la-vauth.o
Removing lib/version_win32.o
Removing lib/vquic/.deps/
Removing lib/vquic/.dirstamp
Removing lib/vquic/libcurl_la-curl_msh3.lo
Removing lib/vquic/libcurl_la-curl_msh3.o
Removing lib/vquic/libcurl_la-curl_ngtcp2.lo
Removing lib/vquic/libcurl_la-curl_ngtcp2.o
Removing lib/vquic/libcurl_la-curl_quiche.lo
Removing lib/vquic/libcurl_la-curl_quiche.o
Removing lib/vquic/libcurl_la-vquic.lo
Removing lib/vquic/libcurl_la-vquic.o
Removing lib/vssh/.deps/
Removing lib/vssh/.dirstamp
Removing lib/vssh/libcurl_la-libssh.lo
Removing lib/vssh/libcurl_la-libssh.o
Removing lib/vssh/libcurl_la-libssh2.lo
Removing lib/vssh/libcurl_la-libssh2.o
Removing lib/vssh/libcurl_la-wolfssh.lo
Removing lib/vssh/libcurl_la-wolfssh.o
Removing lib/vtls/.deps/
Removing lib/vtls/.dirstamp
Removing lib/vtls/libcurl_la-bearssl.lo
Removing lib/vtls/libcurl_la-bearssl.o
Removing lib/vtls/libcurl_la-gtls.lo
Removing lib/vtls/libcurl_la-gtls.o
Removing lib/vtls/libcurl_la-hostcheck.lo
Removing lib/vtls/libcurl_la-hostcheck.o
Removing lib/vtls/libcurl_la-keylog.lo
Removing lib/vtls/libcurl_la-keylog.o
Removing lib/vtls/libcurl_la-mbedtls.lo
Removing lib/vtls/libcurl_la-mbedtls.o
Removing lib/vtls/libcurl_la-mbedtls_threadlock.lo
Removing lib/vtls/libcurl_la-mbedtls_threadlock.o
Removing lib/vtls/libcurl_la-openssl.lo
Removing lib/vtls/libcurl_la-openssl.o
Removing lib/vtls/libcurl_la-rustls.lo
Removing lib/vtls/libcurl_la-rustls.o
Removing lib/vtls/libcurl_la-schannel.lo
Removing lib/vtls/libcurl_la-schannel.o
Removing lib/vtls/libcurl_la-schannel_verify.lo
Removing lib/vtls/libcurl_la-schannel_verify.o
Removing lib/vtls/libcurl_la-sectransp.lo
Removing lib/vtls/libcurl_la-sectransp.o
Removing lib/vtls/libcurl_la-vtls.lo
Removing lib/vtls/libcurl_la-vtls.o
Removing lib/vtls/libcurl_la-wolfssl.lo
Removing lib/vtls/libcurl_la-wolfssl.o
Removing lib/vtls/libcurl_la-x509asn1.lo
Removing lib/vtls/libcurl_la-x509asn1.o
Removing lib/warnless.o
Removing libcurl.pc
Removing libtool
Removing ltmain.sh
Removing m4/libtool.m4
Removing m4/ltoptions.m4
Removing m4/ltsugar.m4
Removing m4/ltversion.m4
Removing m4/lt~obsolete.m4
Removing missing
Removing packages/Makefile
Removing packages/Makefile.in
Removing packages/vms/Makefile
Removing packages/vms/Makefile.in
Removing scripts/Makefile
Removing scripts/Makefile.in
Removing src/.deps/
Removing src/.libs/
Removing src/Makefile
Removing src/Makefile.in
Removing src/curl
Removing src/slist_wc.o
Removing src/tool_binmode.o
Removing src/tool_bname.o
Removing src/tool_cb_dbg.o
Removing src/tool_cb_hdr.o
Removing src/tool_cb_prg.o
Removing src/tool_cb_rea.o
Removing src/tool_cb_see.o
Removing src/tool_cb_wrt.o
Removing src/tool_cfgable.o
Removing src/tool_dirhie.o
Removing src/tool_doswin.o
Removing src/tool_easysrc.o
Removing src/tool_filetime.o
Removing src/tool_findfile.o
Removing src/tool_formparse.o
Removing src/tool_getparam.o
Removing src/tool_getpass.o
Removing src/tool_help.o
Removing src/tool_helpers.o
Removing src/tool_hugehelp.c
Removing src/tool_hugehelp.o
Removing src/tool_libinfo.o
Removing src/tool_listhelp.o
Removing src/tool_main.o
Removing src/tool_msgs.o
Removing src/tool_operate.o
Removing src/tool_operhlp.o
Removing src/tool_paramhlp.o
Removing src/tool_parsecfg.o
Removing src/tool_progress.o
Removing src/tool_setopt.o
Removing src/tool_sleep.o
Removing src/tool_stderr.o
Removing src/tool_strdup.o
Removing src/tool_urlglob.o
Removing src/tool_util.o
Removing src/tool_vms.o
Removing src/tool_writeout.o
Removing src/tool_writeout_json.o
Removing src/tool_xattr.o
Removing src/var.o
Removing test-driver
Removing tests/Makefile
Removing tests/Makefile.in
Removing tests/certs/Makefile
Removing tests/certs/Makefile.in
Removing tests/certs/scripts/Makefile
Removing tests/certs/scripts/Makefile.in
Removing tests/config
Removing tests/configurehelp.pm
Removing tests/data/Makefile
Removing tests/data/Makefile.in
Removing tests/http/Makefile
Removing tests/http/Makefile.in
Removing tests/http/clients/.deps/
Removing tests/http/clients/Makefile
Removing tests/http/clients/Makefile.in
Removing tests/http/config.ini
Removing tests/libtest/.deps/
Removing tests/libtest/Makefile
Removing tests/libtest/Makefile.in
Removing tests/server/.deps/
Removing tests/server/Makefile
Removing tests/server/Makefile.in
Removing tests/unit/.deps/
Removing tests/unit/Makefile
Removing tests/unit/Makefile.in

$ autoreconf -fi
libtoolize: putting auxiliary files in '.'.
libtoolize: copying file './ltmain.sh'
libtoolize: putting macros in AC_CONFIG_MACRO_DIRS, 'm4'.
libtoolize: copying file 'm4/libtool.m4'
libtoolize: copying file 'm4/ltoptions.m4'
libtoolize: copying file 'm4/ltsugar.m4'
libtoolize: copying file 'm4/ltversion.m4'
libtoolize: copying file 'm4/lt~obsolete.m4'
libtoolize: Remember to add 'LT_INIT' to configure.ac.
configure.ac:123: installing './compile'
configure.ac:424: installing './config.guess'
configure.ac:424: installing './config.sub'
configure.ac:123: installing './install-sh'
configure.ac:129: installing './missing'
docs/examples/Makefile.am: installing './depcomp'
parallel-tests: installing './test-driver'

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

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

$ chmod +x configure

$ ./configure --disable-shared --without-ssl --disable-docs
checking whether to enable maintainer-specific portions of Makefiles... no
checking whether make supports nested variables... yes
checking whether to enable debug build options... no
checking whether to enable compiler optimizer... (assumed) yes
checking whether to enable strict compiler warnings... no
checking whether to enable compiler warnings as errors... no
checking whether to enable curl debug memory tracking... no
checking whether to enable hiding of library internal symbols... yes
checking whether to enable c-ares for DNS lookups... no
checking whether to disable dependency on -lrt... (assumed no)
checking whether to enable ECH support... no
checking for path separator... :
checking for sed... /usr/bin/sed
checking for grep... /usr/bin/grep
checking that grep -E works... yes
checking for ar... /usr/bin/ar
checking for a BSD-compatible install... /usr/bin/install -c
checking for gcc... ccache gcc
checking whether the C compiler works... yes
checking for C compiler default output file name... a.out
checking for suffix of executables...
checking whether we are cross compiling... no
checking for suffix of object files... o
checking whether the compiler supports GNU C... yes
checking whether ccache gcc accepts -g... yes
checking for ccache gcc option to enable C11 features... none needed
checking whether ccache gcc understands -c and -o together... yes
checking how to run the C preprocessor... ccache gcc -E
checking for stdio.h... yes
checking for stdlib.h... yes
checking for string.h... yes
checking for inttypes.h... yes
checking for stdint.h... yes
checking for strings.h... yes
checking for sys/stat.h... yes
checking for sys/types.h... yes
checking for unistd.h... yes
checking for stdatomic.h... yes
checking if _Atomic is available... yes
checking for a sed that does not truncate output... (cached) /usr/bin/sed
checking for code coverage support... no
checking whether build environment is sane... yes
checking for a race-free mkdir -p... /usr/bin/mkdir -p
checking for gawk... gawk
checking whether make sets $(MAKE)... yes
checking whether make supports the include directive... yes (GNU style)
checking dependency style of ccache gcc... gcc3
checking curl version... 8.3.0-DEV
checking for httpd... no
checking for apache2... no
checking for apachectl... no
checking for apxs... no
configure: httpd/apache2 not in PATH, http tests disabled
configure: apxs not in PATH, http tests disabled
checking for nghttpx... no
checking for caddy... no
checking build system type... x86_64-pc-linux-gnu
checking host system type... x86_64-pc-linux-gnu
checking for grep that handles long lines and -e... (cached) /usr/bin/grep
checking for egrep... /usr/bin/grep -E
checking if OS is AIX (to define _ALL_SOURCE)... no
checking if _THREAD_SAFE is already defined... no
checking if _THREAD_SAFE is actually needed... no
checking if _THREAD_SAFE is onwards defined... no
checking if _REENTRANT is already defined... no
checking if _REENTRANT is actually needed... no
checking if _REENTRANT is onwards defined... no
checking for special C compiler options needed for large files... no
checking for _FILE_OFFSET_BITS value needed for large files... no
checking how to print strings... printf
checking for a sed that does not truncate output... (cached) /usr/bin/sed
checking for fgrep... /usr/bin/grep -F
checking for ld used by ccache gcc... /usr/bin/ld
checking if the linker (/usr/bin/ld) is GNU ld... yes
checking for BSD- or MS-compatible name lister (nm)... /usr/bin/nm -B
checking the name lister (/usr/bin/nm -B) interface... BSD nm
checking whether ln -s works... yes
checking the maximum length of command line arguments... 1572864
checking how to convert x86_64-pc-linux-gnu file names to x86_64-pc-linux-gnu format... func_convert_file_noop
checking how to convert x86_64-pc-linux-gnu file names to toolchain format... func_convert_file_noop
checking for /usr/bin/ld option to reload object files... -r
checking for objdump... objdump
checking how to recognize dependent libraries... pass_all
checking for dlltool... no
checking how to associate runtime and link libraries... printf %s\n
checking for archiver @FILE support... @
checking for strip... strip
checking for ranlib... ranlib
checking command to parse /usr/bin/nm -B output from ccache gcc object... ok
checking for sysroot... no
checking for a working dd... /usr/bin/dd
checking how to truncate binary pipes... /usr/bin/dd bs=4096 count=1
checking for mt... mt
checking if mt is a manifest tool... no
checking for dlfcn.h... yes
checking for objdir... .libs
checking if ccache gcc supports -fno-rtti -fno-exceptions... no
checking for ccache gcc option to produce PIC... -fPIC -DPIC
checking if ccache gcc PIC flag -fPIC -DPIC works... yes
checking if ccache gcc static flag -static works... yes
checking if ccache gcc supports -c -o file.o... yes
checking if ccache gcc supports -c -o file.o... (cached) yes
checking whether the ccache gcc linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes
checking dynamic linker characteristics... GNU/Linux ld.so
checking how to hardcode library paths into programs... immediate
checking whether stripping libraries is possible... yes
checking if libtool supports shared libraries... yes
checking whether to build shared libraries... no
checking whether to build static libraries... yes
checking whether to build shared libraries with -version-info... yes
checking whether to build shared libraries with -no-undefined... no
checking whether to build shared libraries with -mimpure-text... no
checking whether to build shared libraries with PIC... yes
checking whether to build static libraries with PIC... yes
checking whether to build shared libraries only... no
checking whether to build static libraries only... yes
checking for windres... no
checking for inline... inline
checking if cpp -P is needed... yes
checking if cpp -P works... yes
checking if compiler is DEC/Compaq/HP C... no
checking if compiler is HP-UX C... no
checking if compiler is IBM C... no
checking if compiler is Intel C... no
checking if compiler is clang... no
checking if compiler is GNU C... yes
checking if compiler is LCC... no
checking if compiler is SGI MIPSpro C... no
checking if compiler is SGI MIPS C... no
checking if compiler is SunPro C... no
checking if compiler is Tiny C... no
checking if compiler accepts some basic options... yes
configure: compiler options added: -Werror-implicit-function-declaration
checking if compiler optimizer assumed setting might be used... yes
checking if compiler accepts optimizer enabling options... yes
configure: compiler options added: -O2
checking if compiler accepts strict warning options... yes
configure: compiler options added: -Wno-system-headers
checking if compiler halts on compilation errors... yes
checking if compiler halts on negative sized arrays... yes
checking if compiler halts on function prototype mismatch... yes
checking if compiler supports hiding library internal symbols... yes
checking for windows.h... no
checking whether build target is a native Windows one... no
checking whether build target supports WIN32 file API... no
checking whether build target supports WIN32 crypto API... no
checking for good-to-use Darwin CFLAGS... no
checking whether to link macOS CoreFoundation and SystemConfiguration framework... 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 sys/uio.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 arpa/tftp.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 compiler support of C99 variadic macro style... yes
checking for compiler support of old gcc variadic macro style... 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 string.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 if connect can be linked... yes
checking if connect is prototyped... yes
checking if connect is compilable... yes
checking if connect usage allowed... yes
checking if connect might be used... yes
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 for stdlib.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 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 for signal.h... 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 for setjmp.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 fnmatch... yes
checking for fchmod... yes
checking for fork... 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 for arc4random... no
checking deeper for arc4random... but still no
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 cryptographic authentication 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 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.3.0-DEV
SSL: no (--with-{openssl,gnutls,mbedtls,wolfssl,schannel,secure-transport,amissl,bearssl,rustls} )
SSH: no (--with-{libssh,libssh2})
zlib: enabled
brotli: no (--with-brotli)
zstd: no (--with-zstd)
GSS-API: no (--with-gssapi)
GSASL: no (libgsasl not found)
TLS-SRP: no (--enable-tls-srp)
resolver: POSIX threaded
IPv6: enabled
Unix sockets: enabled
IDN: no (--with-{libidn2,winidn})
Build libcurl: Shared=no, Static=yes
Built-in manual: enabled
--libcurl option: enabled (--disable-libcurl-option)
Verbose errors: enabled (--disable-verbose)
Code coverage: disabled
SSPI: no (--enable-sspi)
ca cert bundle: no
ca cert path:
ca fallback:
LDAP: no (--enable-ldap / --with-ldap-lib / --with-lber-lib)
LDAPS: no (--enable-ldaps)
RTSP: enabled
RTMP: no (--with-librtmp)
PSL: enabled
Alt-svc: enabled (--disable-alt-svc)
Headers API: enabled (--disable-headers-api)
HSTS: no (--enable-hsts)
HTTP1: enabled (internal)
HTTP2: no (--with-nghttp2, --with-hyper)
HTTP3: no (--with-ngtcp2 --with-nghttp3, --with-quiche, --with-msh3)
ECH: no (--enable-ech)
WebSockets: no (--enable-websockets)
Protocols: DICT FILE FTP GOPHER HTTP IMAP MQTT POP3 RTSP SMTP TELNET TFTP
Features: AsynchDNS IPv6 Largefile PSL UnixSockets alt-svc libz threadsafe

configure: WARNING: unrecognized options: --disable-docs
configure: WARNING: Cannot find libraries for LDAP support: LDAP disabled
configure: WARNING: libgsasl was not found
configure: WARNING: Cannot find libraries for IDN support: IDN disabled
configure: WARNING: unrecognized options: --disable-docs

$ make -j3
Making all in lib
make[1]: Entering directory '/root/asi_db/builds/curl/_worktrees/w0/lib'
make all-am
make[2]: Entering directory '/root/asi_db/builds/curl/_worktrees/w0/lib'
CC libcurl_la-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_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-http_aws_sigv4.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-mprintf.lo
CC libcurl_la-mime.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; fi
cd cmdline-opts && make
make[4]: Entering directory '/root/asi_db/builds/curl/_worktrees/w0/docs/cmdline-opts'
GENERATE ../../docs/curl.1
make[4]: Leaving directory '/root/asi_db/builds/curl/_worktrees/w0/docs/cmdline-opts'
make[3]: Leaving directory '/root/asi_db/builds/curl/_worktrees/w0/docs'
Making all in cmdline-opts
make[3]: Entering directory '/root/asi_db/builds/curl/_worktrees/w0/docs/cmdline-opts'
make[3]: Nothing to be done for 'all'.
make[3]: Leaving directory '/root/asi_db/builds/curl/_worktrees/w0/docs/cmdline-opts'
make[2]: Leaving directory '/root/asi_db/builds/curl/_worktrees/w0/docs'
make[2]: Entering directory '/root/asi_db/builds/curl/_worktrees/w0/src'
CC slist_wc.o
CC tool_binmode.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_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_stderr.o
CC tool_progress.o
CC tool_setopt.o
CC tool_strdup.o
CC tool_sleep.o
CC tool_urlglob.o
CC tool_util.o
CC tool_vms.o
CC tool_writeout.o
CC tool_writeout_json.o
CC tool_xattr.o
CC var.o
CC ../lib/base64.o
CC ../lib/curl_multibyte.o
CC ../lib/dynbuf.o
CC ../lib/nonblock.o
CC ../lib/strtoofft.o
CC ../lib/timediff.o
CC ../lib/version_win32.o
CC ../lib/warnless.o
CC tool_hugehelp.o
CCLD curl
make[2]: Leaving directory '/root/asi_db/builds/curl/_worktrees/w0/src'
make[1]: Leaving directory '/root/asi_db/builds/curl/_worktrees/w0/src'
make[1]: Entering directory '/root/asi_db/builds/curl/_worktrees/w0'
make[1]: Nothing to be done for 'all-am'.
make[1]: Leaving directory '/root/asi_db/builds/curl/_worktrees/w0'

Commit Diff GitHub →

.github/workflows/ngtcp2-linux.yml+8 -0

@@ -267,3 +267,11 @@ jobs:
	name: 'run pytest'
	env:
	TFLAGS: "${{ matrix.build.tflags }}"
+
+	- run: pytest
+	name: 'run pytest with slowed network'
+	env:
+	# 33% of sends are EAGAINed
+	CURL_DBG_SOCK_WBLOCK: 33
+	# only 80% of data > 10 bytes is send
+	CURL_DBG_SOCK_WPARTIAL: 80

lib/cf-h2-proxy.c+183 -65

@@ -35,6 +35,7 @@
	#include "dynbuf.h"
	#include "dynhds.h"
	#include "http1.h"
+	#include "http2.h"
	#include "http_proxy.h"
	#include "multiif.h"
	#include "cf-h2-proxy.h"
@@ -146,29 +147,30 @@ static void h2_tunnel_go_state(struct Curl_cfilter *cf,
	/* entering this one */
	switch(new_state) {
	case H2_TUNNEL_INIT:
-	CURL_TRC_CF(data, cf, "new tunnel state 'init'");
+	CURL_TRC_CF(data, cf, "[%d] new tunnel state 'init'", ts->stream_id);
	tunnel_stream_clear(ts);
	break;

	case H2_TUNNEL_CONNECT:
-	CURL_TRC_CF(data, cf, "new tunnel state 'connect'");
+	CURL_TRC_CF(data, cf, "[%d] new tunnel state 'connect'", ts->stream_id);
	ts->state = H2_TUNNEL_CONNECT;
	break;

	case H2_TUNNEL_RESPONSE:
-	CURL_TRC_CF(data, cf, "new tunnel state 'response'");
+	CURL_TRC_CF(data, cf, "[%d] new tunnel state 'response'", ts->stream_id);
	ts->state = H2_TUNNEL_RESPONSE;
	break;

	case H2_TUNNEL_ESTABLISHED:
-	CURL_TRC_CF(data, cf, "new tunnel state 'established'");
+	CURL_TRC_CF(data, cf, "[%d] new tunnel state 'established'",
+	ts->stream_id);
	infof(data, "CONNECT phase completed");
	data->state.authproxy.done = TRUE;
	data->state.authproxy.multipass = FALSE;
	/* FALLTHROUGH */
	case H2_TUNNEL_FAILED:
	if(new_state == H2_TUNNEL_FAILED)
-	CURL_TRC_CF(data, cf, "new tunnel state 'failed'");
+	CURL_TRC_CF(data, cf, "[%d] new tunnel state 'failed'", ts->stream_id);
	ts->state = new_state;
	/* If a proxy-authorization header was used for the proxy, then we should
	make sure that it isn't accidentally used for the document request
@@ -231,8 +233,8 @@ static void drain_tunnel(struct Curl_cfilter *cf,
	bits = CURL_CSELECT_IN;
	if(!tunnel->closed && !tunnel->reset && tunnel->upload_blocked_len)
	bits \|= CURL_CSELECT_OUT;
-	if(data->state.dselect_bits != bits) {
-	CURL_TRC_CF(data, cf, "[h2sid=%d] DRAIN dselect_bits=%x",
+	if(data->state.dselect_bits != bits \|\| 1) {
+	CURL_TRC_CF(data, cf, "[%d] DRAIN dselect_bits=%x",
	tunnel->stream_id, bits);
	data->state.dselect_bits = bits;
	Curl_expire(data, 0, EXPIRE_RUN_NOW);
@@ -249,7 +251,7 @@ static ssize_t proxy_nw_in_reader(void *reader_ctx,
	if(cf) {
	struct Curl_easy *data = CF_DATA_CURRENT(cf);
	nread = Curl_conn_cf_recv(cf->next, data, (char *)buf, buflen, err);
-	CURL_TRC_CF(data, cf, "nw_in_reader(len=%zu) -> %zd, %d",
+	CURL_TRC_CF(data, cf, "[0] nw_in_reader(len=%zu) -> %zd, %d",
	buflen, nread, *err);
	}
	else {
@@ -269,7 +271,7 @@ static ssize_t proxy_h2_nw_out_writer(void *writer_ctx,
	struct Curl_easy *data = CF_DATA_CURRENT(cf);
	nwritten = Curl_conn_cf_send(cf->next, data, (const char *)buf, buflen,
	err);
-	CURL_TRC_CF(data, cf, "nw_out_writer(len=%zu) -> %zd, %d",
+	CURL_TRC_CF(data, cf, "[0] nw_out_writer(len=%zu) -> %zd, %d",
	buflen, nwritten, *err);
	}
	else {
@@ -306,6 +308,10 @@ static ssize_t on_session_send(nghttp2_session *h2,
	static int proxy_h2_on_frame_recv(nghttp2_session *session,
	const nghttp2_frame *frame,
	void *userp);
+	#ifndef CURL_DISABLE_VERBOSE_STRINGS
+	static int on_frame_send(nghttp2_session session, const nghttp2_frame frame,
+	void *userp);
+	#endif
	static int proxy_h2_on_stream_close(nghttp2_session *session,
	int32_t stream_id,
	uint32_t error_code, void *userp);
@@ -348,6 +354,9 @@ static CURLcode cf_h2_proxy_ctx_init(struct Curl_cfilter *cf,
	nghttp2_session_callbacks_set_send_callback(cbs, on_session_send);
	nghttp2_session_callbacks_set_on_frame_recv_callback(
	cbs, proxy_h2_on_frame_recv);
+	#ifndef CURL_DISABLE_VERBOSE_STRINGS
+	nghttp2_session_callbacks_set_on_frame_send_callback(cbs, on_frame_send);
+	#endif
	nghttp2_session_callbacks_set_on_data_chunk_recv_callback(
	cbs, tunnel_recv_callback);
	nghttp2_session_callbacks_set_on_stream_close_callback(
@@ -395,7 +404,7 @@ static CURLcode cf_h2_proxy_ctx_init(struct Curl_cfilter *cf,
	out:
	if(cbs)
	nghttp2_session_callbacks_del(cbs);
-	CURL_TRC_CF(data, cf, "init proxy ctx -> %d", result);
+	CURL_TRC_CF(data, cf, "[0] init proxy ctx -> %d", result);
	return result;
	}

@@ -420,13 +429,13 @@ static CURLcode proxy_h2_nw_out_flush(struct Curl_cfilter *cf,
	&result);
	if(nwritten < 0) {
	if(result == CURLE_AGAIN) {
-	CURL_TRC_CF(data, cf, "flush nw send buffer(%zu) -> EAGAIN",
+	CURL_TRC_CF(data, cf, "[0] flush nw send buffer(%zu) -> EAGAIN",
	Curl_bufq_len(&ctx->outbufq));
	ctx->nw_out_blocked = 1;
	}
	return result;
	}
-	CURL_TRC_CF(data, cf, "nw send buffer flushed");
+	CURL_TRC_CF(data, cf, "[0] nw send buffer flushed");
	return Curl_bufq_is_empty(&ctx->outbufq)? CURLE_OK: CURLE_AGAIN;
	}

@@ -447,7 +456,7 @@ static int proxy_h2_process_pending_input(struct Curl_cfilter *cf,
	while(Curl_bufq_peek(&ctx->inbufq, &buf, &blen)) {

	rv = nghttp2_session_mem_recv(ctx->h2, (const uint8_t *)buf, blen);
-	CURL_TRC_CF(data, cf, "fed %zu bytes from nw to nghttp2 -> %zd", blen, rv);
+	CURL_TRC_CF(data, cf, "[0] %zu bytes to nghttp2 -> %zd", blen, rv);
	if(rv < 0) {
	failf(data,
	"process_pending_input: nghttp2_session_mem_recv() returned "
@@ -457,11 +466,11 @@ static int proxy_h2_process_pending_input(struct Curl_cfilter *cf,
	}
	Curl_bufq_skip(&ctx->inbufq, (size_t)rv);
	if(Curl_bufq_is_empty(&ctx->inbufq)) {
-	CURL_TRC_CF(data, cf, "all data in connection buffer processed");
+	CURL_TRC_CF(data, cf, "[0] all data in connection buffer processed");
	break;
	}
	else {
-	CURL_TRC_CF(data, cf, "process_pending_input: %zu bytes left "
+	CURL_TRC_CF(data, cf, "[0] process_pending_input: %zu bytes left "
	"in connection buffer", Curl_bufq_len(&ctx->inbufq));
	}
	}
@@ -478,7 +487,7 @@ static CURLcode proxy_h2_progress_ingress(struct Curl_cfilter *cf,

	/* Process network input buffer fist */
	if(!Curl_bufq_is_empty(&ctx->inbufq)) {
-	CURL_TRC_CF(data, cf, "Process %zu bytes in connection buffer",
+	CURL_TRC_CF(data, cf, "[0] process %zu bytes in connection buffer",
	Curl_bufq_len(&ctx->inbufq));
	if(proxy_h2_process_pending_input(cf, data, &result) < 0)
	return result;
@@ -492,7 +501,7 @@ static CURLcode proxy_h2_progress_ingress(struct Curl_cfilter *cf,
	!Curl_bufq_is_full(&ctx->tunnel.recvbuf)) {

	nread = Curl_bufq_slurp(&ctx->inbufq, proxy_nw_in_reader, cf, &result);
-	CURL_TRC_CF(data, cf, "read %zu bytes nw data -> %zd, %d",
+	CURL_TRC_CF(data, cf, "[0] read %zu bytes nw data -> %zd, %d",
	Curl_bufq_len(&ctx->inbufq), nread, result);
	if(nread < 0) {
	if(result != CURLE_AGAIN) {
@@ -528,7 +537,7 @@ static CURLcode proxy_h2_progress_egress(struct Curl_cfilter *cf,
	rv = nghttp2_session_send(ctx->h2);

	if(nghttp2_is_fatal(rv)) {
-	CURL_TRC_CF(data, cf, "nghttp2_session_send error (%s)%d",
+	CURL_TRC_CF(data, cf, "[0] nghttp2_session_send error (%s)%d",
	nghttp2_strerror(rv), rv);
	return CURLE_SEND_ERROR;
	}
@@ -565,6 +574,97 @@ static ssize_t on_session_send(nghttp2_session *h2,
	return nwritten;
	}

+	#ifndef CURL_DISABLE_VERBOSE_STRINGS
+	static int fr_print(const nghttp2_frame frame, char buffer, size_t blen)
+	{
+	switch(frame->hd.type) {
+	case NGHTTP2_DATA: {
+	return msnprintf(buffer, blen,
+	"FRAME[DATA, len=%d, eos=%d, padlen=%d]",
+	(int)frame->hd.length,
+	!!(frame->hd.flags & NGHTTP2_FLAG_END_STREAM),
+	(int)frame->data.padlen);
+	}
+	case NGHTTP2_HEADERS: {
+	return msnprintf(buffer, blen,
+	"FRAME[HEADERS, len=%d, hend=%d, eos=%d]",
+	(int)frame->hd.length,
+	!!(frame->hd.flags & NGHTTP2_FLAG_END_HEADERS),
+	!!(frame->hd.flags & NGHTTP2_FLAG_END_STREAM));
+	}
+	case NGHTTP2_PRIORITY: {
+	return msnprintf(buffer, blen,
+	"FRAME[PRIORITY, len=%d, flags=%d]",
+	(int)frame->hd.length, frame->hd.flags);
+	}
+	case NGHTTP2_RST_STREAM: {
+	return msnprintf(buffer, blen,
+	"FRAME[RST_STREAM, len=%d, flags=%d, error=%u]",
+	(int)frame->hd.length, frame->hd.flags,
+	frame->rst_stream.error_code);
+	}
+	case NGHTTP2_SETTINGS: {
+	if(frame->hd.flags & NGHTTP2_FLAG_ACK) {
+	return msnprintf(buffer, blen, "FRAME[SETTINGS, ack=1]");
+	}
+	return msnprintf(buffer, blen,
+	"FRAME[SETTINGS, len=%d]", (int)frame->hd.length);
+	}
+	case NGHTTP2_PUSH_PROMISE: {
+	return msnprintf(buffer, blen,
+	"FRAME[PUSH_PROMISE, len=%d, hend=%d]",
+	(int)frame->hd.length,
+	!!(frame->hd.flags & NGHTTP2_FLAG_END_HEADERS));
+	}
+	case NGHTTP2_PING: {
+	return msnprintf(buffer, blen,
+	"FRAME[PING, len=%d, ack=%d]",
+	(int)frame->hd.length,
+	frame->hd.flags&NGHTTP2_FLAG_ACK);
+	}
+	case NGHTTP2_GOAWAY: {
+	char scratch[128];
+	size_t s_len = sizeof(scratch)/sizeof(scratch[0]);
+	size_t len = (frame->goaway.opaque_data_len < s_len)?
+	frame->goaway.opaque_data_len : s_len-1;
+	if(len)
+	memcpy(scratch, frame->goaway.opaque_data, len);
+	scratch[len] = '\0';
+	return msnprintf(buffer, blen, "FRAME[GOAWAY, error=%d, reason='%s', "
+	"last_stream=%d]", frame->goaway.error_code,
+	scratch, frame->goaway.last_stream_id);
+	}
+	case NGHTTP2_WINDOW_UPDATE: {
+	return msnprintf(buffer, blen,
+	"FRAME[WINDOW_UPDATE, incr=%d]",
+	frame->window_update.window_size_increment);
+	}
+	default:
+	return msnprintf(buffer, blen, "FRAME[%d, len=%d, flags=%d]",
+	frame->hd.type, (int)frame->hd.length,
+	frame->hd.flags);
+	}
+	}
+
+	static int on_frame_send(nghttp2_session session, const nghttp2_frame frame,
+	void *userp)
+	{
+	struct Curl_cfilter *cf = userp;
+	struct Curl_easy *data = CF_DATA_CURRENT(cf);
+
+	(void)session;
+	DEBUGASSERT(data);
+	if(data && Curl_trc_cf_is_verbose(cf, data)) {
+	char buffer[256];
+	int len;
+	len = fr_print(frame, buffer, sizeof(buffer)-1);
+	buffer[len] = 0;
+	CURL_TRC_CF(data, cf, "[%d] -> %s", frame->hd.stream_id, buffer);
+	}
+	return 0;
+	}
+	#endif /* !CURL_DISABLE_VERBOSE_STRINGS */
+
	static int proxy_h2_on_frame_recv(nghttp2_session *session,
	const nghttp2_frame *frame,
	void *userp)
@@ -576,47 +676,57 @@ static int proxy_h2_on_frame_recv(nghttp2_session *session,

	(void)session;
	DEBUGASSERT(data);
+	#ifndef CURL_DISABLE_VERBOSE_STRINGS
+	if(Curl_trc_cf_is_verbose(cf, data)) {
+	char buffer[256];
+	int len;
+	len = fr_print(frame, buffer, sizeof(buffer)-1);
+	buffer[len] = 0;
+	CURL_TRC_CF(data, cf, "[%d] <- %s",frame->hd.stream_id, buffer);
+	}
+	#endif /* !CURL_DISABLE_VERBOSE_STRINGS */
+
	if(!stream_id) {
	/* stream ID zero is for connection-oriented stuff */
	DEBUGASSERT(data);
	switch(frame->hd.type) {
	case NGHTTP2_SETTINGS:
-	/* we do not do anything with this for now */
+	/* Since the initial stream window is 64K, a request might be on HOLD,
+	* due to exhaustion. The (initial) SETTINGS may announce a much larger
+	* window and assume that we treat this like a WINDOW_UPDATE. Some
+	* servers send an explicit WINDOW_UPDATE, but not all seem to do that.
+	* To be safe, we UNHOLD a stream in order not to stall. */
+	if((data->req.keepon & KEEP_SEND_HOLD) &&
+	(data->req.keepon & KEEP_SEND)) {
+	data->req.keepon &= ~KEEP_SEND_HOLD;
+	drain_tunnel(cf, data, &ctx->tunnel);
+	CURL_TRC_CF(data, cf, "[%d] un-holding after SETTINGS",
+	stream_id);
+	}
	break;
	case NGHTTP2_GOAWAY:
-	infof(data, "recveived GOAWAY, error=%d, last_stream=%u",
-	frame->goaway.error_code, frame->goaway.last_stream_id);
	ctx->goaway = TRUE;
	break;
-	case NGHTTP2_WINDOW_UPDATE:
-	CURL_TRC_CF(data, cf, "recv frame WINDOW_UPDATE");
-	break;
	default:
-	CURL_TRC_CF(data, cf, "recv frame %x on 0", frame->hd.type);
+	break;
	}
	return 0;
	}

	if(stream_id != ctx->tunnel.stream_id) {
-	CURL_TRC_CF(data, cf, "[h2sid=%u] rcvd FRAME not for tunnel", stream_id);
+	CURL_TRC_CF(data, cf, "[%d] rcvd FRAME not for tunnel", stream_id);
	return NGHTTP2_ERR_CALLBACK_FAILURE;
	}

	switch(frame->hd.type) {
-	case NGHTTP2_DATA:
-	/* If body started on this stream, then receiving DATA is illegal. */
-	CURL_TRC_CF(data, cf, "[h2sid=%u] recv frame DATA", stream_id);
-	break;
	case NGHTTP2_HEADERS:
-	CURL_TRC_CF(data, cf, "[h2sid=%u] recv frame HEADERS", stream_id);
-
	/* nghttp2 guarantees that :status is received, and we store it to
	stream->status_code. Fuzzing has proven this can still be reached
	without status code having been set. */
	if(!ctx->tunnel.resp)
	return NGHTTP2_ERR_CALLBACK_FAILURE;
	/* Only final status code signals the end of header */
-	CURL_TRC_CF(data, cf, "[h2sid=%u] got http status: %d",
+	CURL_TRC_CF(data, cf, "[%d] got http status: %d",
	stream_id, ctx->tunnel.resp->status);
	if(!ctx->tunnel.has_final_response) {
	if(ctx->tunnel.resp->status / 100 != 1) {
@@ -624,26 +734,16 @@ static int proxy_h2_on_frame_recv(nghttp2_session *session,
	}
	}
	break;
-	case NGHTTP2_PUSH_PROMISE:
-	CURL_TRC_CF(data, cf, "[h2sid=%u] recv PUSH_PROMISE", stream_id);
-	return NGHTTP2_ERR_CALLBACK_FAILURE;
-	case NGHTTP2_RST_STREAM:
-	CURL_TRC_CF(data, cf, "[h2sid=%u] recv RST", stream_id);
-	ctx->tunnel.reset = TRUE;
-	break;
	case NGHTTP2_WINDOW_UPDATE:
-	CURL_TRC_CF(data, cf, "[h2sid=%u] recv WINDOW_UPDATE", stream_id);
	if((data->req.keepon & KEEP_SEND_HOLD) &&
	(data->req.keepon & KEEP_SEND)) {
	data->req.keepon &= ~KEEP_SEND_HOLD;
	Curl_expire(data, 0, EXPIRE_RUN_NOW);
-	CURL_TRC_CF(data, cf, "[h2sid=%u] unpausing after win update",
+	CURL_TRC_CF(data, cf, "[%d] unpausing after win update",
	stream_id);
	}
	break;
	default:
-	CURL_TRC_CF(data, cf, "[h2sid=%u] recv frame %x",
-	stream_id, frame->hd.type);
	break;
	}
	return 0;
@@ -667,7 +767,7 @@ static int proxy_h2_on_header(nghttp2_session *session,
	(void)session;
	DEBUGASSERT(stream_id); /* should never be a zero stream ID here */
	if(stream_id != ctx->tunnel.stream_id) {
-	CURL_TRC_CF(data, cf, "[h2sid=%u] header for non-tunnel stream: "
+	CURL_TRC_CF(data, cf, "[%d] header for non-tunnel stream: "
	"%.s: %.s", stream_id,
	(int)namelen, name, (int)valuelen, value);
	return NGHTTP2_ERR_CALLBACK_FAILURE;
@@ -697,7 +797,7 @@ static int proxy_h2_on_header(nghttp2_session *session,
	return NGHTTP2_ERR_CALLBACK_FAILURE;
	resp->prev = ctx->tunnel.resp;
	ctx->tunnel.resp = resp;
-	CURL_TRC_CF(data, cf, "[h2sid=%u] status: HTTP/2 %03d",
+	CURL_TRC_CF(data, cf, "[%d] status: HTTP/2 %03d",
	stream_id, ctx->tunnel.resp->status);
	return 0;
	}
@@ -711,7 +811,7 @@ static int proxy_h2_on_header(nghttp2_session *session,
	if(result)
	return NGHTTP2_ERR_CALLBACK_FAILURE;

-	CURL_TRC_CF(data, cf, "[h2sid=%u] header: %.s: %.s",
+	CURL_TRC_CF(data, cf, "[%d] header: %.s: %.s",
	stream_id, (int)namelen, name, (int)valuelen, value);

	return 0; /* 0 is successful */
@@ -752,7 +852,7 @@ static ssize_t tunnel_send_callback(nghttp2_session *session,
	if(ts->closed && Curl_bufq_is_empty(&ts->sendbuf))
	*data_flags = NGHTTP2_DATA_FLAG_EOF;

-	CURL_TRC_CF(data, cf, "[h2sid=%u] tunnel_send_callback -> %zd",
+	CURL_TRC_CF(data, cf, "[%d] tunnel_send_callback -> %zd",
	ts->stream_id, nread);
	return nread;
	}
@@ -797,7 +897,7 @@ static int proxy_h2_on_stream_close(nghttp2_session *session,
	if(stream_id != ctx->tunnel.stream_id)
	return 0;

-	CURL_TRC_CF(data, cf, "[h2sid=%u] proxy_h2_on_stream_close, %s (err %d)",
+	CURL_TRC_CF(data, cf, "[%d] proxy_h2_on_stream_close, %s (err %d)",
	stream_id, nghttp2_http2_strerror(error_code), error_code);
	ctx->tunnel.closed = TRUE;
	ctx->tunnel.error = error_code;
@@ -916,8 +1016,8 @@ static CURLcode submit_CONNECT(struct Curl_cfilter *cf,
	result = proxy_h2_submit(&ts->stream_id, cf, data, ctx->h2, req,
	NULL, ts, tunnel_send_callback, cf);
	if(result) {
-	CURL_TRC_CF(data, cf, "send: nghttp2_submit_request error (%s)%u",
-	nghttp2_strerror(ts->stream_id), ts->stream_id);
+	CURL_TRC_CF(data, cf, "[%d] send, nghttp2_submit_request error: %s",
+	ts->stream_id, nghttp2_strerror(ts->stream_id));
	}

	out:
@@ -951,7 +1051,7 @@ static CURLcode inspect_response(struct Curl_cfilter *cf,
	}

	if(auth_reply) {
-	CURL_TRC_CF(data, cf, "CONNECT: fwd auth header '%s'",
+	CURL_TRC_CF(data, cf, "[0] CONNECT: fwd auth header '%s'",
	auth_reply->value);
	result = Curl_http_input_auth(data, ts->resp->status == 407,
	auth_reply->value);
@@ -982,7 +1082,7 @@ static CURLcode H2_CONNECT(struct Curl_cfilter *cf,
	switch(ts->state) {
	case H2_TUNNEL_INIT:
	/* Prepare the CONNECT request and make a first attempt to send. */
-	CURL_TRC_CF(data, cf, "CONNECT start for %s", ts->authority);
+	CURL_TRC_CF(data, cf, "[0] CONNECT start for %s", ts->authority);
	result = submit_CONNECT(cf, data, ts);
	if(result)
	goto out;
@@ -1149,7 +1249,7 @@ static ssize_t h2_handle_tunnel_close(struct Curl_cfilter *cf,
	ssize_t rv = 0;

	if(ctx->tunnel.error == NGHTTP2_REFUSED_STREAM) {
-	CURL_TRC_CF(data, cf, "[h2sid=%u] REFUSED_STREAM, try again on a new "
+	CURL_TRC_CF(data, cf, "[%d] REFUSED_STREAM, try again on a new "
	"connection", ctx->tunnel.stream_id);
	connclose(cf->conn, "REFUSED_STREAM"); /* don't use this anymore */
	err = CURLE_RECV_ERROR; / trigger Curl_retry_request() later */
@@ -1170,7 +1270,8 @@ static ssize_t h2_handle_tunnel_close(struct Curl_cfilter *cf,

	*err = CURLE_OK;
	rv = 0;
-	CURL_TRC_CF(data, cf, "handle_tunnel_close -> %zd, %d", rv, *err);
+	CURL_TRC_CF(data, cf, "[%d] handle_tunnel_close -> %zd, %d",
+	ctx->tunnel.stream_id, rv, *err);
	return rv;
	}

@@ -1206,8 +1307,8 @@ static ssize_t tunnel_recv(struct Curl_cfilter cf, struct Curl_easy data,
	}

	out:
-	CURL_TRC_CF(data, cf, "tunnel_recv(len=%zu) -> %zd, %d",
-	len, nread, *err);
+	CURL_TRC_CF(data, cf, "[%d] tunnel_recv(len=%zu) -> %zd, %d",
+	ctx->tunnel.stream_id, len, nread, *err);
	return nread;
	}

@@ -1235,13 +1336,22 @@ static ssize_t cf_h2_proxy_recv(struct Curl_cfilter *cf,
	nread = tunnel_recv(cf, data, buf, len, err);

	if(nread > 0) {
-	CURL_TRC_CF(data, cf, "[h2sid=%u] increase window by %zd",
+	CURL_TRC_CF(data, cf, "[%d] increase window by %zd",
	ctx->tunnel.stream_id, nread);
	nghttp2_session_consume(ctx->h2, ctx->tunnel.stream_id, (size_t)nread);
	}

	result = proxy_h2_progress_egress(cf, data);
-	if(result && result != CURLE_AGAIN) {
+	if(result == CURLE_AGAIN) {
+	/* pending data to send, need to be called again. Ideally, we'd
+	* monitor the socket for POLLOUT, but we might not be in SENDING
+	* transfer state any longer and are unable to make this happen.
+	*/
+	CURL_TRC_CF(data, cf, "[%d] egress blocked, DRAIN",
+	ctx->tunnel.stream_id);
+	drain_tunnel(cf, data, &ctx->tunnel);
+	}
+	else if(result) {
	*err = result;
	nread = -1;
	}
@@ -1253,7 +1363,7 @@ out:
	* draining to avoid stalling when no socket events happen. */
	drain_tunnel(cf, data, &ctx->tunnel);
	}
-	CURL_TRC_CF(data, cf, "[h2sid=%u] cf_recv(len=%zu) -> %zd %d",
+	CURL_TRC_CF(data, cf, "[%d] cf_recv(len=%zu) -> %zd %d",
	ctx->tunnel.stream_id, len, nread, *err);
	CF_DATA_RESTORE(cf, save);
	return nread;
@@ -1295,6 +1405,7 @@ static ssize_t cf_h2_proxy_send(struct Curl_cfilter *cf,
	}
	nwritten = (ssize_t)ctx->tunnel.upload_blocked_len;
	ctx->tunnel.upload_blocked_len = 0;
+	*err = CURLE_OK;
	}
	else {
	nwritten = Curl_bufq_write(&ctx->tunnel.sendbuf, buf, len, err);
@@ -1352,7 +1463,7 @@ static ssize_t cf_h2_proxy_send(struct Curl_cfilter *cf,
	* proxy connection AND to UNHOLD all of them again when the
	* window increases.
	* We could iterate over all data on this conn maybe? */
-	CURL_TRC_CF(data, cf, "[h2sid=%d] remote flow "
+	CURL_TRC_CF(data, cf, "[%d] remote flow "
	"window is exhausted", ctx->tunnel.stream_id);
	}

@@ -1360,11 +1471,12 @@ static ssize_t cf_h2_proxy_send(struct Curl_cfilter *cf,
	* We have unwritten state that needs us being invoked again and EAGAIN
	* is the only way to ensure that. */
	ctx->tunnel.upload_blocked_len = nwritten;
-	CURL_TRC_CF(data, cf, "[h2sid=%d] cf_send(len=%zu) BLOCK: win %u/%zu "
+	CURL_TRC_CF(data, cf, "[%d] cf_send(len=%zu) BLOCK: win %u/%zu "
	"blocked_len=%zu",
	ctx->tunnel.stream_id, len,
	nghttp2_session_get_remote_window_size(ctx->h2), rwin,
	nwritten);
+	drain_tunnel(cf, data, &ctx->tunnel);
	*err = CURLE_AGAIN;
	nwritten = -1;
	goto out;
@@ -1377,14 +1489,20 @@ static ssize_t cf_h2_proxy_send(struct Curl_cfilter *cf,
	nwritten = -1;
	}
	else {
-	CURL_TRC_CF(data, cf, "send: nothing to do in this session");
+	CURL_TRC_CF(data, cf, "[0] send: nothing to do in this session");
	*err = CURLE_HTTP2;
	nwritten = -1;
	}
	}

	out:
-	CURL_TRC_CF(data, cf, "[h2sid=%d] cf_send(len=%zu) -> %zd, %d, "
+	if(!Curl_bufq_is_empty(&ctx->tunnel.recvbuf) &&
+	(nwritten >= 0 \|\| *err == CURLE_AGAIN)) {
+	/* data pending and no fatal error to report. Need to trigger
+	* draining to avoid stalling when no socket events happen. */
+	drain_tunnel(cf, data, &ctx->tunnel);
+	}
+	CURL_TRC_CF(data, cf, "[%d] cf_send(len=%zu) -> %zd, %d, "
	"h2 windows %d-%d (stream-conn), buffers %zu-%zu (stream-conn)",
	ctx->tunnel.stream_id, len, nwritten, *err,
	nghttp2_session_get_stream_remote_window_size(
@@ -1443,7 +1561,7 @@ static bool cf_h2_proxy_is_alive(struct Curl_cfilter *cf,

	CF_DATA_SAVE(save, cf, data);
	result = (ctx && ctx->h2 && proxy_h2_connisalive(cf, data, input_pending));
-	CURL_TRC_CF(data, cf, "conn alive -> %d, input_pending=%d",
+	CURL_TRC_CF(data, cf, "[0] conn alive -> %d, input_pending=%d",
	result, *input_pending);
	CF_DATA_RESTORE(cf, save);
	return result;

lib/cf-socket.c+45 -1

@@ -71,6 +71,7 @@
	#include "warnless.h"
	#include "conncache.h"
	#include "multihandle.h"
+	#include "rand.h"
	#include "share.h"
	#include "version_win32.h"

@@ -777,6 +778,10 @@ struct cf_socket_ctx {
	struct curltime connected_at; /* when socket connected/got first byte */
	struct curltime first_byte_at; /* when first byte was recvd */
	int error; /* errno of last failure or 0 */
+	#ifdef DEBUGBUILD
+	int wblock_percent; /* percent of writes doing EAGAIN */
+	int wpartial_percent; /* percent of bytes written in send */
+	#endif
	BIT(got_first_byte); /* if first byte was received */
	BIT(accepted); /* socket was accepted, not connected */
	BIT(active);
@@ -792,6 +797,22 @@ static void cf_socket_ctx_init(struct cf_socket_ctx *ctx,
	ctx->transport = transport;
	Curl_sock_assign_addr(&ctx->addr, ai, transport);
	Curl_bufq_init(&ctx->recvbuf, NW_RECV_CHUNK_SIZE, NW_RECV_CHUNKS);
+	#ifdef DEBUGBUILD
+	{
+	char *p = getenv("CURL_DBG_SOCK_WBLOCK");
+	if(p) {
+	long l = strtol(p, NULL, 10);
+	if(l >= 0 && l <= 100)
+	ctx->wblock_percent = (int)l;
+	}
+	p = getenv("CURL_DBG_SOCK_WPARTIAL");
+	if(p) {
+	long l = strtol(p, NULL, 10);
+	if(l >= 0 && l <= 100)
+	ctx->wpartial_percent = (int)l;
+	}
+	}
+	#endif
	}

	struct reader_ctx {
@@ -1253,11 +1274,34 @@ static ssize_t cf_socket_send(struct Curl_cfilter cf, struct Curl_easy data,
	struct cf_socket_ctx *ctx = cf->ctx;
	curl_socket_t fdsave;
	ssize_t nwritten;
+	size_t orig_len = len;

	*err = CURLE_OK;
	fdsave = cf->conn->sock[cf->sockindex];
	cf->conn->sock[cf->sockindex] = ctx->sock;

+	#ifdef DEBUGBUILD
+	/* simulate network blocking/partial writes */
+	if(ctx->wblock_percent > 0) {
+	unsigned char c;
+	Curl_rand(data, &c, 1);
+	if(c >= ((100-ctx->wblock_percent)*256/100)) {
+	CURL_TRC_CF(data, cf, "send(len=%zu) SIMULATE EWOULDBLOCK", orig_len);
+	*err = CURLE_AGAIN;
+	nwritten = -1;
+	cf->conn->sock[cf->sockindex] = fdsave;
+	return nwritten;
+	}
+	}
+	if(cf->cft != &Curl_cft_udp && ctx->wpartial_percent > 0 && len > 8) {
+	len = len * ctx->wpartial_percent / 100;
+	if(!len)
+	len = 1;
+	CURL_TRC_CF(data, cf, "send(len=%zu) SIMULATE partial write of %zu bytes",
+	orig_len, len);
+	}
+	#endif
+
	#if defined(MSG_FASTOPEN) && !defined(TCP_FASTOPEN_CONNECT) /* Linux */
	if(cf->conn->bits.tcp_fastopen) {
	nwritten = sendto(ctx->sock, buf, len, MSG_FASTOPEN,
@@ -1297,7 +1341,7 @@ static ssize_t cf_socket_send(struct Curl_cfilter cf, struct Curl_easy data,
	}

	CURL_TRC_CF(data, cf, "send(len=%zu) -> %d, err=%d",
-	len, (int)nwritten, *err);
+	orig_len, (int)nwritten, *err);
	cf->conn->sock[cf->sockindex] = fdsave;
	return nwritten;
	}

lib/http2.c+53 -23

@@ -187,6 +187,7 @@ struct stream_ctx {
	int status_code; /* HTTP response status code */
	uint32_t error; /* stream error code */
	uint32_t local_window_size; /* the local recv window size */
+	bool resp_hds_complete; /* we have a complete, final response */
	bool closed; /* TRUE on stream close */
	bool reset; /* TRUE on stream reset */
	bool close_handled; /* TRUE if stream closure is handled by libcurl */
@@ -1044,6 +1045,9 @@ static CURLcode on_stream_frame(struct Curl_cfilter *cf,
	if(result)
	return result;

+	if(stream->status_code / 100 != 1) {
+	stream->resp_hds_complete = TRUE;
+	}
	drain_stream(cf, data, stream);
	break;
	case NGHTTP2_PUSH_PROMISE:
@@ -1064,7 +1068,9 @@ static CURLcode on_stream_frame(struct Curl_cfilter *cf,
	break;
	case NGHTTP2_RST_STREAM:
	stream->closed = TRUE;
-	stream->reset = TRUE;
+	if(frame->rst_stream.error_code) {
+	stream->reset = TRUE;
+	}
	stream->send_closed = TRUE;
	data->req.keepon &= ~KEEP_SEND_HOLD;
	drain_stream(cf, data, stream);
@@ -1109,8 +1115,9 @@ static int fr_print(const nghttp2_frame frame, char buffer, size_t blen)
	}
	case NGHTTP2_RST_STREAM: {
	return msnprintf(buffer, blen,
-	"FRAME[RST_STREAM, len=%d, flags=%d]",
-	(int)frame->hd.length, frame->hd.flags);
+	"FRAME[RST_STREAM, len=%d, flags=%d, error=%u]",
+	(int)frame->hd.length, frame->hd.flags,
+	frame->rst_stream.error_code);
	}
	case NGHTTP2_SETTINGS: {
	if(frame->hd.flags & NGHTTP2_FLAG_ACK) {
@@ -1166,7 +1173,7 @@ static int on_frame_send(nghttp2_session session, const nghttp2_frame frame,
	if(data && Curl_trc_cf_is_verbose(cf, data)) {
	char buffer[256];
	int len;
-	len = fr_print(frame, buffer, (sizeof(buffer)/sizeof(buffer[0]))-1);
+	len = fr_print(frame, buffer, sizeof(buffer)-1);
	buffer[len] = 0;
	CURL_TRC_CF(data, cf, "[%d] -> %s", frame->hd.stream_id, buffer);
	}
@@ -1187,7 +1194,7 @@ static int on_frame_recv(nghttp2_session session, const nghttp2_frame frame,
	if(Curl_trc_cf_is_verbose(cf, data)) {
	char buffer[256];
	int len;
-	len = fr_print(frame, buffer, (sizeof(buffer)/sizeof(buffer[0]))-1);
+	len = fr_print(frame, buffer, sizeof(buffer)-1);
	buffer[len] = 0;
	CURL_TRC_CF(data, cf, "[%d] <- %s",frame->hd.stream_id, buffer);
	}
@@ -1975,7 +1982,14 @@ static ssize_t cf_h2_recv(struct Curl_cfilter cf, struct Curl_easy data,

	out:
	result = h2_progress_egress(cf, data);
-	if(result && result != CURLE_AGAIN) {
+	if(result == CURLE_AGAIN) {
+	/* pending data to send, need to be called again. Ideally, we'd
+	* monitor the socket for POLLOUT, but we might not be in SENDING
+	* transfer state any longer and are unable to make this happen.
+	*/
+	drain_stream(cf, data, stream);
+	}
+	else if(result) {
	*err = result;
	nread = -1;
	}
@@ -2151,27 +2165,17 @@ static ssize_t cf_h2_send(struct Curl_cfilter cf, struct Curl_easy data,
	int rv;
	ssize_t nwritten;
	CURLcode result;
-	int blocked = 0;
+	int blocked = 0, was_blocked = 0;

	CF_DATA_SAVE(save, cf, data);

	if(stream && stream->id != -1) {
-	if(stream->close_handled) {
-	infof(data, "stream %u closed", stream->id);
-	*err = CURLE_HTTP2_STREAM;
-	nwritten = -1;
-	goto out;
-	}
-	else if(stream->closed) {
-	nwritten = http2_handle_stream_close(cf, data, stream, err);
-	goto out;
-	}
-	else if(stream->upload_blocked_len) {
+	if(stream->upload_blocked_len) {
	/* the data in `buf` has already been submitted or added to the
	* buffers, but have been EAGAINed on the last invocation. */
	/* TODO: this assertion triggers in OSSFuzz runs and it is not
-	* clear why. Disable for now to let OSSFuzz continue its tests.
-	DEBUGASSERT(len >= stream->upload_blocked_len); */
+	* clear why. Disable for now to let OSSFuzz continue its tests. */
+	DEBUGASSERT(len >= stream->upload_blocked_len);
	if(len < stream->upload_blocked_len) {
	/* Did we get called again with a smaller `len`? This should not
	* happen. We are not prepared to handle that. */
@@ -2182,6 +2186,25 @@ static ssize_t cf_h2_send(struct Curl_cfilter cf, struct Curl_easy data,
	}
	nwritten = (ssize_t)stream->upload_blocked_len;
	stream->upload_blocked_len = 0;
+	was_blocked = 1;
+	}
+	else if(stream->closed) {
+	if(stream->resp_hds_complete) {
+	/* Server decided to close the stream after having sent us a findl
+	* response. This is valid if it is not interested in the request
+	* body. This happens on 30x or 40x responses.
+	* We silently discard the data sent, since this is not a transport
+	* error situation. */
+	CURL_TRC_CF(data, cf, "[%d] discarding data"
+	"on closed stream with response", stream->id);
+	*err = CURLE_OK;
+	nwritten = (ssize_t)len;
+	goto out;
+	}
+	infof(data, "stream %u closed", stream->id);
+	*err = CURLE_SEND_ERROR;
+	nwritten = -1;
+	goto out;
	}
	else {
	/* If stream_id != -1, we have dispatched request HEADERS and
@@ -2218,8 +2241,10 @@ static ssize_t cf_h2_send(struct Curl_cfilter cf, struct Curl_easy data,
	result = h2_progress_egress(cf, data);
	/* if the stream has been closed in egress handling (nghttp2 does that
	* when it does not like the headers, for example */
-	if(stream && stream->closed) {
-	nwritten = http2_handle_stream_close(cf, data, stream, err);
+	if(stream && stream->closed && !was_blocked) {
+	infof(data, "stream %u closed", stream->id);
+	*err = CURLE_SEND_ERROR;
+	nwritten = -1;
	goto out;
	}
	else if(result == CURLE_AGAIN) {
@@ -2367,8 +2392,12 @@ static CURLcode cf_h2_connect(struct Curl_cfilter *cf,
	if(result)
	goto out;

+	/* Send out our SETTINGS and ACKs and such. If that blocks, we
+	* have it buffered and can count this filter as being connected */
	result = h2_progress_egress(cf, data);
-	if(result)
+	if(result == CURLE_AGAIN)
+	result = CURLE_OK;
+	else if(result)
	goto out;

	*done = TRUE;
@@ -2376,6 +2405,7 @@ static CURLcode cf_h2_connect(struct Curl_cfilter *cf,
	result = CURLE_OK;

	out:
+	CURL_TRC_CF(data, cf, "cf_connect() -> %d, %d, ", result, *done);
	CF_DATA_RESTORE(cf, save);
	return result;
	}

lib/multi.c+6 -0

@@ -667,8 +667,14 @@ static CURLcode multi_done(struct Curl_easy *data,
	struct connectdata *conn = data->conn;
	unsigned int i;

+	#if defined(DEBUGBUILD) && !defined(CURL_DISABLE_VERBOSE_STRINGS)
+	DEBUGF(infof(data, "multi_done[%s]: status: %d prem: %d done: %d",
+	multi_statename[data->mstate],
+	(int)status, (int)premature, data->state.done));
+	#else
	DEBUGF(infof(data, "multi_done: status: %d prem: %d done: %d",
	(int)status, (int)premature, data->state.done));
+	#endif

	if(data->state.done)
	/* Stop if multi_done() has already been called */

lib/transfer.c+3 -3

@@ -431,6 +431,7 @@ static CURLcode readwrite_data(struct Curl_easy *data,
	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);

	*done = FALSE;
@@ -448,8 +449,7 @@ static CURLcode readwrite_data(struct Curl_easy *data,
	to ensure that http2_handle_stream_close is called when we read all
	incoming bytes for a particular stream. */
	bool is_http3 = Curl_conn_is_http3(data, conn, FIRSTSOCKET);
-	bool data_eof_handled = is_http3
-	\|\| Curl_conn_is_http2(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 */
@@ -761,7 +761,7 @@ static CURLcode readwrite_data(struct Curl_easy *data,
	}

	if(((k->keepon & (KEEP_RECV\|KEEP_SEND)) == KEEP_SEND) &&
-	conn->bits.close) {
+	(conn->bits.close \|\| data_eof_handled)) {
	/* When we've read the entire thing and the close bit is set, the server
	may now close the connection. If there's now any kind of sending going
	on from our side, we need to stop that immediately. */

lib/vquic/curl_ngtcp2.c+22 -2

@@ -1106,6 +1106,7 @@ static int cb_h3_stream_close(nghttp3_conn *conn, int64_t stream_id,
	else {
	CURL_TRC_CF(data, cf, "[%" PRId64 "] CLOSED", stream->id);
	}
+	data->req.keepon &= ~KEEP_SEND_HOLD;
	h3_drain_stream(cf, data);
	return 0;
	}
@@ -1785,6 +1786,18 @@ static ssize_t cf_ngtcp2_send(struct Curl_cfilter cf, struct Curl_easy data,
	stream->upload_blocked_len = 0;
	}
	else if(stream->closed) {
+	if(stream->resp_hds_complete) {
+	/* Server decided to close the stream after having sent us a final
+	* response. This is valid if it is not interested in the request
+	* body. This happens on 30x or 40x responses.
+	* We silently discard the data sent, since this is not a transport
+	* error situation. */
+	CURL_TRC_CF(data, cf, "[%" PRId64 "] discarding data"
+	"on closed stream with response", stream->id);
+	*err = CURLE_OK;
+	sent = (ssize_t)len;
+	goto out;
+	}
	*err = CURLE_HTTP3;
	sent = -1;
	goto out;
@@ -2245,9 +2258,16 @@ static CURLcode cf_ngtcp2_data_event(struct Curl_cfilter *cf,
	}
	break;
	}
-	case CF_CTRL_DATA_IDLE:
-	result = check_and_set_expiry(cf, data, NULL);
+	case CF_CTRL_DATA_IDLE: {
+	struct h3_stream_ctx *stream = H3_STREAM_CTX(data);
+	CURL_TRC_CF(data, cf, "data idle");
+	if(stream && !stream->closed) {
+	result = check_and_set_expiry(cf, data, NULL);
+	if(result)
+	CURL_TRC_CF(data, cf, "data idle, check_and_set_expiry -> %d", result);
+	}
	break;
+	}
	default:
	break;
	}

lib/vquic/curl_quiche.c+25 -4

@@ -565,6 +565,7 @@ static CURLcode h3_process_event(struct Curl_cfilter *cf,
	}
	stream->closed = TRUE;
	streamclose(cf->conn, "End of stream");
+	data->req.keepon &= ~KEEP_SEND_HOLD;
	break;

	case QUICHE_H3_EVENT_GOAWAY:
@@ -1082,6 +1083,22 @@ static ssize_t cf_quiche_send(struct Curl_cfilter cf, struct Curl_easy data,
	nwritten = -1;
	goto out;
	}
+	else if(nwritten == QUICHE_H3_TRANSPORT_ERR_INVALID_STREAM_STATE &&
+	stream->closed && stream->resp_hds_complete) {
+	/* sending request body on a stream that has been closed by the
+	* server. If the server has send us a final response, we should
+	* silently discard the send data.
+	* This happens for example on redirects where the server, instead
+	* of reading the full request body just closed the stream after
+	* sending the 30x response.
+	* This is sort of a race: had the transfer loop called recv first,
+	* it would see the response and stop/discard sending on its own- */
+	CURL_TRC_CF(data, cf, "[%" PRId64 "] discarding data"
+	"on closed stream with response", stream->id);
+	*err = CURLE_OK;
+	nwritten = (ssize_t)len;
+	goto out;
+	}
	else if(nwritten == QUICHE_H3_TRANSPORT_ERR_FINAL_SIZE) {
	CURL_TRC_CF(data, cf, "[%" PRId64 "] send_body(len=%zu) "
	"-> exceeds size", stream->id, len);
@@ -1213,11 +1230,15 @@ static CURLcode cf_quiche_data_event(struct Curl_cfilter *cf,
	}
	break;
	}
-	case CF_CTRL_DATA_IDLE:
-	result = cf_flush_egress(cf, data);
-	if(result)
-	CURL_TRC_CF(data, cf, "data idle, flush egress -> %d", result);
+	case CF_CTRL_DATA_IDLE: {
+	struct stream_ctx *stream = H3_STREAM_CTX(data);
+	if(stream && !stream->closed) {
+	result = cf_flush_egress(cf, data);
+	if(result)
+	CURL_TRC_CF(data, cf, "data idle, flush egress -> %d", result);
+	}
	break;
+	}
	default:
	break;
	}

lib/vquic/vquic.c+22 -0

@@ -47,6 +47,7 @@
	#include "curl_msh3.h"
	#include "curl_ngtcp2.h"
	#include "curl_quiche.h"
+	#include "rand.h"
	#include "vquic.h"
	#include "vquic_int.h"
	#include "strerror.h"
@@ -89,6 +90,16 @@ CURLcode vquic_ctx_init(struct cf_quic_ctx *qctx)
	#else
	qctx->no_gso = TRUE;
	#endif
+	#ifdef DEBUGBUILD
+	{
+	char *p = getenv("CURL_DBG_QUIC_WBLOCK");
+	if(p) {
+	long l = strtol(p, NULL, 10);
+	if(l >= 0 && l <= 100)
+	qctx->wblock_percent = (int)l;
+	}
+	}
+	#endif

	return CURLE_OK;
	}
@@ -231,6 +242,17 @@ static CURLcode vquic_send_packets(struct Curl_cfilter *cf,
	const uint8_t *pkt, size_t pktlen,
	size_t gsolen, size_t *psent)
	{
+	#ifdef DEBUGBUILD
+	/* simulate network blocking/partial writes */
+	if(qctx->wblock_percent > 0) {
+	unsigned char c;
+	Curl_rand(data, &c, 1);
+	if(c >= ((100-qctx->wblock_percent)*256/100)) {
+	CURL_TRC_CF(data, cf, "vquic_flush() simulate EWOULDBLOCK");
+	return CURLE_AGAIN;
+	}
+	}
+	#endif
	if(qctx->no_gso && pktlen > gsolen) {
	return send_packet_no_gso(cf, data, qctx, pkt, pktlen, gsolen, psent);
	}

lib/vquic/vquic_int.h+3 -0

@@ -41,6 +41,9 @@ struct cf_quic_ctx {
	size_t gsolen; /* length of individual packets in send buf */
	size_t split_len; /* if != 0, buffer length after which GSO differs */
	size_t split_gsolen; /* length of individual packets after split_len */
+	#ifdef DEBUGBUILD
+	int wblock_percent; /* percent of writes doing EAGAIN */
+	#endif
	bool no_gso; /* do not use gso on sending */
	};

lib/vtls/wolfssl.c+1 -1

@@ -295,7 +295,7 @@ static int bio_cf_out_write(WOLFSSL_BIO bio, const char buf, int blen)
	blen, nwritten, result);
	wolfSSL_BIO_clear_retry_flags(bio);
	if(nwritten < 0 && CURLE_AGAIN == result)
-	BIO_set_retry_read(bio);
+	BIO_set_retry_write(bio);
	return (int)nwritten;
	}

tests/http/test_01_basic.py+1 -1

@@ -81,6 +81,6 @@ class TestBasic:
	def test_01_05_h3_get(self, env: Env, httpd, nghttpx):
	curl = CurlClient(env=env)
	url = f'https://{env.domain1}:{env.h3_port}/data.json'
-	r = curl.http_get(url=url, extra_args=['--http3'])
+	r = curl.http_get(url=url, extra_args=['--http3-only'])
	r.check_response(http_status=200, protocol='HTTP/3')
	assert r.json['server'] == env.domain1

tests/http/test_02_download.py+3 -0

@@ -200,6 +200,7 @@ class TestDownload:
	])
	r.check_response(count=count, http_status=200)

+	@pytest.mark.skipif(condition=Env.slow_network, reason="not suitable for slow network tests")
	@pytest.mark.parametrize("proto", ['http/1.1', 'h2', 'h3'])
	def test_02_10_10MB_serial(self, env: Env,
	httpd, nghttpx, repeat, proto):
@@ -211,6 +212,7 @@ class TestDownload:
	r = curl.http_download(urls=[urln], alpn_proto=proto)
	r.check_response(count=count, http_status=200)

+	@pytest.mark.skipif(condition=Env.slow_network, reason="not suitable for slow network tests")
	@pytest.mark.parametrize("proto", ['h2', 'h3'])
	def test_02_11_10MB_parallel(self, env: Env,
	httpd, nghttpx, repeat, proto):
@@ -252,6 +254,7 @@ class TestDownload:
	])
	r.check_response(count=count, http_status=200)

+	@pytest.mark.skipif(condition=Env.slow_network, reason="not suitable for slow network tests")
	def test_02_20_h2_small_frames(self, env: Env, httpd, repeat):
	# Test case to reproduce content corruption as observed in
	# https://github.com/curl/curl/issues/10525

tests/http/test_04_stuttered.py+2 -0

@@ -25,6 +25,7 @@
	###########################################################################
	#
	import logging
+	import os
	from typing import Tuple, List, Dict
	import pytest

@@ -34,6 +35,7 @@ from testenv import Env, CurlClient
	log = logging.getLogger(__name__)


+	@pytest.mark.skipif(condition=Env.slow_network, reason="not suitable for slow network tests")
	class TestStuttered:

	@pytest.fixture(autouse=True, scope='class')

tests/http/test_07_upload.py+101 -13

@@ -42,6 +42,8 @@ class TestUpload:
	def _class_scope(self, env, httpd, nghttpx):
	if env.have_h3():
	nghttpx.start_if_needed()
+	env.make_data_file(indir=env.gen_dir, fname="data-63k", fsize=63*1024)
+	env.make_data_file(indir=env.gen_dir, fname="data-64k", fsize=64*1024)
	env.make_data_file(indir=env.gen_dir, fname="data-100k", fsize=100*1024)
	env.make_data_file(indir=env.gen_dir, fname="data-10m", fsize=1010241024)
	httpd.clear_extra_configs()
@@ -58,7 +60,7 @@ class TestUpload:
	curl = CurlClient(env=env)
	url = f'https://{env.authority_for(env.domain1, proto)}/curltest/echo?id=[0-0]'
	r = curl.http_upload(urls=[url], data=data, alpn_proto=proto)
-	r.check_response(count=1, http_status=200)
+	r.check_stats(count=1, http_status=200, exitcode=0)
	respdata = open(curl.response_file(0)).readlines()
	assert respdata == [data]

@@ -73,7 +75,7 @@ class TestUpload:
	curl = CurlClient(env=env)
	url = f'https://{env.authority_for(env.domain1, proto)}/curltest/echo?id=[0-0]'
	r = curl.http_upload(urls=[url], data=f'@{fdata}', alpn_proto=proto)
-	r.check_response(count=1, http_status=200)
+	r.check_stats(count=1, http_status=200, exitcode=0)
	indata = open(fdata).readlines()
	respdata = open(curl.response_file(0)).readlines()
	assert respdata == indata
@@ -90,7 +92,7 @@ class TestUpload:
	curl = CurlClient(env=env)
	url = f'https://{env.authority_for(env.domain1, proto)}/curltest/echo?id=[0-{count-1}]'
	r = curl.http_upload(urls=[url], data=data, alpn_proto=proto)
-	r.check_response(count=count, http_status=200)
+	r.check_stats(count=count, http_status=200, exitcode=0)
	for i in range(count):
	respdata = open(curl.response_file(i)).readlines()
	assert respdata == [data]
@@ -109,14 +111,14 @@ class TestUpload:
	url = f'https://{env.authority_for(env.domain1, proto)}/curltest/echo?id=[0-{count-1}]'
	r = curl.http_upload(urls=[url], data=data, alpn_proto=proto,
	extra_args=['--parallel'])
-	r.check_response(count=count, http_status=200)
+	r.check_stats(count=count, http_status=200, exitcode=0)
	for i in range(count):
	respdata = open(curl.response_file(i)).readlines()
	assert respdata == [data]

	# upload large data sequentially, check that this is what was echoed
	@pytest.mark.parametrize("proto", ['http/1.1', 'h2', 'h3'])
-	def test_07_20_upload_seq_large(self, env: Env, httpd, nghttpx, repeat, proto):
+	def test_07_12_upload_seq_large(self, env: Env, httpd, nghttpx, repeat, proto):
	if proto == 'h3' and not env.have_h3():
	pytest.skip("h3 not supported")
	if proto == 'h3' and env.curl_uses_lib('msh3'):
@@ -128,14 +130,14 @@ class TestUpload:
	r = curl.http_upload(urls=[url], data=f'@{fdata}', alpn_proto=proto)
	r.check_response(count=count, http_status=200)
	indata = open(fdata).readlines()
-	r.check_response(count=count, http_status=200)
+	r.check_stats(count=count, http_status=200, exitcode=0)
	for i in range(count):
	respdata = open(curl.response_file(i)).readlines()
	assert respdata == indata

	# upload very large data sequentially, check that this is what was echoed
	@pytest.mark.parametrize("proto", ['http/1.1', 'h2', 'h3'])
-	def test_07_12_upload_seq_large(self, env: Env, httpd, nghttpx, repeat, proto):
+	def test_07_13_upload_seq_large(self, env: Env, httpd, nghttpx, repeat, proto):
	if proto == 'h3' and not env.have_h3():
	pytest.skip("h3 not supported")
	if proto == 'h3' and env.curl_uses_lib('msh3'):
@@ -145,7 +147,7 @@ class TestUpload:
	curl = CurlClient(env=env)
	url = f'https://{env.authority_for(env.domain1, proto)}/curltest/echo?id=[0-{count-1}]'
	r = curl.http_upload(urls=[url], data=f'@{fdata}', alpn_proto=proto)
-	r.check_response(count=count, http_status=200)
+	r.check_stats(count=count, http_status=200, exitcode=0)
	indata = open(fdata).readlines()
	for i in range(count):
	respdata = open(curl.response_file(i)).readlines()
@@ -165,7 +167,7 @@ class TestUpload:
	url = f'https://{env.authority_for(env.domain1, proto)}/curltest/echo?id=[0-{count-1}]'
	r = curl.http_upload(urls=[url], data=data, alpn_proto=proto,
	extra_args=['--parallel'])
-	r.check_response(count=count, http_status=200)
+	r.check_stats(count=count, http_status=200, exitcode=0)
	for i in range(count):
	respdata = open(curl.response_file(i)).readlines()
	assert respdata == [data]
@@ -200,7 +202,7 @@ class TestUpload:
	url = f'https://{env.authority_for(env.domain1, proto)}/curltest/put?id=[0-{count-1}]'
	r = curl.http_put(urls=[url], fdata=fdata, alpn_proto=proto,
	extra_args=['--parallel'])
-	r.check_response(count=count, http_status=200)
+	r.check_stats(count=count, http_status=200, exitcode=0)
	exp_data = [f'{os.path.getsize(fdata)}']
	r.check_response(count=count, http_status=200)
	for i in range(count):
@@ -220,7 +222,7 @@ class TestUpload:
	url = f'https://{env.authority_for(env.domain1, proto)}/curltest/put?id=[0-{count-1}]&chunk_delay=10ms'
	r = curl.http_put(urls=[url], fdata=fdata, alpn_proto=proto,
	extra_args=['--parallel'])
-	r.check_response(count=count, http_status=200)
+	r.check_stats(count=count, http_status=200, exitcode=0)
	exp_data = [f'{os.path.getsize(fdata)}']
	r.check_response(count=count, http_status=200)
	for i in range(count):
@@ -239,7 +241,7 @@ class TestUpload:
	curl = CurlClient(env=env)
	url = f'https://{env.authority_for(env.domain1, proto)}/curltest/put?id=[0-{count-1}]'
	r = curl.http_put(urls=[url], fdata=fdata, alpn_proto=proto)
-	r.check_response(count=count, http_status=200)
+	r.check_stats(count=count, http_status=200, exitcode=0)

	# issue #11157, upload that is 404'ed by server, needs to terminate
	# correctly and not time out on sending
@@ -272,6 +274,7 @@ class TestUpload:
	url = f'https://{env.authority_for(env.domain1, proto)}/curltest/put?chunk_delay=2ms'
	curl = CurlClient(env=env)
	r = curl.run_direct(with_stats=True, args=[
+	'--verbose', '--trace-config', 'ids,time',
	'--resolve', f'{env.authority_for(env.domain1, proto)}:127.0.0.1',
	'--cacert', env.ca.cert_file,
	'--request', 'PUT',
@@ -293,7 +296,7 @@ class TestUpload:
	url = f'https://{env.authority_for(env.domain1, proto)}/curltest/put'
	curl = CurlClient(env=env)
	r = curl.run_direct(with_stats=True, args=[
-	'--verbose',
+	'--verbose', '--trace-config', 'ids,time',
	'--resolve', f'{env.authority_for(env.domain1, proto)}:127.0.0.1',
	'--cacert', env.ca.cert_file,
	'--request', 'PUT',
@@ -319,6 +322,91 @@ class TestUpload:
	respdata = open(curl.response_file(0)).readlines()
	assert respdata == indata

+	# upload to a 301,302,303 response
+	@pytest.mark.parametrize("redir", ['301', '302', '303'])
+	@pytest.mark.parametrize("proto", ['http/1.1', 'h2', 'h3'])
+	def test_07_36_upload_30x(self, env: Env, httpd, nghttpx, repeat, redir, proto):
+	if proto == 'h3' and not env.have_h3():
+	pytest.skip("h3 not supported")
+	if proto == 'h3' and env.curl_uses_lib('msh3'):
+	pytest.skip("msh3 fails here")
+	data = '0123456789' * 10
+	curl = CurlClient(env=env)
+	url = f'https://{env.authority_for(env.domain1, proto)}/curltest/echo{redir}?id=[0-0]'
+	r = curl.http_upload(urls=[url], data=data, alpn_proto=proto, extra_args=[
+	'-L', '--trace-config', 'http/2,http/3'
+	])
+	r.check_response(count=1, http_status=200)
+	respdata = open(curl.response_file(0)).readlines()
+	assert respdata == [] # was transformed to a GET
+
+	# upload to a 307 response
+	@pytest.mark.parametrize("proto", ['http/1.1', 'h2', 'h3'])
+	def test_07_37_upload_307(self, env: Env, httpd, nghttpx, repeat, proto):
+	if proto == 'h3' and not env.have_h3():
+	pytest.skip("h3 not supported")
+	if proto == 'h3' and env.curl_uses_lib('msh3'):
+	pytest.skip("msh3 fails here")
+	data = '0123456789' * 10
+	curl = CurlClient(env=env)
+	url = f'https://{env.authority_for(env.domain1, proto)}/curltest/echo307?id=[0-0]'
+	r = curl.http_upload(urls=[url], data=data, alpn_proto=proto, extra_args=[
+	'-L', '--trace-config', 'http/2,http/3'
+	])
+	r.check_response(count=1, http_status=200)
+	respdata = open(curl.response_file(0)).readlines()
+	assert respdata == [data] # was POST again
+
+	# POST form data, yet another code path in transfer
+	@pytest.mark.parametrize("proto", ['http/1.1', 'h2', 'h3'])
+	def test_07_38_form_small(self, env: Env, httpd, nghttpx, repeat, proto):
+	if proto == 'h3' and not env.have_h3():
+	pytest.skip("h3 not supported")
+	if proto == 'h3' and env.curl_uses_lib('msh3'):
+	pytest.skip("msh3 fails here")
+	curl = CurlClient(env=env)
+	url = f'https://{env.authority_for(env.domain1, proto)}/curltest/echo?id=[0-0]'
+	r = curl.http_form(urls=[url], alpn_proto=proto, form={
+	'name1': 'value1',
+	})
+	r.check_stats(count=1, http_status=200, exitcode=0)
+
+	# POST data urlencoded, small enough to be sent with request headers
+	@pytest.mark.parametrize("proto", ['http/1.1', 'h2', 'h3'])
+	def test_07_39_post_urlenc_small(self, env: Env, httpd, nghttpx, repeat, proto):
+	if proto == 'h3' and not env.have_h3():
+	pytest.skip("h3 not supported")
+	if proto == 'h3' and env.curl_uses_lib('msh3'):
+	pytest.skip("msh3 fails here")
+	fdata = os.path.join(env.gen_dir, 'data-63k')
+	curl = CurlClient(env=env)
+	url = f'https://{env.authority_for(env.domain1, proto)}/curltest/echo?id=[0-0]'
+	r = curl.http_upload(urls=[url], data=f'@{fdata}', alpn_proto=proto, extra_args=[
+	'--trace-config', 'http/2,http/3'
+	])
+	r.check_stats(count=1, http_status=200, exitcode=0)
+	indata = open(fdata).readlines()
+	respdata = open(curl.response_file(0)).readlines()
+	assert respdata == indata
+
+	# POST data urlencoded, large enough to be sent separate from request headers
+	@pytest.mark.parametrize("proto", ['http/1.1', 'h2', 'h3'])
+	def test_07_40_post_urlenc_large(self, env: Env, httpd, nghttpx, repeat, proto):
+	if proto == 'h3' and not env.have_h3():
+	pytest.skip("h3 not supported")
+	if proto == 'h3' and env.curl_uses_lib('msh3'):
+	pytest.skip("msh3 fails here")
+	fdata = os.path.join(env.gen_dir, 'data-64k')
+	curl = CurlClient(env=env)
+	url = f'https://{env.authority_for(env.domain1, proto)}/curltest/echo?id=[0-0]'
+	r = curl.http_upload(urls=[url], data=f'@{fdata}', alpn_proto=proto, extra_args=[
+	'--trace-config', 'http/2,http/3'
+	])
+	r.check_stats(count=1, http_status=200, exitcode=0)
+	indata = open(fdata).readlines()
+	respdata = open(curl.response_file(0)).readlines()
+	assert respdata == indata
+
	def check_download(self, count, srcfile, curl):
	for i in range(count):
	dfile = curl.download_file(i)

tests/http/test_07_upload.py.orig+366 -0

@@ -0,0 +1,366 @@
+	#!/usr/bin/env python3
+	# -- coding: utf-8 --
+	#***************************************************************************
+	# _ _ ____ _
+	# Project ___\| \| \| \| _ \\| \|
+	# / __\| \| \| \| \|_) \| \|
+	# \| (__\| \|_\| \| _ <\| \|___
+	# \___\|\___/\|_\| \_\_____\|
+	#
+	# Copyright (C) Daniel Stenberg, <[email protected]>, et al.
+	#
+	# This software is licensed as described in the file COPYING, which
+	# you should have received as part of this distribution. The terms
+	# are also available at https://curl.se/docs/copyright.html.
+	#
+	# You may opt to use, copy, modify, merge, publish, distribute and/or sell
+	# copies of the Software, and permit persons to whom the Software is
+	# furnished to do so, under the terms of the COPYING file.
+	#
+	# This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+	# KIND, either express or implied.
+	#
+	# SPDX-License-Identifier: curl
+	#
+	###########################################################################
+	#
+	import difflib
+	import filecmp
+	import logging
+	import os
+	import pytest
+
+	from testenv import Env, CurlClient
+
+
+	log = logging.getLogger(__name__)
+
+
+	class TestUpload:
+
+	@pytest.fixture(autouse=True, scope='class')
+	def _class_scope(self, env, httpd, nghttpx):
+	if env.have_h3():
+	nghttpx.start_if_needed()
+	env.make_data_file(indir=env.gen_dir, fname="data-63k", fsize=63*1024)
+	env.make_data_file(indir=env.gen_dir, fname="data-64k", fsize=64*1024)
+	env.make_data_file(indir=env.gen_dir, fname="data-100k", fsize=100*1024)
+	env.make_data_file(indir=env.gen_dir, fname="data-10m", fsize=1010241024)
+	httpd.clear_extra_configs()
+	httpd.reload()
+
+	# upload small data, check that this is what was echoed
+	@pytest.mark.parametrize("proto", ['http/1.1', 'h2', 'h3'])
+	def test_07_01_upload_1_small(self, env: Env, httpd, nghttpx, repeat, proto):
+	if proto == 'h3' and not env.have_h3():
+	pytest.skip("h3 not supported")
+	if proto == 'h3' and env.curl_uses_lib('msh3'):
+	pytest.skip("msh3 fails here")
+	data = '0123456789'
+	curl = CurlClient(env=env)
+	url = f'https://{env.authority_for(env.domain1, proto)}/curltest/echo?id=[0-0]'
+	r = curl.http_upload(urls=[url], data=data, alpn_proto=proto)
+	r.check_stats(count=1, http_status=200, exitcode=0)
+	respdata = open(curl.response_file(0)).readlines()
+	assert respdata == [data]
+
+	# upload large data, check that this is what was echoed
+	@pytest.mark.parametrize("proto", ['http/1.1', 'h2', 'h3'])
+	def test_07_02_upload_1_large(self, env: Env, httpd, nghttpx, repeat, proto):
+	if proto == 'h3' and not env.have_h3():
+	pytest.skip("h3 not supported")
+	if proto == 'h3' and env.curl_uses_lib('msh3'):
+	pytest.skip("msh3 fails here")
+	fdata = os.path.join(env.gen_dir, 'data-100k')
+	curl = CurlClient(env=env)
+	url = f'https://{env.authority_for(env.domain1, proto)}/curltest/echo?id=[0-0]'
+	r = curl.http_upload(urls=[url], data=f'@{fdata}', alpn_proto=proto)
+	r.check_stats(count=1, http_status=200, exitcode=0)
+	indata = open(fdata).readlines()
+	respdata = open(curl.response_file(0)).readlines()
+	assert respdata == indata
+
+	# upload data sequentially, check that they were echoed
+	@pytest.mark.parametrize("proto", ['http/1.1', 'h2', 'h3'])
+	def test_07_10_upload_sequential(self, env: Env, httpd, nghttpx, repeat, proto):
+	if proto == 'h3' and not env.have_h3():
+	pytest.skip("h3 not supported")
+	if proto == 'h3' and env.curl_uses_lib('msh3'):
+	pytest.skip("msh3 stalls here")
+	count = 50
+	data = '0123456789'
+	curl = CurlClient(env=env)
+	url = f'https://{env.authority_for(env.domain1, proto)}/curltest/echo?id=[0-{count-1}]'
+	r = curl.http_upload(urls=[url], data=data, alpn_proto=proto)
+	r.check_stats(count=count, http_status=200, exitcode=0)
+	for i in range(count):
+	respdata = open(curl.response_file(i)).readlines()
+	assert respdata == [data]
+
+	# upload data parallel, check that they were echoed
+	@pytest.mark.parametrize("proto", ['h2', 'h3'])
+	def test_07_11_upload_parallel(self, env: Env, httpd, nghttpx, repeat, proto):
+	if proto == 'h3' and not env.have_h3():
+	pytest.skip("h3 not supported")
+	if proto == 'h3' and env.curl_uses_lib('msh3'):
+	pytest.skip("msh3 stalls here")
+	# limit since we use a separate connection in h1
+	count = 50
+	data = '0123456789'
+	curl = CurlClient(env=env)
+	url = f'https://{env.authority_for(env.domain1, proto)}/curltest/echo?id=[0-{count-1}]'
+	r = curl.http_upload(urls=[url], data=data, alpn_proto=proto,
+	extra_args=['--parallel'])
+	r.check_stats(count=count, http_status=200, exitcode=0)
+	for i in range(count):
+	respdata = open(curl.response_file(i)).readlines()
+	assert respdata == [data]
+
+	# upload large data sequentially, check that this is what was echoed
+	@pytest.mark.parametrize("proto", ['http/1.1', 'h2', 'h3'])
+	def test_07_20_upload_seq_large(self, env: Env, httpd, nghttpx, repeat, proto):
+	if proto == 'h3' and not env.have_h3():
+	pytest.skip("h3 not supported")
+	if proto == 'h3' and env.curl_uses_lib('msh3'):
+	pytest.skip("msh3 stalls here")
+	fdata = os.path.join(env.gen_dir, 'data-100k')
+	count = 50
+	curl = CurlClient(env=env)
+	url = f'https://{env.authority_for(env.domain1, proto)}/curltest/echo?id=[0-{count-1}]'
+	r = curl.http_upload(urls=[url], data=f'@{fdata}', alpn_proto=proto)
+	r.check_response(count=count, http_status=200)
+	indata = open(fdata).readlines()
+	r.check_stats(count=count, http_status=200, exitcode=0)
+	for i in range(count):
+	respdata = open(curl.response_file(i)).readlines()
+	assert respdata == indata
+
+	# upload very large data sequentially, check that this is what was echoed
+	@pytest.mark.parametrize("proto", ['http/1.1', 'h2', 'h3'])
+	def test_07_12_upload_seq_large(self, env: Env, httpd, nghttpx, repeat, proto):
+	if proto == 'h3' and not env.have_h3():
+	pytest.skip("h3 not supported")
+	if proto == 'h3' and env.curl_uses_lib('msh3'):
+	pytest.skip("msh3 stalls here")
+	fdata = os.path.join(env.gen_dir, 'data-10m')
+	count = 2
+	curl = CurlClient(env=env)
+	url = f'https://{env.authority_for(env.domain1, proto)}/curltest/echo?id=[0-{count-1}]'
+	r = curl.http_upload(urls=[url], data=f'@{fdata}', alpn_proto=proto)
+	r.check_stats(count=count, http_status=200, exitcode=0)
+	indata = open(fdata).readlines()
+	for i in range(count):
+	respdata = open(curl.response_file(i)).readlines()
+	assert respdata == indata
+
+	# upload data parallel, check that they were echoed
+	@pytest.mark.parametrize("proto", ['h2', 'h3'])
+	def test_07_20_upload_parallel(self, env: Env, httpd, nghttpx, repeat, proto):
+	if proto == 'h3' and not env.have_h3():
+	pytest.skip("h3 not supported")
+	if proto == 'h3' and env.curl_uses_lib('msh3'):
+	pytest.skip("msh3 stalls here")
+	# limit since we use a separate connection in h1
+	count = 50
+	data = '0123456789'
+	curl = CurlClient(env=env)
+	url = f'https://{env.authority_for(env.domain1, proto)}/curltest/echo?id=[0-{count-1}]'
+	r = curl.http_upload(urls=[url], data=data, alpn_proto=proto,
+	extra_args=['--parallel'])
+	r.check_stats(count=count, http_status=200, exitcode=0)
+	for i in range(count):
+	respdata = open(curl.response_file(i)).readlines()
+	assert respdata == [data]
+
+	# upload large data parallel, check that this is what was echoed
+	@pytest.mark.parametrize("proto", ['h2', 'h3'])
+	def test_07_21_upload_parallel_large(self, env: Env, httpd, nghttpx, repeat, proto):
+	if proto == 'h3' and not env.have_h3():
+	pytest.skip("h3 not supported")
+	if proto == 'h3' and env.curl_uses_lib('msh3'):
+	pytest.skip("msh3 stalls here")
+	fdata = os.path.join(env.gen_dir, 'data-100k')
+	# limit since we use a separate connection in h1
+	count = 50
+	curl = CurlClient(env=env)
+	url = f'https://{env.authority_for(env.domain1, proto)}/curltest/echo?id=[0-{count-1}]'
+	r = curl.http_upload(urls=[url], data=f'@{fdata}', alpn_proto=proto,
+	extra_args=['--parallel'])
+	r.check_response(count=count, http_status=200)
+	self.check_download(count, fdata, curl)
+
+	# PUT 100k
+	@pytest.mark.parametrize("proto", ['http/1.1', 'h2', 'h3'])
+	def test_07_30_put_100k(self, env: Env, httpd, nghttpx, repeat, proto):
+	if proto == 'h3' and not env.have_h3():
+	pytest.skip("h3 not supported")
+	if proto == 'h3' and env.curl_uses_lib('msh3'):
+	pytest.skip("msh3 fails here")
+	fdata = os.path.join(env.gen_dir, 'data-100k')
+	count = 1
+	curl = CurlClient(env=env)
+	url = f'https://{env.authority_for(env.domain1, proto)}/curltest/put?id=[0-{count-1}]'
+	r = curl.http_put(urls=[url], fdata=fdata, alpn_proto=proto,
+	extra_args=['--parallel'])
+	r.check_stats(count=count, http_status=200, exitcode=0)
+	exp_data = [f'{os.path.getsize(fdata)}']
+	r.check_response(count=count, http_status=200)
+	for i in range(count):
+	respdata = open(curl.response_file(i)).readlines()
+	assert respdata == exp_data
+
+	# PUT 10m
+	@pytest.mark.parametrize("proto", ['http/1.1', 'h2', 'h3'])
+	def test_07_31_put_10m(self, env: Env, httpd, nghttpx, repeat, proto):
+	if proto == 'h3' and not env.have_h3():
+	pytest.skip("h3 not supported")
+	if proto == 'h3' and env.curl_uses_lib('msh3'):
+	pytest.skip("msh3 fails here")
+	fdata = os.path.join(env.gen_dir, 'data-10m')
+	count = 1
+	curl = CurlClient(env=env)
+	url = f'https://{env.authority_for(env.domain1, proto)}/curltest/put?id=[0-{count-1}]&chunk_delay=10ms'
+	r = curl.http_put(urls=[url], fdata=fdata, alpn_proto=proto,
+	extra_args=['--parallel'])
+	r.check_stats(count=count, http_status=200, exitcode=0)
+	exp_data = [f'{os.path.getsize(fdata)}']
+	r.check_response(count=count, http_status=200)
+	for i in range(count):
+	respdata = open(curl.response_file(i)).readlines()
+	assert respdata == exp_data
+
+	# issue #10591
+	@pytest.mark.parametrize("proto", ['http/1.1', 'h2', 'h3'])
+	def test_07_32_issue_10591(self, env: Env, httpd, nghttpx, repeat, proto):
+	if proto == 'h3' and not env.have_h3():
+	pytest.skip("h3 not supported")
+	if proto == 'h3' and env.curl_uses_lib('msh3'):
+	pytest.skip("msh3 fails here")
+	fdata = os.path.join(env.gen_dir, 'data-10m')
+	count = 1
+	curl = CurlClient(env=env)
+	url = f'https://{env.authority_for(env.domain1, proto)}/curltest/put?id=[0-{count-1}]'
+	r = curl.http_put(urls=[url], fdata=fdata, alpn_proto=proto)
+	r.check_stats(count=count, http_status=200, exitcode=0)
+
+	# issue #11157, upload that is 404'ed by server, needs to terminate
+	# correctly and not time out on sending
+	def test_07_33_issue_11157a(self, env: Env, httpd, nghttpx, repeat):
+	proto = 'h2'
+	fdata = os.path.join(env.gen_dir, 'data-10m')
+	# send a POST to our PUT handler which will send immediately a 404 back
+	url = f'https://{env.authority_for(env.domain1, proto)}/curltest/put'
+	curl = CurlClient(env=env)
+	r = curl.run_direct(with_stats=True, args=[
+	'--resolve', f'{env.authority_for(env.domain1, proto)}:127.0.0.1',
+	'--cacert', env.ca.cert_file,
+	'--request', 'POST',
+	'--max-time', '5', '-v',
+	'--url', url,
+	'--form', 'idList=12345678',
+	'--form', 'pos=top',
+	'--form', 'name=mr_test',
+	'--form', f'fileSource=@{fdata};type=application/pdf',
+	])
+	assert r.exit_code == 0, f'{r}'
+	r.check_stats(1, 404)
+
+	# issue #11157, send upload that is slowly read in
+	def test_07_33_issue_11157b(self, env: Env, httpd, nghttpx, repeat):
+	proto = 'h2'
+	fdata = os.path.join(env.gen_dir, 'data-10m')
+	# tell our test PUT handler to read the upload more slowly, so
+	# that the send buffering and transfer loop needs to wait
+	url = f'https://{env.authority_for(env.domain1, proto)}/curltest/put?chunk_delay=2ms'
+	curl = CurlClient(env=env)
+	r = curl.run_direct(with_stats=True, args=[
+	'--resolve', f'{env.authority_for(env.domain1, proto)}:127.0.0.1',
+	'--cacert', env.ca.cert_file,
+	'--request', 'PUT',
+	'--max-time', '10', '-v',
+	'--url', url,
+	'--form', 'idList=12345678',
+	'--form', 'pos=top',
+	'--form', 'name=mr_test',
+	'--form', f'fileSource=@{fdata};type=application/pdf',
+	])
+	assert r.exit_code == 0, r.dump_logs()
+	r.check_stats(1, 200)
+
+	def test_07_34_issue_11194(self, env: Env, httpd, nghttpx, repeat):
+	proto = 'h2'
+	fdata = os.path.join(env.gen_dir, 'data-10m')
+	# tell our test PUT handler to read the upload more slowly, so
+	# that the send buffering and transfer loop needs to wait
+	fdata = os.path.join(env.gen_dir, 'data-100k')
+	url = f'https://{env.authority_for(env.domain1, proto)}/curltest/put'
+	curl = CurlClient(env=env)
+	r = curl.run_direct(with_stats=True, args=[
+	'--verbose',
+	'--resolve', f'{env.authority_for(env.domain1, proto)}:127.0.0.1',
+	'--cacert', env.ca.cert_file,
+	'--request', 'PUT',
+	'--digest', '--user', 'test:test',
+	'--data-binary', f'@{fdata}'
+	'--url', url,
+	])
+	assert r.exit_code == 0, r.dump_logs()
+	r.check_stats(1, 200)
+
+	# upload large data on a h1 to h2 upgrade
+	def test_07_35_h1_h2_upgrade_upload(self, env: Env, httpd, nghttpx, repeat):
+	fdata = os.path.join(env.gen_dir, 'data-100k')
+	curl = CurlClient(env=env)
+	url = f'http://{env.domain1}:{env.http_port}/curltest/echo?id=[0-0]'
+	r = curl.http_upload(urls=[url], data=f'@{fdata}', extra_args=[
+	'--http2'
+	])
+	r.check_response(count=1, http_status=200)
+	# apache does not Upgrade on request with a body
+	assert r.stats[0]['http_version'] == '1.1', f'{r}'
+	indata = open(fdata).readlines()
+	respdata = open(curl.response_file(0)).readlines()
+	assert respdata == indata
+
+	# POST form data, yet another code path in transfer
+	@pytest.mark.parametrize("proto", ['http/1.1', 'h2', 'h3'])
+	def test_07_40_form_small(self, env: Env, httpd, nghttpx, repeat, proto):
+	if proto == 'h3' and not env.have_h3():
+	pytest.skip("h3 not supported")
+	if proto == 'h3' and env.curl_uses_lib('msh3'):
+	pytest.skip("msh3 fails here")
+	curl = CurlClient(env=env)
+	url = f'https://{env.authority_for(env.domain1, proto)}/curltest/echo?id=[0-0]'
+	r = curl.http_form(urls=[url], alpn_proto=proto, form={
+	'name1': 'value1',
+	})
+	r.check_stats(count=1, http_status=200, exitcode=0)
+
+	# POST data urlencoded, just as large to be still written together
+	# with the request headers
+	@pytest.mark.parametrize("proto", ['http/1.1', 'h2', 'h3'])
+	def test_07_41_upload_small(self, env: Env, httpd, nghttpx, repeat, proto):
+	if proto == 'h3' and not env.have_h3():
+	pytest.skip("h3 not supported")
+	if proto == 'h3' and env.curl_uses_lib('msh3'):
+	pytest.skip("msh3 fails here")
+	fdata = os.path.join(env.gen_dir, 'data-63k')
+	curl = CurlClient(env=env)
+	url = f'https://{env.authority_for(env.domain1, proto)}/curltest/echo?id=[0-0]'
+	r = curl.http_upload(urls=[url], data=f'@{fdata}', alpn_proto=proto)
+	r.check_stats(count=1, http_status=200, exitcode=0)
+	indata = open(fdata).readlines()
+	respdata = open(curl.response_file(0)).readlines()
+	assert respdata == indata
+
+	def check_download(self, count, srcfile, curl):
+	for i in range(count):
+	dfile = curl.download_file(i)
+	assert os.path.exists(dfile)
+	if not filecmp.cmp(srcfile, dfile, shallow=False):
+	diff = "".join(difflib.unified_diff(a=open(srcfile).readlines(),
+	b=open(dfile).readlines(),
+	fromfile=srcfile,
+	tofile=dfile,
+	n=1))
+	assert False, f'download {dfile} differs:\n{diff}'

tests/http/test_08_caddy.py+3 -0

@@ -110,6 +110,7 @@ class TestCaddy:
	assert r.total_connects == 1, r.dump_logs()

	# download 5MB files sequentially
+	@pytest.mark.skipif(condition=Env.slow_network, reason="not suitable for slow network tests")
	@pytest.mark.parametrize("proto", ['h2', 'h3'])
	def test_08_04a_download_10mb_sequential(self, env: Env, caddy: Caddy,
	repeat, proto):
@@ -124,6 +125,7 @@ class TestCaddy:
	r.check_response(count=count, http_status=200, connect_count=1)

	# download 10MB files sequentially
+	@pytest.mark.skipif(condition=Env.slow_network, reason="not suitable for slow network tests")
	@pytest.mark.parametrize("proto", ['h2', 'h3'])
	def test_08_04b_download_10mb_sequential(self, env: Env, caddy: Caddy,
	repeat, proto):
@@ -138,6 +140,7 @@ class TestCaddy:
	r.check_response(count=count, http_status=200, connect_count=1)

	# download 10MB files parallel
+	@pytest.mark.skipif(condition=Env.slow_network, reason="not suitable for slow network tests")
	@pytest.mark.parametrize("proto", ['http/1.1', 'h2', 'h3'])
	def test_08_05_download_1mb_parallel(self, env: Env, caddy: Caddy,
	repeat, proto):

tests/http/test_10_proxy.py+3 -4

@@ -139,7 +139,6 @@ class TestProxy:
	url = f'https://localhost:{env.https_port}/data.json'
	xargs = curl.get_proxy_args(proxys=False, tunnel=True)
	r = curl.http_download(urls=[url], alpn_proto=proto, with_stats=True,
-	with_headers=True,
	extra_args=xargs)
	r.check_response(count=1, http_status=200,
	protocol='HTTP/2' if proto == 'h2' else 'HTTP/1.1')
@@ -157,7 +156,7 @@ class TestProxy:
	url = f'https://localhost:{env.https_port}/data.json?[0-0]'
	xargs = curl.get_proxy_args(tunnel=True, proto=tunnel)
	r = curl.http_download(urls=[url], alpn_proto=proto, with_stats=True,
-	with_headers=True, extra_args=xargs)
+	extra_args=xargs)
	r.check_response(count=1, http_status=200,
	protocol='HTTP/2' if proto == 'h2' else 'HTTP/1.1')
	assert self.get_tunnel_proto_used(r) == 'HTTP/2' \
@@ -185,7 +184,7 @@ class TestProxy:
	url = f'https://localhost:{env.https_port}/{fname}?[0-{count-1}]'
	xargs = curl.get_proxy_args(tunnel=True, proto=tunnel)
	r = curl.http_download(urls=[url], alpn_proto=proto, with_stats=True,
-	with_headers=True, extra_args=xargs)
+	extra_args=xargs)
	r.check_response(count=count, http_status=200,
	protocol='HTTP/2' if proto == 'h2' else 'HTTP/1.1')
	assert self.get_tunnel_proto_used(r) == 'HTTP/2' \
@@ -237,7 +236,7 @@ class TestProxy:
	url2 = f'http://localhost:{env.http_port}/data.json'
	xargs = curl.get_proxy_args(tunnel=True, proto=tunnel)
	r = curl.http_download(urls=[url1, url2], alpn_proto='http/1.1', with_stats=True,
-	with_headers=True, extra_args=xargs)
+	extra_args=xargs)
	r.check_response(count=2, http_status=200)
	assert self.get_tunnel_proto_used(r) == 'HTTP/2' \
	if tunnel == 'h2' else 'HTTP/1.1'

tests/http/test_13_proxy_auth.py+0 -2

@@ -131,7 +131,6 @@ class TestProxyAuth:
	url = f'https://localhost:{env.https_port}/data.json'
	xargs = curl.get_proxy_args(proxys=True, tunnel=True, proto=tunnel)
	r = curl.http_download(urls=[url], alpn_proto=proto, with_stats=True,
-	with_headers=True, with_trace=True,
	extra_args=xargs)
	# expect "COULD_NOT_CONNECT"
	r.check_response(exitcode=56, http_status=None)
@@ -151,7 +150,6 @@ class TestProxyAuth:
	xargs = curl.get_proxy_args(proxys=True, tunnel=True, proto=tunnel)
	xargs.extend(['--proxy-user', 'proxy:proxy'])
	r = curl.http_download(urls=[url], alpn_proto=proto, with_stats=True,
-	with_headers=True, with_trace=True,
	extra_args=xargs)
	r.check_response(count=1, http_status=200,
	protocol='HTTP/2' if proto == 'h2' else 'HTTP/1.1')

tests/http/test_14_auth.py+4 -2

@@ -91,7 +91,8 @@ class TestAuth:
	curl = CurlClient(env=env)
	url = f'https://{env.authority_for(env.domain1, proto)}/restricted/digest/data.json'
	r = curl.http_upload(urls=[url], data=data, alpn_proto=proto, extra_args=[
-	'--digest', '--user', f'test:{password}'
+	'--digest', '--user', f'test:{password}',
+	'--trace-config', 'http/2,http/3'
	])
	# digest does not submit the password, but a hash of it, so all
	# works and, since the pw is not correct, we get a 401
@@ -111,7 +112,8 @@ class TestAuth:
	curl = CurlClient(env=env)
	url = f'https://{env.authority_for(env.domain1, proto)}/restricted/digest/data.json'
	r = curl.http_upload(urls=[url], data=f'@{fdata}', alpn_proto=proto, extra_args=[
-	'--basic', '--user', f'test:{password}'
+	'--basic', '--user', f'test:{password}',
+	'--trace-config', 'http/2,http/3'
	])
	# but apache denies on length limit
	r.check_response(http_status=431)

tests/http/testenv/curl.py+33 -42

@@ -45,7 +45,6 @@ class ExecResult:

	def __init__(self, args: List[str], exit_code: int,
	stdout: List[str], stderr: List[str],
-	trace: Optional[List[str]] = None,
	duration: Optional[timedelta] = None,
	with_stats: bool = False,
	exception: Optional[str] = None):
@@ -54,7 +53,6 @@ class ExecResult:
	self._exception = exception
	self._stdout = stdout
	self._stderr = stderr
-	self._trace = trace
	self._duration = duration if duration is not None else timedelta()
	self._response = None
	self._responses = []
@@ -113,7 +111,7 @@ class ExecResult:

	@property
	def trace_lines(self) -> List[str]:
-	return self._trace if self._trace else self._stderr
+	return self._stderr

	@property
	def duration(self) -> timedelta:
@@ -258,12 +256,8 @@ class ExecResult:
	lines = []
	lines.append('>>--stdout ----------------------------------------------\n')
	lines.extend(self._stdout)
-	if self._trace:
-	lines.append('>>--trace ----------------------------------------------\n')
-	lines.extend(self._trace)
-	else:
-	lines.append('>>--stderr ----------------------------------------------\n')
-	lines.extend(self._stderr)
+	lines.append('>>--stderr ----------------------------------------------\n')
+	lines.extend(self._stderr)
	lines.append('<<-------------------------------------------------------\n')
	return ''.join(lines)

@@ -288,7 +282,6 @@ class CurlClient:
	self._stdoutfile = f'{self._run_dir}/curl.stdout'
	self._stderrfile = f'{self._run_dir}/curl.stderr'
	self._headerfile = f'{self._run_dir}/curl.headers'
-	self._tracefile = f'{self._run_dir}/curl.trace'
	self._log_path = f'{self._run_dir}/curl.log'
	self._silent = silent
	self._rmrf(self._run_dir)
@@ -301,10 +294,6 @@ class CurlClient:
	def download_file(self, i: int) -> str:
	return os.path.join(self.run_dir, f'download_{i}.data')

-	@property
-	def trace_file(self) -> str:
-	return self._tracefile
-
	def _rmf(self, path):
	if os.path.exists(path):
	return os.remove(path)
@@ -347,7 +336,6 @@ class CurlClient:
	with_stats: bool = True,
	with_headers: bool = False,
	no_save: bool = False,
-	with_trace: bool = False,
	extra_args: List[str] = None):
	if extra_args is None:
	extra_args = []
@@ -368,14 +356,12 @@ class CurlClient:
	])
	return self._raw(urls, alpn_proto=alpn_proto, options=extra_args,
	with_stats=with_stats,
-	with_headers=with_headers,
-	with_trace=with_trace)
+	with_headers=with_headers)

	def http_upload(self, urls: List[str], data: str,
	alpn_proto: Optional[str] = None,
	with_stats: bool = True,
	with_headers: bool = False,
-	with_trace: bool = False,
	extra_args: Optional[List[str]] = None):
	if extra_args is None:
	extra_args = []
@@ -388,14 +374,12 @@ class CurlClient:
	])
	return self._raw(urls, alpn_proto=alpn_proto, options=extra_args,
	with_stats=with_stats,
-	with_headers=with_headers,
-	with_trace=with_trace)
+	with_headers=with_headers)

	def http_put(self, urls: List[str], data=None, fdata=None,
	alpn_proto: Optional[str] = None,
	with_stats: bool = True,
	with_headers: bool = False,
-	with_trace: bool = False,
	extra_args: Optional[List[str]] = None):
	if extra_args is None:
	extra_args = []
@@ -413,8 +397,27 @@ class CurlClient:
	return self._raw(urls, intext=data,
	alpn_proto=alpn_proto, options=extra_args,
	with_stats=with_stats,
-	with_headers=with_headers,
-	with_trace=with_trace)
+	with_headers=with_headers)
+
+	def http_form(self, urls: List[str], form: Dict[str, str],
+	alpn_proto: Optional[str] = None,
+	with_stats: bool = True,
+	with_headers: bool = False,
+	extra_args: Optional[List[str]] = None):
+	if extra_args is None:
+	extra_args = []
+	for key, val in form.items():
+	extra_args.extend(['-F', f'{key}={val}'])
+	extra_args.extend([
+	'-o', 'download_#1.data',
+	])
+	if with_stats:
+	extra_args.extend([
+	'-w', '%{json}\\n'
+	])
+	return self._raw(urls, alpn_proto=alpn_proto, options=extra_args,
+	with_stats=with_stats,
+	with_headers=with_headers)

	def response_file(self, idx: int):
	return os.path.join(self._run_dir, f'download_{idx}.data')
@@ -435,7 +438,6 @@ class CurlClient:
	self._rmf(self._stdoutfile)
	self._rmf(self._stderrfile)
	self._rmf(self._headerfile)
-	self._rmf(self._tracefile)
	start = datetime.now()
	exception = None
	try:
@@ -452,11 +454,8 @@ class CurlClient:
	exception = 'TimeoutExpired'
	coutput = open(self._stdoutfile).readlines()
	cerrput = open(self._stderrfile).readlines()
-	ctrace = None
-	if os.path.exists(self._tracefile):
-	ctrace = open(self._tracefile).readlines()
	return ExecResult(args=args, exit_code=exitcode, exception=exception,
-	stdout=coutput, stderr=cerrput, trace=ctrace,
+	stdout=coutput, stderr=cerrput,
	duration=datetime.now() - start,
	with_stats=with_stats)

@@ -465,13 +464,11 @@ class CurlClient:
	force_resolve=True,
	with_stats=False,
	with_headers=True,
-	with_trace=False,
	def_tracing=True):
	args = self._complete_args(
	urls=urls, timeout=timeout, options=options, insecure=insecure,
	alpn_proto=alpn_proto, force_resolve=force_resolve,
-	with_headers=with_headers, with_trace=with_trace,
-	def_tracing=def_tracing)
+	with_headers=with_headers, def_tracing=def_tracing)
	r = self._run(args, intext=intext, with_stats=with_stats)
	if r.exit_code == 0 and with_headers:
	self._parse_headerfile(self._headerfile, r=r)
@@ -483,24 +480,18 @@ class CurlClient:
	insecure=False, force_resolve=True,
	alpn_proto: Optional[str] = None,
	with_headers: bool = True,
-	with_trace: bool = False,
	def_tracing: bool = True):
	if not isinstance(urls, list):
	urls = [urls]

	args = [self._curl, "-s", "--path-as-is"]
-	if def_tracing:
-	args.extend(['--trace-time', '--trace-ids'])
	if with_headers:
	args.extend(["-D", self._headerfile])
-	if with_trace or self.env.verbose > 2:
-	args.extend(['--trace', self._tracefile])
-	elif def_tracing is False:
-	pass
-	elif self.env.verbose > 1:
-	args.extend(['--trace-ascii', self._tracefile])
-	elif not self._silent:
-	args.extend(['-v'])
+	if def_tracing is not False:
+	args.extend(['-v', '--trace-config', 'ids,time'])
+	if self.env.verbose > 1:
+	args.extend(['--trace-config', 'http/2,http/3,h2-proxy,h1-proxy'])
+	pass

	for url in urls:
	u = urlparse(urls[0])

tests/http/testenv/env.py+5 -0

@@ -439,6 +439,11 @@ class Env:
	def nghttpx(self) -> Optional[str]:
	return self.CONFIG.nghttpx

+	@property
+	def slow_network(self) -> bool:
+	return "CURL_DBG_SOCK_WBLOCK" in os.environ or \
+	"CURL_DBG_SOCK_WPARTIAL" in os.environ
+
	def authority_for(self, domain: str, alpn_proto: Optional[str] = None):
	if alpn_proto is None or \
	alpn_proto in ['h2', 'http/1.1', 'http/1.0', 'http/0.9']:

tests/http/testenv/httpd.py+5 -1

@@ -47,7 +47,7 @@ class Httpd:
	'authn_core', 'authn_file',
	'authz_user', 'authz_core', 'authz_host',
	'auth_basic', 'auth_digest',
-	'env', 'filter', 'headers', 'mime',
+	'alias', 'env', 'filter', 'headers', 'mime',
	'socache_shmcb',
	'rewrite', 'http2', 'ssl', 'proxy', 'proxy_http', 'proxy_connect',
	'mpm_event',
@@ -372,6 +372,10 @@ class Httpd:
	lines = []
	if Httpd.MOD_CURLTEST is not None:
	lines.extend([
+	f' Redirect 301 /curltest/echo301 /curltest/echo',
+	f' Redirect 302 /curltest/echo302 /curltest/echo',
+	f' Redirect 303 /curltest/echo303 /curltest/echo',
+	f' Redirect 307 /curltest/echo307 /curltest/echo',
	f' <Location /curltest/echo>',
	f' SetHandler curltest-echo',
	f' </Location>',