← Commit list

632e0fbe70

Stefan Eissing

2023-04-06

SUCCESS Duration: 85s

Subject

http2: move HTTP/2 stream vars into local context

Binary

Download Binary (803 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 632e0fbe708a90d3430937699e99797095fa27eb
Previous HEAD position was 356dd0b73a tests: increase sws timeout for more robust testing
HEAD is now at 632e0fbe70 http2: move HTTP/2 stream vars into local context

$ 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/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_log.lo
Removing lib/libcurl_la-curl_log.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-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-h2h3.lo
Removing lib/libcurl_la-h2h3.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-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-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-gskit.lo
Removing lib/vtls/libcurl_la-gskit.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-nss.lo
Removing lib/vtls/libcurl_la-nss.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 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/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:428: installing './config.guess'
configure.ac:428: 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.1.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 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_set_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 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 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.1.0-DEV
SSL: no (--with-{openssl,gnutls,nss,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_gethostname.lo
CC libcurl_la-curl_get_line.lo
CC libcurl_la-curl_gssapi.lo
CC libcurl_la-curl_log.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-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-h2h3.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-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-idn.lo
CC libcurl_la-http_aws_sigv4.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-md4.lo
CC libcurl_la-md5.lo
CC libcurl_la-memdebug.lo
CC libcurl_la-mime.lo
CC libcurl_la-mprintf.lo
CC libcurl_la-mqtt.lo
CC libcurl_la-multi.lo
CC libcurl_la-netrc.lo
CC libcurl_la-nonblock.lo
CC libcurl_la-noproxy.lo
CC libcurl_la-openldap.lo
CC libcurl_la-parsedate.lo
CC libcurl_la-pingpong.lo
CC libcurl_la-pop3.lo
CC libcurl_la-progress.lo
CC libcurl_la-psl.lo
CC libcurl_la-rand.lo
CC libcurl_la-rename.lo
CC libcurl_la-rtsp.lo
CC libcurl_la-select.lo
CC libcurl_la-sendf.lo
CC libcurl_la-setopt.lo
CC libcurl_la-sha256.lo
CC libcurl_la-share.lo
CC libcurl_la-slist.lo
CC libcurl_la-smb.lo
CC libcurl_la-smtp.lo
CC libcurl_la-socketpair.lo
CC libcurl_la-socks.lo
CC libcurl_la-socks_gssapi.lo
CC libcurl_la-socks_sspi.lo
CC libcurl_la-speedcheck.lo
CC libcurl_la-splay.lo
CC libcurl_la-strcase.lo
CC libcurl_la-strdup.lo
CC libcurl_la-strerror.lo
CC libcurl_la-strtok.lo
CC libcurl_la-strtoofft.lo
CC libcurl_la-system_win32.lo
CC libcurl_la-telnet.lo
CC libcurl_la-tftp.lo
CC libcurl_la-timediff.lo
CC libcurl_la-timeval.lo
CC libcurl_la-transfer.lo
CC libcurl_la-url.lo
CC libcurl_la-urlapi.lo
CC libcurl_la-version.lo
CC libcurl_la-version_win32.lo
CC libcurl_la-warnless.lo
CC libcurl_la-ws.lo
CC vauth/libcurl_la-cleartext.lo
CC vauth/libcurl_la-cram.lo
CC vauth/libcurl_la-digest.lo
CC vauth/libcurl_la-digest_sspi.lo
CC vauth/libcurl_la-gsasl.lo
CC vauth/libcurl_la-krb5_gssapi.lo
CC vauth/libcurl_la-krb5_sspi.lo
CC vauth/libcurl_la-ntlm.lo
CC vauth/libcurl_la-ntlm_sspi.lo
CC vauth/libcurl_la-oauth2.lo
CC vauth/libcurl_la-spnego_gssapi.lo
CC vauth/libcurl_la-spnego_sspi.lo
CC vauth/libcurl_la-vauth.lo
CC vtls/libcurl_la-bearssl.lo
CC vtls/libcurl_la-gskit.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-nss.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-vtls.lo
CC vtls/libcurl_la-sectransp.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_bname.o
CC tool_binmode.o
CC tool_cb_dbg.o
CC tool_cb_hdr.o
CC tool_cb_prg.o
CC tool_cb_rea.o
CC tool_cb_see.o
CC tool_cb_wrt.o
CC tool_cfgable.o
CC tool_dirhie.o
CC tool_doswin.o
CC tool_easysrc.o
CC tool_filetime.o
CC tool_findfile.o
CC tool_formparse.o
CC tool_getparam.o
CC tool_getpass.o
CC tool_help.o
CC tool_helpers.o
HUGE tool_hugehelp.c
CC tool_libinfo.o
CC tool_listhelp.o
CC tool_main.o
CC tool_msgs.o
CC tool_operate.o
CC tool_operhlp.o
CC tool_paramhlp.o
CC tool_parsecfg.o
CC tool_progress.o
CC tool_stderr.o
CC tool_strdup.o
CC tool_setopt.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 ../lib/strtoofft.o
CC ../lib/timediff.o
CC ../lib/nonblock.o
CC ../lib/warnless.o
CC ../lib/curl_multibyte.o
CC ../lib/version_win32.o
CC ../lib/dynbuf.o
CC tool_hugehelp.o
CCLD curl
make[2]: Leaving directory '/root/asi_db/builds/curl/_worktrees/w0/src'
make[1]: Leaving directory '/root/asi_db/builds/curl/_worktrees/w0/src'
make[1]: Entering directory '/root/asi_db/builds/curl/_worktrees/w0'
make[1]: Nothing to be done for 'all-am'.
make[1]: Leaving directory '/root/asi_db/builds/curl/_worktrees/w0'

Commit Diff GitHub →

lib/http.h +3 -30 lib/http2.c +351 -297 lib/vquic/curl_msh3.c +2 -2 lib/vquic/curl_ngtcp2.c +17 -13 lib/vquic/curl_quiche.c +2 -2

lib/http.h+3 -30

@@ -44,7 +44,7 @@ typedef enum {

	#ifndef CURL_DISABLE_HTTP

-	#if defined(ENABLE_QUIC) \|\| defined(USE_NGHTTP2)
+	#if defined(ENABLE_QUIC)
	#include <stdint.h>
	#endif

@@ -212,44 +212,17 @@ struct HTTP {
	HTTPSEND_BODY /* sending body */
	} sending;

-	void impl_ctx; / context for actual HTTP implementation */
-
	#ifdef USE_WEBSOCKETS
	struct websocket ws;
	#endif

	#ifndef CURL_DISABLE_HTTP
+	void h2_ctx; / HTTP/2 implementation context */
+	void h3_ctx; / HTTP/3 implementation context */
	struct dynbuf send_buffer; /* used if the request couldn't be sent in one
	chunk, points to an allocated send_buffer
	struct */
	#endif
-	#ifdef USE_NGHTTP2
-	/********* for HTTP/2 we store stream-local data here ***********/
-	int32_t stream_id; /* stream we are interested in */
-	struct bufq h2_sendbuf; /* request body data buffere for sending */
-	size_t h2_send_hds_len; /* amount of bytes in first cf_send() that
-	are header bytes. Or 0 if not known. */
-	struct bufq h2_recvbuf;
-	size_t h2_recv_hds_len; /* how many bytes in recvbuf are headers */
-	struct dynhds resp_trailers;
-	bool close_handled; /* TRUE if stream closure is handled by libcurl */
-
-	char *push_headers; / allocated array */
-	size_t push_headers_used; /* number of entries filled in */
-	size_t push_headers_alloc; /* number of entries allocated */
-	uint32_t error; /* HTTP/2 stream error code */
-	bool bodystarted;
-	int status_code; /* HTTP status code */
-	char mem; / points to a buffer in memory to store received data */
-	size_t len; /* size of the buffer 'mem' points to */
-	size_t memlen; /* size of data copied to mem */
-	/* fields used by both HTTP/2 and HTTP/3 */
-	const uint8_t upload_mem; / points to a buffer to read from */
-	size_t upload_len; /* size of the buffer 'upload_mem' points to */
-	curl_off_t upload_left; /* number of bytes left to upload */
-	bool closed; /* TRUE on stream close */
-	bool reset; /* TRUE on stream reset */
-	#endif
	};

	CURLcode Curl_http_size(struct Curl_easy *data);

lib/http2.c+351 -297

@@ -25,6 +25,7 @@
	#include "curl_setup.h"

	#ifdef USE_NGHTTP2
+	#include <stdint.h>
	#include <nghttp2/nghttp2.h>
	#include "urldata.h"
	#include "bufq.h"
@@ -131,7 +132,6 @@ struct cf_h2_ctx {
	#define CF_CTX_CALL_DATA(cf) \
	((struct cf_h2_ctx *)(cf)->ctx)->call_data

-
	static void cf_h2_ctx_clear(struct cf_h2_ctx *ctx)
	{
	struct cf_call_data save = ctx->call_data;
@@ -154,6 +154,158 @@ static void cf_h2_ctx_free(struct cf_h2_ctx *ctx)
	}
	}

+	/*
+	* This specific transfer on this connection has been "drained".
+	*/
+	static void drained_transfer(struct Curl_cfilter *cf,
+	struct Curl_easy *data)
+	{
+	if(data->state.drain) {
+	struct cf_h2_ctx *ctx = cf->ctx;
+	DEBUGASSERT(ctx->drain_total > 0);
+	ctx->drain_total--;
+	data->state.drain = 0;
+	}
+	}
+
+	/*
+	* Mark this transfer to get "drained".
+	*/
+	static void drain_this(struct Curl_cfilter *cf,
+	struct Curl_easy *data)
+	{
+	if(!data->state.drain) {
+	struct cf_h2_ctx *ctx = cf->ctx;
+	data->state.drain = 1;
+	ctx->drain_total++;
+	DEBUGASSERT(ctx->drain_total > 0);
+	}
+	}
+
+	/**
+	* All about the H3 internals of a stream
+	*/
+	struct stream_ctx {
+	/********* for HTTP/2 we store stream-local data here ***********/
+	int32_t id; /* HTTP/2 protocol identifier for stream */
+	struct bufq recvbuf; /* response buffer */
+	struct bufq sendbuf; /* request buffer */
+	struct dynhds resp_trailers; /* response trailer fields */
+	size_t req_hds_len; /* amount of request header bytes in sendbuf. */
+	size_t resp_hds_len; /* amount of response header bytes in recvbuf */
+	curl_off_t upload_left; /* number of request bytes left to upload */
+
+	char *push_headers; / allocated array */
+	size_t push_headers_used; /* number of entries filled in */
+	size_t push_headers_alloc; /* number of entries allocated */
+
+	int status_code; /* HTTP response status code */
+	uint32_t error; /* stream error code */
+	bool closed; /* TRUE on stream close */
+	bool reset; /* TRUE on stream reset */
+	bool close_handled; /* TRUE if stream closure is handled by libcurl */
+	bool bodystarted;
+	};
+
+	#define H2_STREAM_CTX(d) ((struct stream_ctx *)(((d) && (d)->req.p.http)? \
+	((struct HTTP *)(d)->req.p.http)->h2_ctx \
+	: NULL))
+	#define H2_STREAM_LCTX(d) ((struct HTTP *)(d)->req.p.http)->h2_ctx
+	#define H2_STREAM_ID(d) (H2_STREAM_CTX(d)? \
+	H2_STREAM_CTX(d)->id : -2)
+
+	static CURLcode http2_data_setup(struct Curl_cfilter *cf,
+	struct Curl_easy *data,
+	struct stream_ctx **pstream)
+	{
+	struct cf_h2_ctx *ctx = cf->ctx;
+	struct stream_ctx *stream = H2_STREAM_CTX(data);
+
+	(void)cf;
+	if(!data \|\| !data->req.p.http) {
+	failf(data, "initialization failure, transfer not http initialized");
+	return CURLE_FAILED_INIT;
+	}
+	if(stream) {
+	*pstream = stream;
+	return CURLE_OK;
+	}
+
+	stream = calloc(1, sizeof(*stream));
+	if(!stream)
+	return CURLE_OUT_OF_MEMORY;
+
+	stream->id = -1;
+	Curl_bufq_initp(&stream->sendbuf, &ctx->stream_bufcp,
+	H2_STREAM_SEND_CHUNKS, BUFQ_OPT_NONE);
+	Curl_bufq_initp(&stream->recvbuf, &ctx->stream_bufcp,
+	H2_STREAM_RECV_CHUNKS, BUFQ_OPT_SOFT_LIMIT);
+	Curl_dynhds_init(&stream->resp_trailers, 0, DYN_H2_TRAILERS);
+	stream->req_hds_len = 0;
+	stream->resp_hds_len = 0;
+	stream->bodystarted = FALSE;
+	stream->status_code = -1;
+	stream->closed = FALSE;
+	stream->close_handled = FALSE;
+	stream->error = NGHTTP2_NO_ERROR;
+	stream->upload_left = 0;
+
+	H2_STREAM_LCTX(data) = stream;
+	*pstream = stream;
+	return CURLE_OK;
+	}
+
+	static void http2_data_done(struct Curl_cfilter *cf,
+	struct Curl_easy *data, bool premature)
+	{
+	struct cf_h2_ctx *ctx = cf->ctx;
+	struct stream_ctx *stream = H2_STREAM_CTX(data);
+
+	DEBUGASSERT(ctx);
+	(void)premature;
+	if(!stream)
+	return;
+
+	if(ctx->h2) {
+	if(!stream->closed && stream->id > 0) {
+	/* RST_STREAM */
+	DEBUGF(LOG_CF(data, cf, "[h2sid=%d] premature DATA_DONE, RST stream",
+	stream->id));
+	if(!nghttp2_submit_rst_stream(ctx->h2, NGHTTP2_FLAG_NONE,
+	stream->id, NGHTTP2_STREAM_CLOSED))
+	(void)nghttp2_session_send(ctx->h2);
+	}
+
+	drained_transfer(cf, data);
+
+	/* -1 means unassigned and 0 means cleared */
+	if(nghttp2_session_get_stream_user_data(ctx->h2, stream->id)) {
+	int rv = nghttp2_session_set_stream_user_data(ctx->h2,
+	stream->id, 0);
+	if(rv) {
+	infof(data, "http/2: failed to clear user_data for stream %u",
+	stream->id);
+	DEBUGASSERT(0);
+	}
+	}
+	}
+
+	Curl_bufq_free(&stream->sendbuf);
+	Curl_bufq_free(&stream->recvbuf);
+	Curl_dynhds_free(&stream->resp_trailers);
+	if(stream->push_headers) {
+	/* if they weren't used and then freed before */
+	for(; stream->push_headers_used > 0; --stream->push_headers_used) {
+	free(stream->push_headers[stream->push_headers_used - 1]);
+	}
+	free(stream->push_headers);
+	stream->push_headers = NULL;
+	}
+
+	free(stream);
+	H2_STREAM_LCTX(data) = NULL;
+	}
+
	static int h2_client_new(struct Curl_cfilter *cf,
	nghttp2_session_callbacks *cbs)
	{
@@ -228,35 +380,6 @@ static void multi_connchanged(struct Curl_multi *multi)
	multi->recheckstate = TRUE;
	}

-	static CURLcode http2_data_setup(struct Curl_cfilter *cf,
-	struct Curl_easy *data)
-	{
-	struct cf_h2_ctx *ctx = cf->ctx;
-	struct HTTP *stream = data->req.p.http;
-
-	(void)cf;
-	DEBUGASSERT(stream);
-	DEBUGASSERT(data->state.buffer);
-
-	stream->stream_id = -1;
-
-	Curl_bufq_initp(&stream->h2_sendbuf, &ctx->stream_bufcp,
-	H2_STREAM_SEND_CHUNKS, BUFQ_OPT_NONE);
-	Curl_bufq_initp(&stream->h2_recvbuf, &ctx->stream_bufcp,
-	H2_STREAM_RECV_CHUNKS, BUFQ_OPT_SOFT_LIMIT);
-	Curl_dynhds_init(&stream->resp_trailers, 0, DYN_H2_TRAILERS);
-	stream->h2_send_hds_len = 0;
-	stream->h2_recv_hds_len = 0;
-	stream->bodystarted = FALSE;
-	stream->status_code = -1;
-	stream->closed = FALSE;
-	stream->close_handled = FALSE;
-	stream->error = NGHTTP2_NO_ERROR;
-	stream->upload_left = 0;
-
-	return CURLE_OK;
-	}
-
	/*
	* Initialize the cfilter context
	*/
@@ -265,7 +388,7 @@ static CURLcode cf_h2_ctx_init(struct Curl_cfilter *cf,
	bool via_h1_upgrade)
	{
	struct cf_h2_ctx *ctx = cf->ctx;
-	struct HTTP *stream = data->req.p.http;
+	struct stream_ctx *stream;
	CURLcode result = CURLE_OUT_OF_MEMORY;
	int rc;
	nghttp2_session_callbacks *cbs = NULL;
@@ -300,10 +423,6 @@ static CURLcode cf_h2_ctx_init(struct Curl_cfilter *cf,
	}
	ctx->max_concurrent_streams = DEFAULT_MAX_CONCURRENT_STREAMS;

-	result = http2_data_setup(cf, data);
-	if(result)
-	goto out;
-
	if(via_h1_upgrade) {
	/* HTTP/1.1 Upgrade issued. H2 Settings have already been submitted
	* in the H1 request and we upgrade from there. This stream
@@ -313,7 +432,11 @@ static CURLcode cf_h2_ctx_init(struct Curl_cfilter *cf,

	binlen = populate_binsettings(binsettings, data);

-	stream->stream_id = 1;
+	result = http2_data_setup(cf, data, &stream);
+	if(result)
+	goto out;
+	DEBUGASSERT(stream);
+	stream->id = 1;
	/* queue SETTINGS frame (again) */
	rc = nghttp2_session_upgrade2(ctx->h2, binsettings, binlen,
	data->state.httpreq == HTTPREQ_HEAD,
@@ -325,11 +448,11 @@ static CURLcode cf_h2_ctx_init(struct Curl_cfilter *cf,
	goto out;
	}

-	rc = nghttp2_session_set_stream_user_data(ctx->h2, stream->stream_id,
+	rc = nghttp2_session_set_stream_user_data(ctx->h2, stream->id,
	data);
	if(rc) {
	infof(data, "http/2: failed to set user_data for stream %u",
-	stream->stream_id);
+	stream->id);
	DEBUGASSERT(0);
	}
	}
@@ -337,9 +460,6 @@ static CURLcode cf_h2_ctx_init(struct Curl_cfilter *cf,
	nghttp2_settings_entry iv[H2_SETTINGS_IV_LEN];
	int ivlen;

-	/* H2 Settings need to be submitted. Stream is not open yet. */
-	DEBUGASSERT(stream->stream_id == -1);
-
	ivlen = populate_settings(iv, data);
	rc = nghttp2_submit_settings(ctx->h2, NGHTTP2_FLAG_NONE,
	iv, ivlen);
@@ -369,22 +489,6 @@ out:
	return result;
	}

-	/*
-	* http2_stream_free() free HTTP2 stream related data
-	*/
-	static void http2_stream_free(struct HTTP *stream)
-	{
-	if(stream) {
-	Curl_bufq_free(&stream->h2_sendbuf);
-	Curl_bufq_free(&stream->h2_recvbuf);
-	for(; stream->push_headers_used > 0; --stream->push_headers_used) {
-	free(stream->push_headers[stream->push_headers_used - 1]);
-	}
-	free(stream->push_headers);
-	stream->push_headers = NULL;
-	}
-	}
-
	/*
	* Returns nonzero if current HTTP/2 session should be closed.
	*/
@@ -593,8 +697,8 @@ char curl_pushheader_bynum(struct curl_pushheaders h, size_t num)
	if(!h \|\| !GOOD_EASY_HANDLE(h->data))
	return NULL;
	else {
-	struct HTTP *stream = h->data->req.p.http;
-	if(num < stream->push_headers_used)
+	struct stream_ctx *stream = H2_STREAM_CTX(h->data);
+	if(stream && num < stream->push_headers_used)
	return stream->push_headers[num];
	}
	return NULL;
@@ -605,6 +709,9 @@ char curl_pushheader_bynum(struct curl_pushheaders h, size_t num)
	*/
	char curl_pushheader_byname(struct curl_pushheaders h, const char *header)
	{
+	struct stream_ctx *stream;
+	size_t len;
+	size_t i;
	/* Verify that we got a good easy handle in the push header struct,
	mostly to detect rubbish input fast(er). Also empty header name
	is just a rubbish too. We have to allow ":" at the beginning of
@@ -614,48 +721,21 @@ char curl_pushheader_byname(struct curl_pushheaders h, const char *header)
	if(!h \|\| !GOOD_EASY_HANDLE(h->data) \|\| !header \|\| !header[0] \|\|
	!strcmp(header, ":") \|\| strchr(header + 1, ':'))
	return NULL;
-	else {
-	struct HTTP *stream = h->data->req.p.http;
-	size_t len = strlen(header);
-	size_t i;
-	for(i = 0; i<stream->push_headers_used; i++) {
-	if(!strncmp(header, stream->push_headers[i], len)) {
-	/* sub-match, make sure that it is followed by a colon */
-	if(stream->push_headers[i][len] != ':')
-	continue;
-	return &stream->push_headers[i][len + 1];
-	}
-	}
-	}
-	return NULL;
-	}

-	/*
-	* This specific transfer on this connection has been "drained".
-	*/
-	static void drained_transfer(struct Curl_cfilter *cf,
-	struct Curl_easy *data)
-	{
-	if(data->state.drain) {
-	struct cf_h2_ctx *ctx = cf->ctx;
-	DEBUGASSERT(ctx->drain_total > 0);
-	ctx->drain_total--;
-	data->state.drain = 0;
-	}
-	}
+	stream = H2_STREAM_CTX(h->data);
+	if(!stream)
+	return NULL;

-	/*
-	* Mark this transfer to get "drained".
-	*/
-	static void drain_this(struct Curl_cfilter *cf,
-	struct Curl_easy *data)
-	{
-	if(!data->state.drain) {
-	struct cf_h2_ctx *ctx = cf->ctx;
-	data->state.drain = 1;
-	ctx->drain_total++;
-	DEBUGASSERT(ctx->drain_total > 0);
+	len = strlen(header);
+	for(i = 0; i<stream->push_headers_used; i++) {
+	if(!strncmp(header, stream->push_headers[i], len)) {
+	/* sub-match, make sure that it is followed by a colon */
+	if(stream->push_headers[i][len] != ':')
+	continue;
+	return &stream->push_headers[i][len + 1];
+	}
	}
+	return NULL;
	}

	static struct Curl_easy h2_duphandle(struct Curl_cfilter cf,
@@ -669,8 +749,10 @@ static struct Curl_easy h2_duphandle(struct Curl_cfilter cf,
	(void)Curl_close(&second);
	}
	else {
+	struct stream_ctx *second_stream;
+
	second->req.p.http = http;
-	http2_data_setup(cf, second);
+	http2_data_setup(cf, second, &second_stream);
	second->state.priority.weight = data->state.priority.weight;
	}
	}
@@ -731,6 +813,16 @@ static int set_transfer_url(struct Curl_easy *data,
	return 0;
	}

+	static void discard_newhandle(struct Curl_cfilter *cf,
+	struct Curl_easy *newhandle)
+	{
+	if(!newhandle->req.p.http) {
+	http2_data_done(cf, newhandle, TRUE);
+	newhandle->req.p.http = NULL;
+	}
+	(void)Curl_close(&newhandle);
+	}
+
	static int push_promise(struct Curl_cfilter *cf,
	struct Curl_easy *data,
	const nghttp2_push_promise *frame)
@@ -738,13 +830,14 @@ static int push_promise(struct Curl_cfilter *cf,
	struct cf_h2_ctx *ctx = cf->ctx;
	int rv; /* one of the CURL_PUSH_* defines */

-	DEBUGF(LOG_CF(data, cf, "[h2sid=%u] PUSH_PROMISE received",
+	DEBUGF(LOG_CF(data, cf, "[h2sid=%d] PUSH_PROMISE received",
	frame->promised_stream_id));
	if(data->multi->push_cb) {
-	struct HTTP *stream;
-	struct HTTP *newstream;
+	struct stream_ctx *stream;
+	struct stream_ctx *newstream;
	struct curl_pushheaders heads;
	CURLMcode rc;
+	CURLcode result;
	size_t i;
	/* clone the parent */
	struct Curl_easy *newhandle = h2_duphandle(cf, data);
@@ -759,20 +852,29 @@ static int push_promise(struct Curl_cfilter *cf,
	/* ask the application */
	DEBUGF(LOG_CF(data, cf, "Got PUSH_PROMISE, ask application"));

-	stream = data->req.p.http;
+	stream = H2_STREAM_CTX(data);
	if(!stream) {
	failf(data, "Internal NULL stream");
-	(void)Curl_close(&newhandle);
+	discard_newhandle(cf, newhandle);
	rv = CURL_PUSH_DENY;
	goto fail;
	}

	rv = set_transfer_url(newhandle, &heads);
	if(rv) {
-	(void)Curl_close(&newhandle);
+	discard_newhandle(cf, newhandle);
+	rv = CURL_PUSH_DENY;
+	goto fail;
+	}
+
+	result = http2_data_setup(cf, newhandle, &newstream);
+	if(result) {
+	failf(data, "error setting up stream: %d", result);
+	discard_newhandle(cf, newhandle);
	rv = CURL_PUSH_DENY;
	goto fail;
	}
+	DEBUGASSERT(stream);

	Curl_set_in_callback(data, true);
	rv = data->multi->push_cb(data, newhandle,
@@ -790,14 +892,11 @@ static int push_promise(struct Curl_cfilter *cf,
	if(rv) {
	DEBUGASSERT((rv > CURL_PUSH_OK) && (rv <= CURL_PUSH_ERROROUT));
	/* denied, kill off the new handle again */
-	http2_stream_free(newhandle->req.p.http);
-	newhandle->req.p.http = NULL;
-	(void)Curl_close(&newhandle);
+	discard_newhandle(cf, newhandle);
	goto fail;
	}

-	newstream = newhandle->req.p.http;
-	newstream->stream_id = frame->promised_stream_id;
+	newstream->id = frame->promised_stream_id;
	newhandle->req.maxdownload = -1;
	newhandle->req.size = -1;

@@ -806,29 +905,21 @@ static int push_promise(struct Curl_cfilter *cf,
	rc = Curl_multi_add_perform(data->multi, newhandle, cf->conn);
	if(rc) {
	infof(data, "failed to add handle to multi");
-	http2_stream_free(newhandle->req.p.http);
-	newhandle->req.p.http = NULL;
-	Curl_close(&newhandle);
+	discard_newhandle(cf, newhandle);
	rv = CURL_PUSH_DENY;
	goto fail;
	}

	rv = nghttp2_session_set_stream_user_data(ctx->h2,
-	newstream->stream_id,
+	newstream->id,
	newhandle);
	if(rv) {
	infof(data, "failed to set user_data for stream %u",
-	newstream->stream_id);
+	newstream->id);
	DEBUGASSERT(0);
	rv = CURL_PUSH_DENY;
	goto fail;
	}
-	Curl_bufq_initp(&newstream->h2_sendbuf, &ctx->stream_bufcp,
-	H2_STREAM_SEND_CHUNKS, BUFQ_OPT_NONE);
-	Curl_bufq_initp(&newstream->h2_recvbuf, &ctx->stream_bufcp,
-	H2_STREAM_RECV_CHUNKS, BUFQ_OPT_SOFT_LIMIT);
-	newstream->h2_send_hds_len = 0;
-	Curl_dynhds_init(&newstream->resp_trailers, 0, DYN_H2_TRAILERS);
	}
	else {
	DEBUGF(LOG_CF(data, cf, "Got PUSH_PROMISE, ignore it"));
@@ -842,16 +933,16 @@ static CURLcode recvbuf_write_hds(struct Curl_cfilter *cf,
	struct Curl_easy *data,
	const char *buf, size_t blen)
	{
-	struct HTTP *stream = data->req.p.http;
+	struct stream_ctx *stream = H2_STREAM_CTX(data);
	ssize_t nwritten;
	CURLcode result;

	(void)cf;
-	nwritten = Curl_bufq_write(&stream->h2_recvbuf,
+	nwritten = Curl_bufq_write(&stream->recvbuf,
	(const unsigned char *)buf, blen, &result);
	if(nwritten < 0)
	return result;
-	stream->h2_recv_hds_len += (size_t)nwritten;
+	stream->resp_hds_len += (size_t)nwritten;
	/* TODO: make sure recvbuf is more flexible with overflow */
	DEBUGASSERT((size_t)nwritten == blen);
	return CURLE_OK;
@@ -863,7 +954,7 @@ static int on_frame_recv(nghttp2_session session, const nghttp2_frame frame,
	struct Curl_cfilter *cf = userp;
	struct cf_h2_ctx *ctx = cf->ctx;
	struct Curl_easy *data_s = NULL;
-	struct HTTP *stream = NULL;
+	struct stream_ctx *stream = NULL;
	struct Curl_easy *data = CF_DATA_CURRENT(cf);
	int rv;
	int32_t stream_id = frame->hd.stream_id;
@@ -915,21 +1006,21 @@ static int on_frame_recv(nghttp2_session session, const nghttp2_frame frame,
	}
	data_s = nghttp2_session_get_stream_user_data(session, stream_id);
	if(!data_s) {
-	DEBUGF(LOG_CF(data, cf, "[h2sid=%u] No Curl_easy associated",
+	DEBUGF(LOG_CF(data, cf, "[h2sid=%d] No Curl_easy associated",
	stream_id));
	return 0;
	}

-	stream = data_s->req.p.http;
+	stream = H2_STREAM_CTX(data_s);
	if(!stream) {
-	DEBUGF(LOG_CF(data_s, cf, "[h2sid=%u] No proto pointer", stream_id));
+	DEBUGF(LOG_CF(data_s, cf, "[h2sid=%d] No proto pointer", 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. */
-	DEBUGF(LOG_CF(data_s, cf, "[h2sid=%u] recv frame DATA", stream_id));
+	DEBUGF(LOG_CF(data_s, cf, "[h2sid=%d] recv frame DATA", stream_id));
	if(!stream->bodystarted) {
	rv = nghttp2_submit_rst_stream(session, NGHTTP2_FLAG_NONE,
	stream_id, NGHTTP2_PROTOCOL_ERROR);
@@ -941,14 +1032,14 @@ static int on_frame_recv(nghttp2_session session, const nghttp2_frame frame,
	if(frame->hd.flags & NGHTTP2_FLAG_END_STREAM) {
	/* Stream has ended. If there is pending data, ensure that read
	will occur to consume it. */
-	if(!data->state.drain && !Curl_bufq_is_empty(&stream->h2_recvbuf)) {
+	if(!data->state.drain && !Curl_bufq_is_empty(&stream->recvbuf)) {
	drain_this(cf, data_s);
	Curl_expire(data, 0, EXPIRE_RUN_NOW);
	}
	}
	break;
	case NGHTTP2_HEADERS:
-	DEBUGF(LOG_CF(data_s, cf, "[h2sid=%u] recv frame HEADERS", stream_id));
+	DEBUGF(LOG_CF(data_s, cf, "[h2sid=%d] recv frame HEADERS", stream_id));
	if(stream->bodystarted) {
	/* Only valid HEADERS after body started is trailer HEADERS. We
	buffer them in on_header callback. */
@@ -971,15 +1062,15 @@ static int on_frame_recv(nghttp2_session session, const nghttp2_frame frame,
	if(result)
	return NGHTTP2_ERR_CALLBACK_FAILURE;

-	DEBUGF(LOG_CF(data_s, cf, "[h2sid=%u] %zu header bytes",
-	stream_id, Curl_bufq_len(&stream->h2_recvbuf)));
+	DEBUGF(LOG_CF(data_s, cf, "[h2sid=%d] %zu header bytes",
+	stream_id, Curl_bufq_len(&stream->recvbuf)));
	if(CF_DATA_CURRENT(cf) != data_s) {
	drain_this(cf, data_s);
	Curl_expire(data_s, 0, EXPIRE_RUN_NOW);
	}
	break;
	case NGHTTP2_PUSH_PROMISE:
-	DEBUGF(LOG_CF(data_s, cf, "[h2sid=%u] recv PUSH_PROMISE", stream_id));
+	DEBUGF(LOG_CF(data_s, cf, "[h2sid=%d] recv PUSH_PROMISE", stream_id));
	rv = push_promise(cf, data_s, &frame->push_promise);
	if(rv) { /* deny! */
	int h2;
@@ -996,25 +1087,25 @@ static int on_frame_recv(nghttp2_session session, const nghttp2_frame frame,
	}
	break;
	case NGHTTP2_RST_STREAM:
-	DEBUGF(LOG_CF(data_s, cf, "[h2sid=%u] recv RST", stream_id));
+	DEBUGF(LOG_CF(data_s, cf, "[h2sid=%d] recv RST", stream_id));
	stream->closed = TRUE;
	stream->reset = TRUE;
	drain_this(cf, data);
	Curl_expire(data, 0, EXPIRE_RUN_NOW);
	break;
	case NGHTTP2_WINDOW_UPDATE:
-	DEBUGF(LOG_CF(data, cf, "[h2sid=%u] recv WINDOW_UPDATE", stream_id));
+	DEBUGF(LOG_CF(data, cf, "[h2sid=%d] recv WINDOW_UPDATE", stream_id));
	if((data_s->req.keepon & KEEP_SEND_HOLD) &&
	(data_s->req.keepon & KEEP_SEND)) {
	data_s->req.keepon &= ~KEEP_SEND_HOLD;
	drain_this(cf, data_s);
	Curl_expire(data_s, 0, EXPIRE_RUN_NOW);
-	DEBUGF(LOG_CF(data, cf, "[h2sid=%u] un-holding after win update",
+	DEBUGF(LOG_CF(data, cf, "[h2sid=%d] un-holding after win update",
	stream_id));
	}
	break;
	default:
-	DEBUGF(LOG_CF(data_s, cf, "[h2sid=%u] recv frame %x",
+	DEBUGF(LOG_CF(data_s, cf, "[h2sid=%d] recv frame %x",
	stream_id, frame->hd.type));
	break;
	}
@@ -1026,7 +1117,7 @@ static int on_data_chunk_recv(nghttp2_session *session, uint8_t flags,
	const uint8_t mem, size_t len, void userp)
	{
	struct Curl_cfilter *cf = userp;
-	struct HTTP *stream;
+	struct stream_ctx *stream;
	struct Curl_easy *data_s;
	ssize_t nwritten;
	CURLcode result;
@@ -1041,18 +1132,18 @@ static int on_data_chunk_recv(nghttp2_session *session, uint8_t flags,
	/* Receiving a Stream ID not in the hash should not happen - unless
	we have aborted a transfer artificially and there were more data
	in the pipeline. Silently ignore. */
-	DEBUGF(LOG_CF(CF_DATA_CURRENT(cf), cf, "[h2sid=%u] Data for unknown",
+	DEBUGF(LOG_CF(CF_DATA_CURRENT(cf), cf, "[h2sid=%d] Data for unknown",
	stream_id));
	/* consumed explicitly as no one will read it */
	nghttp2_session_consume(session, stream_id, len);
	return 0;
	}

-	stream = data_s->req.p.http;
+	stream = H2_STREAM_CTX(data_s);
	if(!stream)
	return NGHTTP2_ERR_CALLBACK_FAILURE;

-	nwritten = Curl_bufq_write(&stream->h2_recvbuf, mem, len, &result);
+	nwritten = Curl_bufq_write(&stream->recvbuf, mem, len, &result);
	if(nwritten < 0) {
	if(result != CURLE_AGAIN)
	return NGHTTP2_ERR_CALLBACK_FAILURE;
@@ -1067,9 +1158,9 @@ static int on_data_chunk_recv(nghttp2_session *session, uint8_t flags,
	}

	DEBUGASSERT((size_t)nwritten == len);
-	DEBUGF(LOG_CF(data_s, cf, "[h2sid=%u] %zd/%zu DATA recvd, "
+	DEBUGF(LOG_CF(data_s, cf, "[h2sid=%d] %zd/%zu DATA recvd, "
	"(buffer now holds %zu)",
-	stream_id, nwritten, len, Curl_bufq_len(&stream->h2_recvbuf)));
+	stream_id, nwritten, len, Curl_bufq_len(&stream->recvbuf)));

	return 0;
	}
@@ -1079,7 +1170,7 @@ static int on_stream_close(nghttp2_session *session, int32_t stream_id,
	{
	struct Curl_cfilter *cf = userp;
	struct Curl_easy *data_s;
-	struct HTTP *stream;
+	struct stream_ctx *stream;
	int rv;
	(void)session;

@@ -1090,8 +1181,8 @@ static int on_stream_close(nghttp2_session *session, int32_t stream_id,
	if(!data_s) {
	return 0;
	}
-	stream = data_s->req.p.http;
-	DEBUGF(LOG_CF(data_s, cf, "[h2sid=%u] on_stream_close(), %s (err %d)",
+	stream = H2_STREAM_CTX(data_s);
+	DEBUGF(LOG_CF(data_s, cf, "[h2sid=%d] on_stream_close(), %s (err %d)",
	stream_id, nghttp2_http2_strerror(error_code), error_code));
	if(!stream)
	return NGHTTP2_ERR_CALLBACK_FAILURE;
@@ -1113,7 +1204,7 @@ static int on_stream_close(nghttp2_session *session, int32_t stream_id,
	stream_id);
	DEBUGASSERT(0);
	}
-	DEBUGF(LOG_CF(data_s, cf, "[h2sid=%u] closed now", stream_id));
+	DEBUGF(LOG_CF(data_s, cf, "[h2sid=%d] closed now", stream_id));
	return 0;
	}

@@ -1121,7 +1212,7 @@ static int on_begin_headers(nghttp2_session *session,
	const nghttp2_frame frame, void userp)
	{
	struct Curl_cfilter *cf = userp;
-	struct HTTP *stream;
+	struct stream_ctx *stream;
	struct Curl_easy *data_s = NULL;

	(void)cf;
@@ -1136,7 +1227,7 @@ static int on_begin_headers(nghttp2_session *session,
	return 0;
	}

-	stream = data_s->req.p.http;
+	stream = H2_STREAM_CTX(data_s);
	if(!stream \|\| !stream->bodystarted) {
	return 0;
	}
@@ -1152,7 +1243,7 @@ static int on_header(nghttp2_session session, const nghttp2_frame frame,
	void *userp)
	{
	struct Curl_cfilter *cf = userp;
-	struct HTTP *stream;
+	struct stream_ctx *stream;
	struct Curl_easy *data_s;
	int32_t stream_id = frame->hd.stream_id;
	CURLcode result;
@@ -1167,7 +1258,7 @@ static int on_header(nghttp2_session session, const nghttp2_frame frame,
	internal error more than anything else! */
	return NGHTTP2_ERR_CALLBACK_FAILURE;

-	stream = data_s->req.p.http;
+	stream = H2_STREAM_CTX(data_s);
	if(!stream) {
	failf(data_s, "Internal NULL stream");
	return NGHTTP2_ERR_CALLBACK_FAILURE;
@@ -1237,8 +1328,8 @@ static int on_header(nghttp2_session session, const nghttp2_frame frame,

	if(stream->bodystarted) {
	/* This is a trailer */
-	DEBUGF(LOG_CF(data_s, cf, "[h2sid=%u] trailer: %.s: %.s",
-	stream->stream_id,
+	DEBUGF(LOG_CF(data_s, cf, "[h2sid=%d] trailer: %.s: %.s",
+	stream->id,
	(int)namelen, name,
	(int)valuelen, value));
	result = Curl_dynhds_add(&stream->resp_trailers,
@@ -1277,8 +1368,8 @@ static int on_header(nghttp2_session session, const nghttp2_frame frame,
	if(CF_DATA_CURRENT(cf) != data_s)
	Curl_expire(data_s, 0, EXPIRE_RUN_NOW);

-	DEBUGF(LOG_CF(data_s, cf, "[h2sid=%u] status: HTTP/2 %03d",
-	stream->stream_id, stream->status_code));
+	DEBUGF(LOG_CF(data_s, cf, "[h2sid=%d] status: HTTP/2 %03d",
+	stream->id, stream->status_code));
	return 0;
	}

@@ -1301,8 +1392,8 @@ static int on_header(nghttp2_session session, const nghttp2_frame frame,
	if(CF_DATA_CURRENT(cf) != data_s)
	Curl_expire(data_s, 0, EXPIRE_RUN_NOW);

-	DEBUGF(LOG_CF(data_s, cf, "[h2sid=%u] header: %.s: %.s",
-	stream->stream_id,
+	DEBUGF(LOG_CF(data_s, cf, "[h2sid=%d] header: %.s: %.s",
+	stream->id,
	(int)namelen, name,
	(int)valuelen, value));

@@ -1318,7 +1409,7 @@ static ssize_t req_body_read_callback(nghttp2_session *session,
	{
	struct Curl_cfilter *cf = userp;
	struct Curl_easy *data_s;
-	struct HTTP *stream = NULL;
+	struct stream_ctx *stream = NULL;
	CURLcode result;
	ssize_t nread;
	(void)source;
@@ -1333,14 +1424,14 @@ static ssize_t req_body_read_callback(nghttp2_session *session,
	internal error more than anything else! */
	return NGHTTP2_ERR_CALLBACK_FAILURE;

-	stream = data_s->req.p.http;
+	stream = H2_STREAM_CTX(data_s);
	if(!stream)
	return NGHTTP2_ERR_CALLBACK_FAILURE;
	}
	else
	return NGHTTP2_ERR_INVALID_ARGUMENT;

-	nread = Curl_bufq_read(&stream->h2_sendbuf, buf, length, &result);
+	nread = Curl_bufq_read(&stream->sendbuf, buf, length, &result);
	if(nread < 0) {
	if(result != CURLE_AGAIN)
	return NGHTTP2_ERR_CALLBACK_FAILURE;
@@ -1350,7 +1441,7 @@ static ssize_t req_body_read_callback(nghttp2_session *session,
	if(nread > 0 && data_s->state.infilesize != -1)
	stream->upload_left -= nread;

-	DEBUGF(LOG_CF(data_s, cf, "[h2sid=%u] req_body_read(len=%zu) left=%zd"
+	DEBUGF(LOG_CF(data_s, cf, "[h2sid=%d] req_body_read(len=%zu) left=%zd"
	" -> %zd, %d",
	stream_id, length, stream->upload_left, nread, result));

@@ -1376,53 +1467,6 @@ static int error_callback(nghttp2_session *session,
	}
	#endif

-	static void http2_data_done(struct Curl_cfilter *cf,
-	struct Curl_easy *data, bool premature)
-	{
-	struct cf_h2_ctx *ctx = cf->ctx;
-	struct HTTP *stream = data->req.p.http;
-
-	/* there might be allocated resources done before this got the 'h2' pointer
-	setup */
-	Curl_bufq_free(&stream->h2_sendbuf);
-	Curl_bufq_free(&stream->h2_recvbuf);
-	Curl_dynhds_free(&stream->resp_trailers);
-	if(stream->push_headers) {
-	/* if they weren't used and then freed before */
-	for(; stream->push_headers_used > 0; --stream->push_headers_used) {
-	free(stream->push_headers[stream->push_headers_used - 1]);
-	}
-	free(stream->push_headers);
-	stream->push_headers = NULL;
-	}
-
-	if(!ctx \|\| !ctx->h2)
-	return;
-
-	(void)premature;
-	if(!stream->closed && stream->stream_id) {
-	/* RST_STREAM */
-	DEBUGF(LOG_CF(data, cf, "[h2sid=%u] premature DATA_DONE, RST stream",
-	stream->stream_id));
-	if(!nghttp2_submit_rst_stream(ctx->h2, NGHTTP2_FLAG_NONE,
-	stream->stream_id, NGHTTP2_STREAM_CLOSED))
-	(void)nghttp2_session_send(ctx->h2);
-	}
-
-	drained_transfer(cf, data);
-
-	/* -1 means unassigned and 0 means cleared */
-	if(nghttp2_session_get_stream_user_data(ctx->h2, stream->stream_id)) {
-	int rv = nghttp2_session_set_stream_user_data(ctx->h2,
-	stream->stream_id, 0);
-	if(rv) {
-	infof(data, "http/2: failed to clear user_data for stream %u",
-	stream->stream_id);
-	DEBUGASSERT(0);
-	}
-	}
-	}
-
	/*
	* Append headers to ask for an HTTP1.1 to HTTP2 upgrade.
	*/
@@ -1467,12 +1511,12 @@ static CURLcode http2_data_done_send(struct Curl_cfilter *cf,
	{
	struct cf_h2_ctx *ctx = cf->ctx;
	CURLcode result = CURLE_OK;
-	struct HTTP *stream = data->req.p.http;
+	struct stream_ctx *stream = H2_STREAM_CTX(data);

-	if(!ctx \|\| !ctx->h2)
+	if(!ctx \|\| !ctx->h2 \|\| !stream)
	goto out;

-	DEBUGF(LOG_CF(data, cf, "[h2sid=%u] data done", stream->stream_id));
+	DEBUGF(LOG_CF(data, cf, "[h2sid=%d] data done", stream->id));
	if(stream->upload_left) {
	/* If the stream still thinks there's data left to upload. */
	if(stream->upload_left == -1)
@@ -1480,7 +1524,7 @@ static CURLcode http2_data_done_send(struct Curl_cfilter *cf,

	/* resume sending here to trigger the callback to get called again so
	that it can signal EOF to nghttp2 */
-	(void)nghttp2_session_resume_data(ctx->h2, stream->stream_id);
+	(void)nghttp2_session_resume_data(ctx->h2, stream->id);
	drain_this(cf, data);
	}

@@ -1490,15 +1534,16 @@ out:

	static ssize_t http2_handle_stream_close(struct Curl_cfilter *cf,
	struct Curl_easy *data,
-	struct HTTP stream, CURLcode err)
+	CURLcode *err)
	{
+	struct stream_ctx *stream = H2_STREAM_CTX(data);
	ssize_t rv = 0;

	drained_transfer(cf, data);

	if(stream->error == NGHTTP2_REFUSED_STREAM) {
-	DEBUGF(LOG_CF(data, cf, "[h2sid=%u] REFUSED_STREAM, try again on a new "
-	"connection", stream->stream_id));
+	DEBUGF(LOG_CF(data, cf, "[h2sid=%d] REFUSED_STREAM, try again on a new "
+	"connection", stream->id));
	connclose(cf->conn, "REFUSED_STREAM"); /* don't use this anymore */
	data->state.refused_stream = TRUE;
	err = CURLE_RECV_ERROR; / trigger Curl_retry_request() later */
@@ -1506,13 +1551,13 @@ static ssize_t http2_handle_stream_close(struct Curl_cfilter *cf,
	}
	else if(stream->error != NGHTTP2_NO_ERROR) {
	failf(data, "HTTP/2 stream %u was not closed cleanly: %s (err %u)",
-	stream->stream_id, nghttp2_http2_strerror(stream->error),
+	stream->id, nghttp2_http2_strerror(stream->error),
	stream->error);
	*err = CURLE_HTTP2_STREAM;
	return -1;
	}
	else if(stream->reset) {
-	failf(data, "HTTP/2 stream %u was reset", stream->stream_id);
+	failf(data, "HTTP/2 stream %u was reset", stream->id);
	*err = stream->bodystarted? CURLE_PARTIAL_FILE : CURLE_RECV_ERROR;
	return -1;
	}
@@ -1520,7 +1565,7 @@ static ssize_t http2_handle_stream_close(struct Curl_cfilter *cf,
	if(!stream->bodystarted) {
	failf(data, "HTTP/2 stream %u was closed cleanly, but before getting "
	" all response header fields, treated as error",
-	stream->stream_id);
+	stream->id);
	*err = CURLE_HTTP2_STREAM;
	return -1;
	}
@@ -1587,9 +1632,8 @@ static void h2_pri_spec(struct Curl_easy *data,
	nghttp2_priority_spec *pri_spec)
	{
	struct Curl_data_priority *prio = &data->set.priority;
-	struct HTTP *depstream = (prio->parent?
-	prio->parent->req.p.http:NULL);
-	int32_t depstream_id = depstream? depstream->stream_id:0;
+	struct stream_ctx *depstream = H2_STREAM_CTX(prio->parent);
+	int32_t depstream_id = depstream? depstream->id:0;
	nghttp2_priority_spec_init(pri_spec, depstream_id,
	sweight_wanted(data),
	data->set.priority.exclusive);
@@ -1606,7 +1650,7 @@ static CURLcode h2_progress_egress(struct Curl_cfilter *cf,
	struct Curl_easy *data)
	{
	struct cf_h2_ctx *ctx = cf->ctx;
-	struct HTTP *stream = data->req.p.http;
+	struct stream_ctx *stream = H2_STREAM_CTX(data);
	int rv = 0;

	if((sweight_wanted(data) != sweight_in_effect(data)) \|\|
@@ -1616,11 +1660,11 @@ static CURLcode h2_progress_egress(struct Curl_cfilter *cf,
	nghttp2_priority_spec pri_spec;

	h2_pri_spec(data, &pri_spec);
-	DEBUGF(LOG_CF(data, cf, "[h2sid=%u] Queuing PRIORITY",
-	stream->stream_id));
-	DEBUGASSERT(stream->stream_id != -1);
+	DEBUGF(LOG_CF(data, cf, "[h2sid=%d] Queuing PRIORITY",
+	stream->id));
+	DEBUGASSERT(stream->id != -1);
	rv = nghttp2_submit_priority(ctx->h2, NGHTTP2_FLAG_NONE,
-	stream->stream_id, &pri_spec);
+	stream->id, &pri_spec);
	if(rv)
	goto out;
	}
@@ -1639,13 +1683,13 @@ static ssize_t stream_recv(struct Curl_cfilter cf, struct Curl_easy data,
	char buf, size_t len, CURLcode err)
	{
	struct cf_h2_ctx *ctx = cf->ctx;
-	struct HTTP *stream = data->req.p.http;
+	struct stream_ctx *stream = H2_STREAM_CTX(data);
	ssize_t nread = -1;

	*err = CURLE_AGAIN;
	drained_transfer(cf, data);
-	if(!Curl_bufq_is_empty(&stream->h2_recvbuf)) {
-	nread = Curl_bufq_read(&stream->h2_recvbuf,
+	if(!Curl_bufq_is_empty(&stream->recvbuf)) {
+	nread = Curl_bufq_read(&stream->recvbuf,
	(unsigned char *)buf, len, err);
	DEBUGF(LOG_CF(data, cf, "recvbuf read(len=%zu) -> %zd, %d",
	len, nread, *err));
@@ -1656,11 +1700,11 @@ static ssize_t stream_recv(struct Curl_cfilter cf, struct Curl_easy data,

	if(nread < 0) {
	if(stream->closed) {
-	nread = http2_handle_stream_close(cf, data, stream, err);
+	nread = http2_handle_stream_close(cf, data, err);
	}
	else if(stream->reset \|\|
	(ctx->conn_closed && Curl_bufq_is_empty(&ctx->inbufq)) \|\|
-	(ctx->goaway && ctx->last_stream_id < stream->stream_id)) {
+	(ctx->goaway && ctx->last_stream_id < stream->id)) {
	*err = stream->bodystarted? CURLE_PARTIAL_FILE : CURLE_RECV_ERROR;
	nread = -1;
	}
@@ -1680,7 +1724,7 @@ static CURLcode h2_progress_ingress(struct Curl_cfilter *cf,
	struct Curl_easy *data)
	{
	struct cf_h2_ctx *ctx = cf->ctx;
-	struct HTTP *stream = data->req.p.http;
+	struct stream_ctx *stream;
	CURLcode result = CURLE_OK;
	ssize_t nread;

@@ -1693,12 +1737,14 @@ static CURLcode h2_progress_ingress(struct Curl_cfilter *cf,
	}

	/* Receive data from the "lower" filters, e.g. network until
-	* it is time to stop or we have enough data for this stream */
-	while(!ctx->conn_closed && /* not closed the connection */
-	!stream->closed && /* nor the stream */
-	Curl_bufq_is_empty(&ctx->inbufq) && /* and we consumed our input */
-	!Curl_bufq_is_full(&stream->h2_recvbuf) && /* enough? */
-	1 /* Curl_bufq_len(&stream->h2_recvbuf) < data->set.buffer_size */) {
+	* it is time to stop due to connection close or us not processing
+	* all network input */
+	while(!ctx->conn_closed && Curl_bufq_is_empty(&ctx->inbufq)) {
+	/* Also, when the stream exists, break the loop when it has become
+	* closed or its receive buffer is full */
+	stream = H2_STREAM_CTX(data);
+	if(stream && (stream->closed \|\| Curl_bufq_is_full(&stream->recvbuf)))
+	break;

	nread = Curl_bufq_slurp(&ctx->inbufq, nw_in_reader, cf, &result);
	DEBUGF(LOG_CF(data, cf, "read %zd bytes nw data -> %zd, %d",
@@ -1730,18 +1776,18 @@ static ssize_t cf_h2_recv(struct Curl_cfilter cf, struct Curl_easy data,
	char buf, size_t len, CURLcode err)
	{
	struct cf_h2_ctx *ctx = cf->ctx;
-	struct HTTP *stream = data->req.p.http;
+	struct stream_ctx *stream = H2_STREAM_CTX(data);
	ssize_t nread = -1;
	CURLcode result;
	struct cf_call_data save;

	CF_DATA_SAVE(save, cf, data);

-	DEBUGF(LOG_CF(data, cf, "[h2sid=%u] cf_recv: win %u/%u",
-	stream->stream_id,
+	DEBUGF(LOG_CF(data, cf, "[h2sid=%d] cf_recv: win %u/%u",
+	stream->id,
	nghttp2_session_get_local_window_size(ctx->h2),
	nghttp2_session_get_stream_local_window_size(ctx->h2,
-	stream->stream_id)
+	stream->id)
	));
	nread = stream_recv(cf, data, buf, len, err);
	if(nread < 0 && *err != CURLE_AGAIN)
@@ -1760,24 +1806,24 @@ static ssize_t cf_h2_recv(struct Curl_cfilter cf, struct Curl_easy data,
	/* Now that we transferred this to the upper layer, we report
	* the actual amount of DATA consumed to the H2 session, so
	* that it adjusts stream flow control */
-	if(stream->h2_recv_hds_len >= data_consumed) {
-	stream->h2_recv_hds_len -= data_consumed; /* no DATA */
+	if(stream->resp_hds_len >= data_consumed) {
+	stream->resp_hds_len -= data_consumed; /* no DATA */
	}
	else {
-	if(stream->h2_recv_hds_len) {
-	data_consumed -= stream->h2_recv_hds_len;
-	stream->h2_recv_hds_len = 0;
+	if(stream->resp_hds_len) {
+	data_consumed -= stream->resp_hds_len;
+	stream->resp_hds_len = 0;
	}
	if(data_consumed) {
-	DEBUGF(LOG_CF(data, cf, "[h2sid=%u] increase window by %zu",
-	stream->stream_id, data_consumed));
-	nghttp2_session_consume(ctx->h2, stream->stream_id, data_consumed);
+	DEBUGF(LOG_CF(data, cf, "[h2sid=%d] increase window by %zu",
+	stream->id, data_consumed));
+	nghttp2_session_consume(ctx->h2, stream->id, data_consumed);
	}
	}

	if(stream->closed) {
-	DEBUGF(LOG_CF(data, cf, "[h2sid=%u] closed stream, set drain",
-	stream->stream_id));
+	DEBUGF(LOG_CF(data, cf, "[h2sid=%d] closed stream, set drain",
+	stream->id));
	drain_this(cf, data);
	}
	}
@@ -1788,8 +1834,8 @@ out:
	*err = result;
	nread = -1;
	}
-	DEBUGF(LOG_CF(data, cf, "[h2sid=%u] cf_recv(len=%zu) -> %zd %d",
-	stream->stream_id, len, nread, *err));
+	DEBUGF(LOG_CF(data, cf, "[h2sid=%d] cf_recv(len=%zu) -> %zd %d",
+	stream->id, len, nread, *err));
	CF_DATA_RESTORE(cf, save);
	return nread;
	}
@@ -1804,7 +1850,7 @@ static ssize_t cf_h2_send(struct Curl_cfilter cf, struct Curl_easy data,
	*/
	struct cf_h2_ctx *ctx = cf->ctx;
	int rv;
-	struct HTTP *stream = data->req.p.http;
+	struct stream_ctx *stream = H2_STREAM_CTX(data);
	nghttp2_nv *nva = NULL;
	size_t nheader;
	nghttp2_data_provider data_prd;
@@ -1817,35 +1863,35 @@ static ssize_t cf_h2_send(struct Curl_cfilter cf, struct Curl_easy data,

	CF_DATA_SAVE(save, cf, data);

-	if(stream->stream_id != -1) {
-	DEBUGF(LOG_CF(data, cf, "[h2sid=%u] cf_send: win %u/%u",
-	stream->stream_id,
+	if(stream && stream->id != -1) {
+	DEBUGF(LOG_CF(data, cf, "[h2sid=%d] cf_send: win %u/%u",
+	stream->id,
	nghttp2_session_get_remote_window_size(ctx->h2),
	nghttp2_session_get_stream_remote_window_size(
-	ctx->h2, stream->stream_id)
+	ctx->h2, stream->id)
	));

	if(stream->close_handled) {
-	infof(data, "stream %u closed", stream->stream_id);
+	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);
+	nwritten = http2_handle_stream_close(cf, data, err);
	goto out;
	}
	/* If stream_id != -1, we have dispatched request HEADERS, and now
	are going to send or sending request body in DATA frame */
-	nwritten = Curl_bufq_write(&stream->h2_sendbuf, buf, len, err);
+	nwritten = Curl_bufq_write(&stream->sendbuf, buf, len, err);
	if(nwritten < 0) {
	if(*err != CURLE_AGAIN)
	goto out;
	nwritten = 0;
	}

-	if(!Curl_bufq_is_empty(&stream->h2_sendbuf)) {
-	rv = nghttp2_session_resume_data(ctx->h2, stream->stream_id);
+	if(!Curl_bufq_is_empty(&stream->sendbuf)) {
+	rv = nghttp2_session_resume_data(ctx->h2, stream->id);
	if(nghttp2_is_fatal(rv)) {
	*err = CURLE_SEND_ERROR;
	nwritten = -1;
@@ -1876,35 +1922,44 @@ static ssize_t cf_h2_send(struct Curl_cfilter cf, struct Curl_easy data,

	if(!nwritten) {
	size_t rwin = nghttp2_session_get_stream_remote_window_size(ctx->h2,
-	stream->stream_id);
-	DEBUGF(LOG_CF(data, cf, "[h2sid=%u] cf_send: win %u/%zu",
-	stream->stream_id,
+	stream->id);
+	DEBUGF(LOG_CF(data, cf, "[h2sid=%d] cf_send: win %u/%zu",
+	stream->id,
	nghttp2_session_get_remote_window_size(ctx->h2), rwin));
	if(rwin == 0) {
	/* We cannot upload more as the stream's remote window size
	* is 0. We need to receive WIN_UPDATEs before we can continue.
	*/
	data->req.keepon \|= KEEP_SEND_HOLD;
-	DEBUGF(LOG_CF(data, cf, "[h2sid=%u] holding send as remote flow "
-	"window is exhausted", stream->stream_id));
+	DEBUGF(LOG_CF(data, cf, "[h2sid=%d] holding send as remote flow "
+	"window is exhausted", stream->id));
	}
	}
	/* handled writing BODY for open stream. */
	goto out;
	}

-	DEBUGF(LOG_CF(data, cf, "cf_send, submit %s", data->state.url));
-	if(!stream->h2_send_hds_len) {
+	*err = http2_data_setup(cf, data, &stream);
+	if(*err) {
+	nwritten = -1;
+	goto out;
+	}
+
+	if(!stream->req_hds_len) {
	/* first invocation carries the HTTP/1.1 formatted request headers.
	* we remember that in case we EAGAIN this call, because the next
	* invocation may have added request body data into the buffer. */
-	stream->h2_send_hds_len = len;
+	stream->req_hds_len = len;
+	DEBUGF(LOG_CF(data, cf, "cf_send, first submit (len=%zu, hds_len=%zu)",
+	len, stream->req_hds_len));
	}

	/* Stream has not been opened yet. `buf` is expected to contain
-	* `stream->h2_send_hds_len` bytes of request headers. */
-	DEBUGASSERT(stream->h2_send_hds_len <= len);
-	result = Curl_pseudo_headers(data, buf, stream->h2_send_hds_len,
+	* `stream->req_hds_len` bytes of request headers. */
+	DEBUGF(LOG_CF(data, cf, "cf_send, submit %s (len=%zu, hds_len=%zu)",
+	data->state.url, len, stream->req_hds_len));
+	DEBUGASSERT(stream->req_hds_len <= len);
+	result = Curl_pseudo_headers(data, buf, stream->req_hds_len,
	NULL, &hreq);
	if(result) {
	*err = result;
@@ -1946,7 +2001,7 @@ static ssize_t cf_h2_send(struct Curl_cfilter cf, struct Curl_easy data,
	stream->upload_left = data->state.infilesize;
	else
	/* data sending without specifying the data amount up front */
-	stream->upload_left = -1; /* unknown, but not zero */
+	stream->upload_left = -1; /* unknown */

	data_prd.read_callback = req_body_read_callback;
	data_prd.source.ptr = NULL;
@@ -1954,6 +2009,7 @@ static ssize_t cf_h2_send(struct Curl_cfilter cf, struct Curl_easy data,
	&data_prd, data);
	break;
	default:
+	stream->upload_left = 0; /* no request body */
	stream_id = nghttp2_submit_request(ctx->h2, &pri_spec, nva, nheader,
	NULL, data);
	}
@@ -1968,12 +2024,12 @@ static ssize_t cf_h2_send(struct Curl_cfilter cf, struct Curl_easy data,
	goto out;
	}

-	DEBUGF(LOG_CF(data, cf, "[h2sid=%u] cf_send(len=%zu) submit %s",
+	DEBUGF(LOG_CF(data, cf, "[h2sid=%d] cf_send(len=%zu) submit %s",
	stream_id, len, data->state.url));
	infof(data, "Using Stream ID: %u (easy handle %p)",
	stream_id, (void *)data);
-	stream->stream_id = stream_id;
-	nwritten = stream->h2_send_hds_len;
+	stream->id = stream_id;
+	nwritten = stream->req_hds_len;

	result = h2_progress_ingress(cf, data);
	if(result) {
@@ -1997,8 +2053,8 @@ static ssize_t cf_h2_send(struct Curl_cfilter cf, struct Curl_easy data,
	}

	out:
-	DEBUGF(LOG_CF(data, cf, "[h2sid=%u] cf_send -> %zd, %d",
-	stream->stream_id, nwritten, *err));
+	DEBUGF(LOG_CF(data, cf, "[h2sid=%d] cf_send -> %zd, %d",
+	stream->id, nwritten, *err));
	CF_DATA_RESTORE(cf, save);
	return nwritten;
	}
@@ -2009,7 +2065,7 @@ static int cf_h2_get_select_socks(struct Curl_cfilter *cf,
	{
	struct cf_h2_ctx *ctx = cf->ctx;
	struct SingleRequest *k = &data->req;
-	struct HTTP *stream = data->req.p.http;
+	struct stream_ctx *stream = H2_STREAM_CTX(data);
	int bitmap = GETSOCK_BLANK;
	struct cf_call_data save;

@@ -2027,7 +2083,7 @@ static int cf_h2_get_select_socks(struct Curl_cfilter *cf,
	nghttp2_session_want_write(ctx->h2)) &&
	(nghttp2_session_get_remote_window_size(ctx->h2) &&
	nghttp2_session_get_stream_remote_window_size(ctx->h2,
-	stream->stream_id)))
+	stream->id)))
	bitmap \|= GETSOCK_WRITESOCK(0);

	CF_DATA_RESTORE(cf, save);
@@ -2109,18 +2165,18 @@ static CURLcode http2_data_pause(struct Curl_cfilter *cf,
	struct Curl_easy *data,
	bool pause)
	{
+	#ifdef NGHTTP2_HAS_SET_LOCAL_WINDOW_SIZE
	struct cf_h2_ctx *ctx = cf->ctx;
+	struct stream_ctx *stream = H2_STREAM_CTX(data);

	DEBUGASSERT(data);
-	#ifdef NGHTTP2_HAS_SET_LOCAL_WINDOW_SIZE
-	if(ctx && ctx->h2) {
-	struct HTTP *stream = data->req.p.http;
+	if(ctx && ctx->h2 && stream) {
	uint32_t window = !pause * H2_STREAM_WINDOW_SIZE;
	CURLcode result;

	int rv = nghttp2_session_set_local_window_size(ctx->h2,
	NGHTTP2_FLAG_NONE,
-	stream->stream_id,
+	stream->id,
	window);
	if(rv) {
	failf(data, "nghttp2_session_set_local_window_size() failed: %s(%d)",
@@ -2134,16 +2190,16 @@ static CURLcode http2_data_pause(struct Curl_cfilter *cf,
	return result;

	DEBUGF(infof(data, "Set HTTP/2 window size to %u for stream %u",
-	window, stream->stream_id));
+	window, stream->id));

	#ifdef DEBUGBUILD
	{
	/* read out the stream local window again */
	uint32_t window2 =
	nghttp2_session_get_stream_local_window_size(ctx->h2,
-	stream->stream_id);
+	stream->id);
	DEBUGF(infof(data, "HTTP/2 window size is now %u for stream %u",
-	window2, stream->stream_id));
+	window2, stream->id));
	}
	#endif
	}
@@ -2162,10 +2218,8 @@ static CURLcode cf_h2_cntrl(struct Curl_cfilter *cf,

	CF_DATA_SAVE(save, cf, data);
	switch(event) {
-	case CF_CTRL_DATA_SETUP: {
-	result = http2_data_setup(cf, data);
+	case CF_CTRL_DATA_SETUP:
	break;
-	}
	case CF_CTRL_DATA_PAUSE:
	result = http2_data_pause(cf, data, (arg1 != 0));
	break;
@@ -2188,10 +2242,10 @@ static bool cf_h2_data_pending(struct Curl_cfilter *cf,
	const struct Curl_easy *data)
	{
	struct cf_h2_ctx *ctx = cf->ctx;
-	struct HTTP *stream = data->req.p.http;
+	struct stream_ctx *stream = H2_STREAM_CTX(data);

	if(ctx && (!Curl_bufq_is_empty(&ctx->inbufq)
-	\|\| (stream && !Curl_bufq_is_empty(&stream->h2_recvbuf))))
+	\|\| (stream && !Curl_bufq_is_empty(&stream->recvbuf))))
	return TRUE;
	return cf->next? cf->next->cft->has_data_pending(cf->next, data) : FALSE;
	}
@@ -2483,7 +2537,7 @@ CURLcode Curl_http2_upgrade(struct Curl_easy *data,
	CURLE_HTTP2_STREAM error! */
	bool Curl_h2_http_1_1_error(struct Curl_easy *data)
	{
-	struct HTTP *stream = data->req.p.http;
+	struct stream_ctx *stream = H2_STREAM_CTX(data);
	return (stream && stream->error == NGHTTP2_HTTP_1_1_REQUIRED);
	}

lib/vquic/curl_msh3.c+2 -2

@@ -148,9 +148,9 @@ struct stream_ctx {
	};

	#define H3_STREAM_CTX(d) ((struct stream_ctx *)(((d) && (d)->req.p.http)? \
-	((struct HTTP *)(d)->req.p.http)->impl_ctx \
+	((struct HTTP *)(d)->req.p.http)->h3_ctx \
	: NULL))
-	#define H3_STREAM_LCTX(d) ((struct HTTP *)(d)->req.p.http)->impl_ctx
+	#define H3_STREAM_LCTX(d) ((struct HTTP *)(d)->req.p.http)->h3_ctx
	#define H3_STREAM_ID(d) (H3_STREAM_CTX(d)? \
	H3_STREAM_CTX(d)->id : -2)

lib/vquic/curl_ngtcp2.c+17 -13

@@ -186,9 +186,9 @@ struct stream_ctx {
	};

	#define H3_STREAM_CTX(d) ((struct stream_ctx *)(((d) && (d)->req.p.http)? \
-	((struct HTTP *)(d)->req.p.http)->impl_ctx \
+	((struct HTTP *)(d)->req.p.http)->h3_ctx \
	: NULL))
-	#define H3_STREAM_LCTX(d) ((struct HTTP *)(d)->req.p.http)->impl_ctx
+	#define H3_STREAM_LCTX(d) ((struct HTTP *)(d)->req.p.http)->h3_ctx
	#define H3_STREAM_ID(d) (H3_STREAM_CTX(d)? \
	H3_STREAM_CTX(d)->id : -2)

@@ -198,6 +198,11 @@ static CURLcode h3_data_setup(struct Curl_cfilter *cf,
	struct cf_ngtcp2_ctx *ctx = cf->ctx;
	struct stream_ctx *stream = H3_STREAM_CTX(data);

+	if(!data \|\| !data->req.p.http) {
+	failf(data, "initialization failure, transfer not http initialized");
+	return CURLE_FAILED_INIT;
+	}
+
	if(stream)
	return CURLE_OK;

@@ -1517,7 +1522,7 @@ static CURLcode h3_stream_open(struct Curl_cfilter *cf,
	size_t len)
	{
	struct cf_ngtcp2_ctx *ctx = cf->ctx;
-	struct stream_ctx *stream = H3_STREAM_CTX(data);
+	struct stream_ctx *stream = NULL;
	size_t nheader;
	CURLcode result = CURLE_OK;
	nghttp3_nv *nva = NULL;
@@ -1527,6 +1532,11 @@ static CURLcode h3_stream_open(struct Curl_cfilter *cf,
	nghttp3_data_reader reader;
	nghttp3_data_reader *preader = NULL;

+	result = h3_data_setup(cf, data);
+	if(result)
+	goto out;
+	stream = H3_STREAM_CTX(data);
+
	rc = ngtcp2_conn_open_bidi_stream(ctx->qconn, &stream->id, NULL);
	if(rc) {
	failf(data, "can get bidi streams");
@@ -1579,7 +1589,7 @@ static CURLcode h3_stream_open(struct Curl_cfilter *cf,
	stream->id, data->state.url));

	out:
-	if(!result && rc) {
+	if(stream && !result && rc) {
	switch(rc) {
	case NGHTTP3_ERR_CONN_CLOSING:
	DEBUGF(LOG_CF(data, cf, "h3sid[%"PRId64"] failed to send, "
@@ -1612,13 +1622,13 @@ static ssize_t cf_ngtcp2_send(struct Curl_cfilter cf, struct Curl_easy data,
	DEBUGASSERT(ctx->h3conn);
	*err = CURLE_OK;

-	if(stream->closed) {
+	if(stream && stream->closed) {
	*err = CURLE_HTTP3;
	sent = -1;
	goto out;
	}

-	if(stream->id < 0) {
+	if(!stream \|\| stream->id < 0) {
	CURLcode result = h3_stream_open(cf, data, buf, len);
	if(result) {
	DEBUGF(LOG_CF(data, cf, "failed to open stream -> %d", result));
@@ -2070,10 +2080,8 @@ static CURLcode cf_ngtcp2_data_event(struct Curl_cfilter *cf,
	(void)arg1;
	(void)arg2;
	switch(event) {
-	case CF_CTRL_DATA_SETUP: {
-	result = h3_data_setup(cf, data);
+	case CF_CTRL_DATA_SETUP:
	break;
-	}
	case CF_CTRL_DATA_DONE: {
	h3_data_done(cf, data);
	break;
@@ -2235,10 +2243,6 @@ static CURLcode cf_connect_start(struct Curl_cfilter *cf,
	if(result)
	return result;

-	result = h3_data_setup(cf, data);
-	if(result)
-	return result;
-
	Curl_cf_socket_peek(cf->next, data, &ctx->q.sockfd,
	&sockaddr, NULL, NULL, NULL, NULL);
	ctx->q.local_addrlen = sizeof(ctx->q.local_addr);

lib/vquic/curl_quiche.c+2 -2

@@ -197,9 +197,9 @@ struct stream_ctx {
	};

	#define H3_STREAM_CTX(d) ((struct stream_ctx *)(((d) && (d)->req.p.http)? \
-	((struct HTTP *)(d)->req.p.http)->impl_ctx \
+	((struct HTTP *)(d)->req.p.http)->h3_ctx \
	: NULL))
-	#define H3_STREAM_LCTX(d) ((struct HTTP *)(d)->req.p.http)->impl_ctx
+	#define H3_STREAM_LCTX(d) ((struct HTTP *)(d)->req.p.http)->h3_ctx
	#define H3_STREAM_ID(d) (H3_STREAM_CTX(d)? \
	H3_STREAM_CTX(d)->id : -2)