← Commit list

c6655f7029

Stefan Eissing

2024-04-17

SUCCESS Duration: 85s

Subject

http/2, http/3: decouple stream state from easy handle

Binary

Download Binary (813 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 c6655f7029ec5c128561e3ecf1f93db3ed0432a4
Previous HEAD position was 0b4401a4fb lib: silence warnings on comma misuse
HEAD is now at c6655f7029 http/2, http/3: decouple stream state from easy handle

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

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

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

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

$ chmod +x configure

$ ./configure --disable-shared --without-ssl --disable-docs
checking whether to enable maintainer-specific portions of Makefiles... no
checking whether make supports nested variables... yes
checking whether to enable debug build options... no
checking whether to enable compiler optimizer... (assumed) yes
checking whether to enable strict compiler warnings... no
checking whether to enable compiler warnings as errors... no
checking whether to enable curl debug memory tracking... no
checking whether to enable hiding of library internal symbols... yes
checking whether to enable c-ares for DNS lookups... no
checking whether to disable dependency on -lrt... (assumed no)
checking whether to enable HTTPSRR support... 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.8.0-DEV
checking for httpd... no
checking for apache2... no
checking for apachectl... no
checking for apxs... no
configure: httpd/apache2 not in PATH, http tests disabled
configure: apxs not in PATH, http tests disabled
checking for nghttpx... no
checking for caddy... no
checking build system type... x86_64-pc-linux-gnu
checking host system type... x86_64-pc-linux-gnu
checking for grep that handles long lines and -e... (cached) /usr/bin/grep
checking for egrep... /usr/bin/grep -E
checking if OS is AIX (to define _ALL_SOURCE)... no
checking if _THREAD_SAFE is already defined... no
checking if _THREAD_SAFE is actually needed... no
checking if _THREAD_SAFE is onwards defined... no
checking if _REENTRANT is already defined... no
checking if _REENTRANT is actually needed... no
checking if _REENTRANT is onwards defined... no
checking for special C compiler options needed for large files... no
checking for _FILE_OFFSET_BITS value needed for large files... no
checking how to print strings... printf
checking for a sed that does not truncate output... (cached) /usr/bin/sed
checking for fgrep... /usr/bin/grep -F
checking for ld used by ccache gcc... /usr/bin/ld
checking if the linker (/usr/bin/ld) is GNU ld... yes
checking for BSD- or MS-compatible name lister (nm)... /usr/bin/nm -B
checking the name lister (/usr/bin/nm -B) interface... BSD nm
checking whether ln -s works... yes
checking the maximum length of command line arguments... 1572864
checking how to convert x86_64-pc-linux-gnu file names to x86_64-pc-linux-gnu format... func_convert_file_noop
checking how to convert x86_64-pc-linux-gnu file names to toolchain format... func_convert_file_noop
checking for /usr/bin/ld option to reload object files... -r
checking for objdump... objdump
checking how to recognize dependent libraries... pass_all
checking for dlltool... no
checking how to associate runtime and link libraries... printf %s\n
checking for archiver @FILE support... @
checking for strip... strip
checking for ranlib... ranlib
checking command to parse /usr/bin/nm -B output from ccache gcc object... ok
checking for sysroot... no
checking for a working dd... /usr/bin/dd
checking how to truncate binary pipes... /usr/bin/dd bs=4096 count=1
checking for mt... mt
checking if mt is a manifest tool... no
checking for dlfcn.h... yes
checking for objdir... .libs
checking if ccache gcc supports -fno-rtti -fno-exceptions... no
checking for ccache gcc option to produce PIC... -fPIC -DPIC
checking if ccache gcc PIC flag -fPIC -DPIC works... yes
checking if ccache gcc static flag -static works... yes
checking if ccache gcc supports -c -o file.o... yes
checking if ccache gcc supports -c -o file.o... (cached) yes
checking whether the ccache gcc linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes
checking dynamic linker characteristics... GNU/Linux ld.so
checking how to hardcode library paths into programs... immediate
checking whether stripping libraries is possible... yes
checking if libtool supports shared libraries... yes
checking whether to build shared libraries... no
checking whether to build static libraries... yes
checking whether to build shared libraries with -version-info... yes
checking whether to build shared libraries with -no-undefined... no
checking whether to build shared libraries with -mimpure-text... no
checking whether to build shared libraries with PIC... yes
checking whether to build static libraries with PIC... yes
checking whether to build shared libraries only... no
checking whether to build static libraries only... yes
checking for windres... no
checking for inline... inline
checking if cpp -P is needed... yes
checking if cpp -P works... yes
checking if compiler is DEC/Compaq/HP C... no
checking if compiler is HP-UX C... no
checking if compiler is IBM C... no
checking if compiler is Intel C... no
checking if compiler is clang... no
checking if compiler is GNU C... yes
checking compiler version... gcc '1100' (raw: '11')
checking if compiler is SGI MIPSpro C... no
checking if compiler is SGI MIPS C... no
checking if compiler is SunPro C... no
checking if compiler is Tiny C... no
checking whether build target is a native Windows one... no
checking if compiler accepts some basic options... yes
configure: compiler options added: -Werror-implicit-function-declaration
checking if compiler optimizer assumed setting might be used... yes
checking if compiler accepts optimizer enabling options... yes
configure: compiler options added: -O2
checking if compiler accepts strict warning options... yes
configure: compiler options added: -Wno-system-headers
checking if compiler halts on compilation errors... yes
checking if compiler halts on negative sized arrays... yes
checking if compiler halts on function prototype mismatch... yes
checking if compiler supports hiding library internal symbols... yes
checking whether build target supports WIN32 file API... no
checking whether build target supports WIN32 crypto API... no
checking for good-to-use Darwin CFLAGS... no
checking whether to link macOS CoreFoundation, CoreServices, and SystemConfiguration frameworks... no
checking to see if the compiler supports __builtin_available()... no
checking whether to support http... yes
checking whether to support ftp... yes
checking whether to support file... yes
checking whether to support ldap... yes
checking whether to support ldaps... yes
checking whether to support rtsp... yes
checking whether to support proxies... yes
checking whether to support dict... yes
checking whether to support telnet... yes
checking whether to support tftp... yes
checking whether to support pop3... yes
checking whether to support imap... yes
checking whether to support smb... yes
checking whether to support smtp... yes
checking whether to support gopher... yes
checking whether to support mqtt... no
checking whether to provide built-in manual... yes
checking whether to build documentation... no
checking whether to enable generation of C code... yes
checking whether to use libgcc... no
checking if X/Open network library is required... no
checking for gethostbyname... yes
checking whether build target is a native Windows one... (cached) no
checking for proto/bsdsocket.h... no
checking for connect in libraries... yes
checking for sys/types.h... (cached) yes
checking for sys/time.h... yes
checking for monotonic clock_gettime... yes
checking for clock_gettime in libraries... no additional lib required
checking if monotonic clock_gettime works... yes
checking for sys/types.h... (cached) yes
checking for sys/time.h... (cached) yes
checking for raw monotonic clock_gettime... yes
checking for pkg-config... /usr/bin/pkg-config
checking for zlib options with pkg-config... found
checking for zlib.h... yes
configure: found both libz and libz.h header
checking for BrotliDecoderDecompress in -lbrotlidec... no
checking for brotli/decode.h... no
checking for ZSTD_createDStream in -lzstd... no
checking for zstd.h... no
checking for lber.h... no
checking for ldap.h... no
checking for ldap_ssl.h... no
checking for LDAP libraries... cannot find LDAP libraries
checking whether to enable IPv6... yes
checking if struct sockaddr_in6 has sin6_scope_id member... yes
checking if argv can be written to... yes
checking if GSS-API support is requested... no
checking whether to enable Windows native SSL/TLS... no
checking whether to enable Secure Transport... no
checking whether to enable Amiga native SSL/TLS (AmiSSL v5)... no
checking for psl_builtin in -lpsl... yes
checking for libpsl.h... yes
checking for library containing gsasl_init... no
checking for RTMP_Init in -lrtmp... no
checking whether versioned symbols are wanted... no
checking whether to enable Windows native IDN (Windows native builds only)... no
checking whether to build with libidn2... (assumed) yes
checking for pkg-config... (cached) /usr/bin/pkg-config
checking for libidn2 options with pkg-config... no
configure: IDN_LIBS: "-lidn2"
configure: IDN_LDFLAGS: ""
configure: IDN_CPPFLAGS: ""
configure: IDN_DIR: ""
checking if idn2_lookup_ul can be linked... no
checking for idn2.h... no
checking for pkg-config... (cached) /usr/bin/pkg-config
checking for libnghttp2 options with pkg-config... no
checking for nghttp2_session_get_stream_local_window_size in -lnghttp2... no
checking for sys/types.h... (cached) yes
checking for sys/time.h... (cached) yes
checking for sys/select.h... yes
checking for sys/socket.h... yes
checking for sys/ioctl.h... yes
checking for unistd.h... (cached) yes
checking for stdlib.h... (cached) yes
checking for arpa/inet.h... yes
checking for net/if.h... yes
checking for netinet/in.h... yes
checking for netinet/in6.h... no
checking for sys/un.h... yes
checking for linux/tcp.h... yes
checking for netinet/tcp.h... yes
checking for netinet/udp.h... yes
checking for netdb.h... yes
checking for sys/sockio.h... no
checking for sys/stat.h... (cached) yes
checking for sys/param.h... yes
checking for termios.h... yes
checking for termio.h... yes
checking for fcntl.h... yes
checking for io.h... no
checking for pwd.h... yes
checking for utime.h... yes
checking for sys/utime.h... no
checking for sys/poll.h... yes
checking for poll.h... yes
checking for socket.h... no
checking for sys/resource.h... yes
checking for libgen.h... yes
checking for locale.h... yes
checking for stdbool.h... yes
checking for sys/filio.h... no
checking for sys/wait.h... yes
checking for setjmp.h... yes
checking for an ANSI C-conforming const... yes
checking for size_t... yes
checking for sys/types.h... (cached) yes
checking for sys/time.h... (cached) yes
checking for sys/socket.h... (cached) yes
checking for struct timeval... yes
checking run-time libs availability... fine
checking size of size_t... 8
checking size of long... 8
checking size of int... 4
checking size of time_t... 8
checking size of off_t... 8
checking size of curl_off_t... 8
checking size of curl_socket_t... 4
checking for long long... yes
checking for ssize_t... yes
checking for bool... yes
checking for sa_family_t... yes
checking for suseconds_t... yes
checking if time_t is unsigned... no
checking for in_addr_t... yes
checking for struct sockaddr_storage... yes
checking for sys/select.h... (cached) yes
checking for sys/socket.h... (cached) yes
checking for select... yes
checking for sys/types.h... (cached) yes
checking for sys/socket.h... (cached) yes
checking for recv... yes
checking for sys/types.h... (cached) yes
checking for sys/socket.h... (cached) yes
checking for send... yes
checking for sys/types.h... (cached) yes
checking for sys/socket.h... (cached) yes
checking for MSG_NOSIGNAL... yes
checking for sys/types.h... (cached) yes
checking for unistd.h... (cached) yes
checking if alarm can be linked... yes
checking if alarm is prototyped... yes
checking if alarm is compilable... yes
checking if alarm usage allowed... yes
checking if alarm might be used... yes
checking for sys/types.h... (cached) yes
checking for strings.h... (cached) yes
checking for sys/types.h... (cached) yes
checking for libgen.h... (cached) yes
checking if basename can be linked... yes
checking if basename is prototyped... yes
checking if basename is compilable... yes
checking if basename usage allowed... yes
checking if basename might be used... yes
checking for sys/types.h... (cached) yes
checking for socket.h... (cached) no
checking if closesocket can be linked... no
checking if closesocket might be used... no
checking for sys/types.h... (cached) yes
checking for sys/socket.h... (cached) yes
checking if CloseSocket can be linked... no
checking if CloseSocket might be used... no
checking for sys/types.h... (cached) yes
checking for unistd.h... (cached) yes
checking for fcntl.h... (cached) yes
checking if fcntl can be linked... yes
checking if fcntl is prototyped... yes
checking if fcntl is compilable... yes
checking if fcntl usage allowed... yes
checking if fcntl might be used... yes
checking if fcntl O_NONBLOCK is compilable... yes
checking if fcntl O_NONBLOCK usage allowed... yes
checking if fcntl O_NONBLOCK might be used... yes
checking whether build target is a native Windows one... (cached) no
checking for sys/types.h... (cached) yes
checking for netdb.h... (cached) yes
checking if freeaddrinfo can be linked... yes
checking if freeaddrinfo is prototyped... yes
checking if freeaddrinfo is compilable... yes
checking if freeaddrinfo usage allowed... yes
checking if freeaddrinfo might be used... yes
checking for sys/types.h... (cached) yes
checking for sys/xattr.h... yes
checking if fsetxattr can be linked... yes
checking if fsetxattr is prototyped... yes
checking if fsetxattr takes 5 args.... yes
checking if fsetxattr is compilable... yes
checking if fsetxattr usage allowed... yes
checking if fsetxattr might be used... yes
checking if ftruncate can be linked... yes
checking if ftruncate is prototyped... yes
checking if ftruncate is compilable... yes
checking if ftruncate usage allowed... yes
checking if ftruncate might be used... yes
checking for sys/types.h... (cached) yes
checking if getaddrinfo can be linked... yes
checking if getaddrinfo is prototyped... yes
checking if getaddrinfo is compilable... yes
checking if getaddrinfo seems to work... yes
checking if getaddrinfo usage allowed... yes
checking if getaddrinfo might be used... yes
checking if getaddrinfo is threadsafe... yes
checking if gethostbyname can be linked... yes
checking if gethostbyname is prototyped... yes
checking if gethostbyname is compilable... yes
checking if gethostbyname usage allowed... yes
checking if gethostbyname might be used... yes
checking if gethostbyname_r can be linked... yes
checking if gethostbyname_r is prototyped... yes
checking if gethostbyname_r takes 3 args.... no
checking if gethostbyname_r takes 5 args.... no
checking if gethostbyname_r takes 6 args.... yes
checking if gethostbyname_r is compilable... yes
checking if gethostbyname_r usage allowed... yes
checking if gethostbyname_r might be used... yes
checking if gethostname can be linked... yes
checking if gethostname is prototyped... yes
checking if gethostname is compilable... yes
checking for gethostname arg 2 data type... size_t
checking if gethostname usage allowed... yes
checking if gethostname might be used... yes
checking if getpeername can be linked... yes
checking if getpeername is prototyped... yes
checking if getpeername is compilable... yes
checking if getpeername usage allowed... yes
checking if getpeername might be used... yes
checking if getsockname can be linked... yes
checking if getsockname is prototyped... yes
checking if getsockname is compilable... yes
checking if getsockname usage allowed... yes
checking if getsockname might be used... yes
checking for net/if.h... (cached) yes
checking if if_nametoindex can be linked... yes
checking if if_nametoindex is prototyped... yes
checking if if_nametoindex is compilable... yes
checking if if_nametoindex usage allowed... yes
checking if if_nametoindex might be used... yes
checking for sys/types.h... (cached) yes
checking for sys/socket.h... (cached) yes
checking for netinet/in.h... (cached) yes
checking for ifaddrs.h... yes
checking if getifaddrs can be linked... yes
checking if getifaddrs is prototyped... yes
checking if getifaddrs is compilable... yes
checking if getifaddrs seems to work... yes
checking if getifaddrs usage allowed... yes
checking if getifaddrs might be used... yes
checking for sys/types.h... (cached) yes
checking for sys/time.h... (cached) yes
checking if gmtime_r can be linked... yes
checking if gmtime_r is prototyped... yes
checking if gmtime_r is compilable... yes
checking if gmtime_r seems to work... yes
checking if gmtime_r usage allowed... yes
checking if gmtime_r might be used... yes
checking for sys/types.h... (cached) yes
checking for sys/socket.h... (cached) yes
checking for netinet/in.h... (cached) yes
checking for arpa/inet.h... (cached) yes
checking if inet_ntop can be linked... yes
checking if inet_ntop is prototyped... yes
checking if inet_ntop is compilable... yes
checking if inet_ntop seems to work... yes
checking if inet_ntop usage allowed... yes
checking if inet_ntop might be used... yes
checking if inet_pton can be linked... yes
checking if inet_pton is prototyped... yes
checking if inet_pton is compilable... yes
checking if inet_pton seems to work... yes
checking if inet_pton usage allowed... yes
checking if inet_pton might be used... yes
checking for sys/types.h... (cached) yes
checking for unistd.h... (cached) yes
checking for sys/socket.h... (cached) yes
checking for sys/ioctl.h... (cached) yes
checking for stropts.h... no
checking if ioctl can be linked... yes
checking if ioctl is prototyped... yes
checking if ioctl is compilable... yes
checking if ioctl usage allowed... yes
checking if ioctl might be used... yes
checking if ioctl FIONBIO is compilable... yes
checking if ioctl FIONBIO usage allowed... yes
checking if ioctl FIONBIO might be used... yes
checking if ioctl SIOCGIFADDR is compilable... yes
checking if ioctl SIOCGIFADDR usage allowed... yes
checking if ioctl SIOCGIFADDR might be used... yes
checking if ioctlsocket can be linked... no
checking if ioctlsocket might be used... no
checking if IoctlSocket can be linked... no
checking if IoctlSocket might be used... no
checking if memrchr can be linked... yes
checking if memrchr is prototyped... no
checking if memrchr might be used... no
checking for sys/types.h... (cached) yes
checking for poll.h... (cached) yes
checking for sys/poll.h... (cached) yes
checking if poll can be linked... yes
checking if poll is prototyped... yes
checking if poll is compilable... yes
checking if poll seems to work... yes
checking if poll usage allowed... yes
checking if poll might be used... yes
checking for sys/types.h... (cached) yes
checking if sigaction can be linked... yes
checking if sigaction is prototyped... yes
checking if sigaction is compilable... yes
checking if sigaction usage allowed... yes
checking if sigaction might be used... yes
checking if siginterrupt can be linked... yes
checking if siginterrupt is prototyped... yes
checking if siginterrupt is compilable... yes
checking if siginterrupt usage allowed... yes
checking if siginterrupt might be used... yes
checking if signal can be linked... yes
checking if signal is prototyped... yes
checking if signal is compilable... yes
checking if signal usage allowed... yes
checking if signal might be used... yes
checking for sys/types.h... (cached) yes
checking if sigsetjmp can be linked... no
checking if sigsetjmp seems a macro... yes
checking if sigsetjmp is compilable... yes
checking if sigsetjmp usage allowed... yes
checking if sigsetjmp might be used... yes
checking if socket can be linked... yes
checking if socket is prototyped... yes
checking if socket is compilable... yes
checking if socket usage allowed... yes
checking if socket might be used... yes
checking if socketpair can be linked... yes
checking if socketpair is prototyped... yes
checking if socketpair is compilable... yes
checking if socketpair usage allowed... yes
checking if socketpair might be used... yes
checking if strcasecmp can be linked... yes
checking if strcasecmp is prototyped... yes
checking if strcasecmp is compilable... yes
checking if strcasecmp usage allowed... yes
checking if strcasecmp might be used... yes
checking if strcmpi can be linked... no
checking if strcmpi might be used... no
checking if strdup can be linked... yes
checking if strdup is prototyped... yes
checking if strdup is compilable... yes
checking if strdup usage allowed... yes
checking if strdup might be used... yes
checking if strerror_r can be linked... yes
checking if strerror_r is prototyped... yes
checking if strerror_r is compilable... yes
checking if strerror_r is glibc like... no
checking if strerror_r is POSIX like... yes
checking if strerror_r seems to work... yes
checking if strerror_r usage allowed... yes
checking if strerror_r might be used... yes
checking if stricmp can be linked... no
checking if stricmp might be used... no
checking if strtok_r can be linked... yes
checking if strtok_r is prototyped... yes
checking if strtok_r is compilable... yes
checking if strtok_r usage allowed... yes
checking if strtok_r might be used... yes
checking if strtoll can be linked... yes
checking if strtoll is prototyped... yes
checking if strtoll is compilable... yes
checking if strtoll usage allowed... yes
checking if strtoll might be used... yes
checking for ccache gcc options needed to detect all undeclared functions... none needed
checking whether getpwuid_r is declared... yes
checking for _fseeki64... no
checking deeper for _fseeki64... but still no
checking for arc4random... no
checking deeper for arc4random... but still no
checking for fnmatch... yes
checking for fseeko... yes
checking for geteuid... yes
checking for getpass_r... no
checking deeper for getpass_r... but still no
checking for getppid... yes
checking for getpwuid... yes
checking for getpwuid_r... yes
checking for getrlimit... yes
checking for gettimeofday... yes
checking for if_nametoindex... yes
checking for mach_absolute_time... no
checking deeper for mach_absolute_time... but still no
checking for pipe... yes
checking for sched_yield... yes
checking for sendmsg... yes
checking for setlocale... yes
checking for setmode... no
checking deeper for setmode... but still no
checking for setrlimit... yes
checking for snprintf... yes
checking for utime... yes
checking for utimes... yes
checking whether fseeko is declared... yes
checking how to set a socket into non-blocking mode... fcntl O_NONBLOCK
checking for perl... /usr/bin/perl
checking 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 for dirent.h... yes
checking for opendir... yes
checking convert -I options to -isystem... yes
checking whether to enable verbose strings... yes
checking whether to enable SSPI support (Windows native builds only)... no
checking whether to enable basic authentication method... yes
checking whether to enable bearer authentication method... yes
checking whether to enable digest authentication method... yes
checking whether to enable kerberos authentication method... yes
checking whether to enable negotiate authentication method... yes
checking whether to enable aws sig methods... yes
checking whether to support NTLM... yes
checking whether to enable TLS-SRP authentication... yes
checking whether to enable Unix domain sockets... auto
checking for struct sockaddr_un.sun_path... yes
checking whether to support cookies... yes
checking whether to support socketpair... yes
checking whether to support HTTP authentication... yes
checking whether to support DoH... yes
checking whether to support the MIME API... yes
checking whether to support binding connections locally... yes
checking whether to support the form API... yes
checking whether to support date parsing... yes
checking whether to support netrc parsing... yes
checking whether to support progress-meter... yes
checking whether to support DNS shuffling... yes
checking whether to support curl_easy_option*... yes
checking whether to support alt-svc... yes
checking whether to support headers-api... yes
configure: disables HSTS due to lack of SSL
checking whether to support WebSockets... no
checking whether hiding of library internal symbols will actually happen... yes
checking if this build supports HTTPS-proxy... no
checking that generated files are newer than configure... done
configure: creating ./config.status
config.status: creating Makefile
config.status: creating docs/Makefile
config.status: creating docs/examples/Makefile
config.status: creating docs/libcurl/Makefile
config.status: creating docs/libcurl/opts/Makefile
config.status: creating docs/cmdline-opts/Makefile
config.status: creating include/Makefile
config.status: creating include/curl/Makefile
config.status: creating src/Makefile
config.status: creating lib/Makefile
config.status: creating scripts/Makefile
config.status: creating lib/libcurl.vers
config.status: creating tests/Makefile
config.status: creating tests/config
config.status: creating tests/certs/Makefile
config.status: creating tests/certs/scripts/Makefile
config.status: creating tests/data/Makefile
config.status: creating tests/server/Makefile
config.status: creating tests/libtest/Makefile
config.status: creating tests/unit/Makefile
config.status: creating tests/http/config.ini
config.status: creating tests/http/Makefile
config.status: creating tests/http/clients/Makefile
config.status: creating packages/Makefile
config.status: creating packages/vms/Makefile
config.status: creating curl-config
config.status: creating libcurl.pc
config.status: creating lib/curl_config.h
config.status: executing depfiles commands
config.status: executing libtool commands
configure: Configured to build curl/libcurl:

Host setup: x86_64-pc-linux-gnu
Install prefix: /usr/local
Compiler: ccache gcc
CFLAGS: -Werror-implicit-function-declaration -O2 -Wno-system-headers
CPPFLAGS:
LDFLAGS:
LIBS: -lpsl -lz

curl version: 8.8.0-DEV
SSL: no (--with-{openssl,gnutls,mbedtls,wolfssl,schannel,secure-transport,amissl,bearssl,rustls} )
SSH: no (--with-{libssh,libssh2})
zlib: enabled
brotli: no (--with-brotli)
zstd: no (--with-zstd)
GSS-API: no (--with-gssapi)
GSASL: no (libgsasl not found)
TLS-SRP: no (--enable-tls-srp)
resolver: POSIX threaded
IPv6: enabled
Unix sockets: enabled
IDN: no (--with-{libidn2,winidn})
Build docs: no
Build libcurl: Shared=no, Static=yes
Built-in manual: no (--enable-manual)
--libcurl option: enabled (--disable-libcurl-option)
Verbose errors: enabled (--disable-verbose)
Code coverage: disabled
SSPI: no (--enable-sspi)
ca cert bundle: no
ca cert path:
ca fallback:
LDAP: no (--enable-ldap / --with-ldap-lib / --with-lber-lib)
LDAPS: no (--enable-ldaps)
RTSP: enabled
RTMP: no (--with-librtmp)
PSL: enabled
Alt-svc: enabled (--disable-alt-svc)
Headers API: enabled (--disable-headers-api)
HSTS: no (--enable-hsts)
HTTP1: enabled (internal)
HTTP2: no (--with-nghttp2)
HTTP3: no (--with-ngtcp2 --with-nghttp3, --with-quiche, --with-openssl-quic, --with-msh3)
ECH: no (--enable-ech)
WebSockets: no (--enable-websockets)
Protocols: DICT FILE FTP GOPHER HTTP IMAP IPFS IPNS MQTT POP3 RTSP SMTP TELNET TFTP
Features: AsynchDNS IPv6 Largefile PSL UnixSockets alt-svc libz threadsafe

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

$ make -j3
Making all in lib
make[1]: Entering directory '/root/asi_db/builds/curl/_worktrees/w0/lib'
make all-am
make[2]: Entering directory '/root/asi_db/builds/curl/_worktrees/w0/lib'
CC libcurl_la-altsvc.lo
CC libcurl_la-amigaos.lo
CC libcurl_la-asyn-ares.lo
CC libcurl_la-asyn-thread.lo
CC libcurl_la-base64.lo
CC libcurl_la-bufq.lo
CC libcurl_la-bufref.lo
CC libcurl_la-c-hyper.lo
CC libcurl_la-cf-h1-proxy.lo
CC libcurl_la-cf-h2-proxy.lo
CC libcurl_la-cf-https-connect.lo
CC libcurl_la-cf-haproxy.lo
CC libcurl_la-cfilters.lo
CC libcurl_la-cf-socket.lo
CC libcurl_la-conncache.lo
CC libcurl_la-connect.lo
CC libcurl_la-content_encoding.lo
CC libcurl_la-cookie.lo
CC libcurl_la-curl_addrinfo.lo
CC libcurl_la-curl_des.lo
CC libcurl_la-curl_endian.lo
CC libcurl_la-curl_fnmatch.lo
CC libcurl_la-curl_get_line.lo
CC libcurl_la-curl_gethostname.lo
CC libcurl_la-curl_gssapi.lo
CC libcurl_la-curl_memrchr.lo
CC libcurl_la-curl_multibyte.lo
CC libcurl_la-curl_ntlm_core.lo
CC libcurl_la-curl_path.lo
CC libcurl_la-curl_range.lo
CC libcurl_la-curl_rtmp.lo
CC libcurl_la-curl_sasl.lo
CC libcurl_la-curl_sha512_256.lo
CC libcurl_la-curl_sspi.lo
CC libcurl_la-curl_threads.lo
CC libcurl_la-curl_trc.lo
CC libcurl_la-cw-out.lo
CC libcurl_la-dict.lo
CC libcurl_la-doh.lo
CC libcurl_la-dynbuf.lo
CC libcurl_la-dynhds.lo
CC libcurl_la-easy.lo
CC libcurl_la-easygetopt.lo
CC libcurl_la-easyoptions.lo
CC libcurl_la-escape.lo
CC libcurl_la-file.lo
CC libcurl_la-fileinfo.lo
CC libcurl_la-fopen.lo
CC libcurl_la-formdata.lo
CC libcurl_la-ftp.lo
CC libcurl_la-ftplistparser.lo
CC libcurl_la-getenv.lo
CC libcurl_la-getinfo.lo
CC libcurl_la-gopher.lo
CC libcurl_la-hash.lo
CC libcurl_la-headers.lo
CC libcurl_la-hmac.lo
CC libcurl_la-hostasyn.lo
CC libcurl_la-hostip.lo
CC libcurl_la-hostip4.lo
CC libcurl_la-hostip6.lo
CC libcurl_la-hostsyn.lo
CC libcurl_la-hsts.lo
CC libcurl_la-http.lo
CC libcurl_la-http1.lo
CC libcurl_la-http2.lo
CC libcurl_la-http_aws_sigv4.lo
CC libcurl_la-http_chunks.lo
CC libcurl_la-http_digest.lo
CC libcurl_la-http_negotiate.lo
CC libcurl_la-http_ntlm.lo
CC libcurl_la-http_proxy.lo
CC libcurl_la-idn.lo
CC libcurl_la-if2ip.lo
CC libcurl_la-imap.lo
CC libcurl_la-inet_ntop.lo
CC libcurl_la-inet_pton.lo
CC libcurl_la-krb5.lo
CC libcurl_la-ldap.lo
CC libcurl_la-llist.lo
CC libcurl_la-macos.lo
CC libcurl_la-md4.lo
CC libcurl_la-md5.lo
CC libcurl_la-memdebug.lo
CC libcurl_la-mime.lo
CC libcurl_la-mprintf.lo
CC libcurl_la-mqtt.lo
CC libcurl_la-multi.lo
CC libcurl_la-netrc.lo
CC libcurl_la-nonblock.lo
CC libcurl_la-noproxy.lo
CC libcurl_la-openldap.lo
CC libcurl_la-parsedate.lo
CC libcurl_la-pingpong.lo
CC libcurl_la-pop3.lo
CC libcurl_la-progress.lo
CC libcurl_la-psl.lo
CC libcurl_la-rand.lo
CC libcurl_la-rename.lo
CC libcurl_la-request.lo
CC libcurl_la-rtsp.lo
CC libcurl_la-select.lo
CC libcurl_la-sendf.lo
CC libcurl_la-setopt.lo
CC libcurl_la-sha256.lo
CC libcurl_la-share.lo
CC libcurl_la-slist.lo
CC libcurl_la-smb.lo
CC libcurl_la-smtp.lo
CC libcurl_la-socketpair.lo
CC libcurl_la-socks.lo
CC libcurl_la-socks_gssapi.lo
CC libcurl_la-socks_sspi.lo
CC libcurl_la-speedcheck.lo
CC libcurl_la-splay.lo
CC libcurl_la-strcase.lo
CC libcurl_la-strdup.lo
CC libcurl_la-strerror.lo
CC libcurl_la-strtok.lo
CC libcurl_la-strtoofft.lo
CC libcurl_la-system_win32.lo
CC libcurl_la-telnet.lo
CC libcurl_la-tftp.lo
CC libcurl_la-timediff.lo
CC libcurl_la-timeval.lo
CC libcurl_la-transfer.lo
CC libcurl_la-url.lo
CC libcurl_la-urlapi.lo
CC libcurl_la-version.lo
CC libcurl_la-version_win32.lo
CC libcurl_la-warnless.lo
CC libcurl_la-ws.lo
CC vauth/libcurl_la-cleartext.lo
CC vauth/libcurl_la-cram.lo
CC vauth/libcurl_la-digest.lo
CC vauth/libcurl_la-digest_sspi.lo
CC vauth/libcurl_la-gsasl.lo
CC vauth/libcurl_la-krb5_gssapi.lo
CC vauth/libcurl_la-krb5_sspi.lo
CC vauth/libcurl_la-ntlm.lo
CC vauth/libcurl_la-ntlm_sspi.lo
CC vauth/libcurl_la-oauth2.lo
CC vauth/libcurl_la-spnego_gssapi.lo
CC vauth/libcurl_la-spnego_sspi.lo
CC vauth/libcurl_la-vauth.lo
CC vtls/libcurl_la-bearssl.lo
CC vtls/libcurl_la-gtls.lo
CC vtls/libcurl_la-hostcheck.lo
CC vtls/libcurl_la-keylog.lo
CC vtls/libcurl_la-mbedtls.lo
CC vtls/libcurl_la-mbedtls_threadlock.lo
CC vtls/libcurl_la-openssl.lo
CC vtls/libcurl_la-rustls.lo
CC vtls/libcurl_la-schannel.lo
CC vtls/libcurl_la-schannel_verify.lo
CC vtls/libcurl_la-sectransp.lo
CC vtls/libcurl_la-vtls.lo
CC vtls/libcurl_la-wolfssl.lo
CC vtls/libcurl_la-x509asn1.lo
CC vquic/libcurl_la-curl_msh3.lo
CC vquic/libcurl_la-curl_ngtcp2.lo
CC vquic/libcurl_la-curl_osslq.lo
CC vquic/libcurl_la-curl_quiche.lo
CC vquic/libcurl_la-vquic.lo
CC vquic/libcurl_la-vquic-tls.lo
CC vssh/libcurl_la-libssh.lo
CC vssh/libcurl_la-libssh2.lo
CC vssh/libcurl_la-wolfssh.lo
CCLD libcurl.la
make[2]: Leaving directory '/root/asi_db/builds/curl/_worktrees/w0/lib'
make[1]: Leaving directory '/root/asi_db/builds/curl/_worktrees/w0/lib'
Making all in docs
make[1]: Entering directory '/root/asi_db/builds/curl/_worktrees/w0/docs'
Making all in .
make[2]: Entering directory '/root/asi_db/builds/curl/_worktrees/w0/docs'
make[2]: Nothing to be done for 'all-am'.
make[2]: Leaving directory '/root/asi_db/builds/curl/_worktrees/w0/docs'
Making all in cmdline-opts
make[2]: Entering directory '/root/asi_db/builds/curl/_worktrees/w0/docs/cmdline-opts'
make[2]: Nothing to be done for 'all'.
make[2]: Leaving directory '/root/asi_db/builds/curl/_worktrees/w0/docs/cmdline-opts'
Making all in libcurl
make[2]: Entering directory '/root/asi_db/builds/curl/_worktrees/w0/docs/libcurl'
Making all in opts
make[3]: Entering directory '/root/asi_db/builds/curl/_worktrees/w0/docs/libcurl/opts'
make[3]: Nothing to be done for 'all'.
make[3]: Leaving directory '/root/asi_db/builds/curl/_worktrees/w0/docs/libcurl/opts'
make[3]: Entering directory '/root/asi_db/builds/curl/_worktrees/w0/docs/libcurl'
make[3]: Nothing to be done for 'all-am'.
make[3]: Leaving directory '/root/asi_db/builds/curl/_worktrees/w0/docs/libcurl'
make[2]: Leaving directory '/root/asi_db/builds/curl/_worktrees/w0/docs/libcurl'
make[1]: Leaving directory '/root/asi_db/builds/curl/_worktrees/w0/docs'
Making all in src
make[1]: Entering directory '/root/asi_db/builds/curl/_worktrees/w0/src'
make[2]: Entering directory '/root/asi_db/builds/curl/_worktrees/w0/src'
CC slist_wc.o
CC tool_binmode.o
CC tool_bname.o
CC tool_cb_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_findfile.o
CC tool_filetime.o
CC tool_formparse.o
CC tool_getpass.o
CC tool_getparam.o
CC tool_help.o
CC tool_helpers.o
echo '#include "tool_hugehelp.h"' >> tool_hugehelp.c
CC tool_ipfs.o
CC tool_libinfo.o
CC tool_main.o
CC tool_listhelp.o
CC tool_msgs.o
CC tool_operate.o
CC tool_operhlp.o
CC tool_paramhlp.o
CC tool_parsecfg.o
CC tool_progress.o
CC tool_setopt.o
CC tool_sleep.o
CC tool_stderr.o
CC tool_strdup.o
CC tool_urlglob.o
CC tool_util.o
CC tool_vms.o
CC tool_writeout.o
CC tool_writeout_json.o
CC tool_xattr.o
CC var.o
CC tool_hugehelp.o
CC ../lib/base64.o
CC ../lib/curl_multibyte.o
CC ../lib/dynbuf.o
CC ../lib/nonblock.o
CC ../lib/strtoofft.o
CC ../lib/timediff.o
CC ../lib/version_win32.o
CC ../lib/warnless.o
CCLD curl
make[2]: Leaving directory '/root/asi_db/builds/curl/_worktrees/w0/src'
make[1]: Leaving directory '/root/asi_db/builds/curl/_worktrees/w0/src'
Making all in scripts
make[1]: Entering directory '/root/asi_db/builds/curl/_worktrees/w0/scripts'
make[1]: Nothing to be done for 'all'.
make[1]: Leaving directory '/root/asi_db/builds/curl/_worktrees/w0/scripts'
make[1]: Entering directory '/root/asi_db/builds/curl/_worktrees/w0'
make[1]: Nothing to be done for 'all-am'.
make[1]: Leaving directory '/root/asi_db/builds/curl/_worktrees/w0'

Commit Diff GitHub →

lib/cfilters.c +13 -0 lib/cfilters.h +7 -0 lib/hash.c +22 -0 lib/hash.h +9 -0 lib/http.h +1 -5 lib/http2.c +107 -68 lib/vquic/curl_msh3.c +72 -28 lib/vquic/curl_ngtcp2.c +66 -36 lib/vquic/curl_osslq.c +68 -39 lib/vquic/curl_quiche.c +83 -54 tests/data/Makefile.inc +1 -1 tests/data/test1616 +22 -0 tests/unit/Makefile.inc +3 -1 tests/unit/unit1616.c +87 -0

lib/cfilters.c+13 -0

@@ -670,6 +670,19 @@ size_t Curl_conn_get_max_concurrent(struct Curl_easy *data,
	return (result \|\| n <= 0)? 1 : (size_t)n;
	}

+	int Curl_conn_get_stream_error(struct Curl_easy *data,
+	struct connectdata *conn,
+	int sockindex)
+	{
+	CURLcode result;
+	int n = 0;
+
+	struct Curl_cfilter *cf = conn->cfilter[sockindex];
+	result = cf? cf->cft->query(cf, data, CF_QUERY_STREAM_ERROR,
+	&n, NULL) : CURLE_UNKNOWN_OPTION;
+	return (result \|\| n < 0)? 0 : n;
+	}
+
	int Curl_conn_sockindex(struct Curl_easy *data, curl_socket_t sockfd)
	{
	if(data && data->conn &&

lib/cfilters.h+7 -0

@@ -160,6 +160,7 @@ typedef CURLcode Curl_cft_cntrl(struct Curl_cfilter *cf,
	#define CF_QUERY_SOCKET 3 /* - curl_socket_t */
	#define CF_QUERY_TIMER_CONNECT 4 /* - struct curltime */
	#define CF_QUERY_TIMER_APPCONNECT 5 /* - struct curltime */
+	#define CF_QUERY_STREAM_ERROR 6 /* error code - */

	/**
	* Query the cfilter for properties. Filters ignorant of a query will
@@ -498,6 +499,12 @@ size_t Curl_conn_get_max_concurrent(struct Curl_easy *data,
	struct connectdata *conn,
	int sockindex);

+	/**
+	* Get the underlying error code for a transfer stream or 0 if not known.
+	*/
+	int Curl_conn_get_stream_error(struct Curl_easy *data,
+	struct connectdata *conn,
+	int sockindex);

	/**
	* Get the index of the given socket in the connection's sockets.

lib/hash.c+22 -0

@@ -368,3 +368,25 @@ void Curl_hash_print(struct Curl_hash *h,
	fprintf(stderr, "\n");
	}
	#endif
+
+	void Curl_hash_offt_init(struct Curl_hash *h,
+	unsigned int slots,
+	Curl_hash_dtor dtor)
+	{
+	Curl_hash_init(h, slots, Curl_hash_str, Curl_str_key_compare, dtor);
+	}
+
+	void Curl_hash_offt_set(struct Curl_hash h, curl_off_t id, void *elem)
+	{
+	return Curl_hash_add(h, &id, sizeof(id), elem);
+	}
+
+	int Curl_hash_offt_remove(struct Curl_hash *h, curl_off_t id)
+	{
+	return Curl_hash_delete(h, &id, sizeof(id));
+	}
+
+	void Curl_hash_offt_get(struct Curl_hash h, curl_off_t id)
+	{
+	return Curl_hash_pick(h, &id, sizeof(id));
+	}

lib/hash.h+9 -0

@@ -98,5 +98,14 @@ Curl_hash_next_element(struct Curl_hash_iterator *iter);
	void Curl_hash_print(struct Curl_hash *h,
	void (func)(void ));

+	/* Hash for `curl_off_t` as key */
+	void Curl_hash_offt_init(struct Curl_hash *h,
+	unsigned int slots,
+	Curl_hash_dtor dtor);
+
+	void Curl_hash_offt_set(struct Curl_hash h, curl_off_t id, void *elem);
+	int Curl_hash_offt_remove(struct Curl_hash *h, curl_off_t id);
+	void Curl_hash_offt_get(struct Curl_hash h, curl_off_t id);
+

	#endif /* HEADER_CURL_HASH_H */

lib/http.h+1 -5

@@ -188,12 +188,8 @@ void Curl_http_exp100_got100(struct Curl_easy *data);
	* HTTP unique setup
	***************************************************************************/
	struct HTTP {
-	#ifndef CURL_DISABLE_HTTP
-	void h2_ctx; / HTTP/2 implementation context */
-	void h3_ctx; / HTTP/3 implementation context */
-	#else
+	/* TODO: no longer used, we should remove it from SingleRequest */
	char unused;
-	#endif
	};

	CURLcode Curl_http_size(struct Curl_easy *data);

lib/http2.c+107 -68

@@ -29,6 +29,7 @@
	#include <nghttp2/nghttp2.h>
	#include "urldata.h"
	#include "bufq.h"
+	#include "hash.h"
	#include "http1.h"
	#include "http2.h"
	#include "http.h"
@@ -129,6 +130,7 @@ struct cf_h2_ctx {
	struct bufc_pool stream_bufcp; /* spares for stream buffers */
	struct dynbuf scratch; /* scratch buffer for temp use */

+	struct Curl_hash streams; /* hash of `data->id` to `h2_stream_ctx` */
	size_t drain_total; /* sum of all stream's UrlState drain */
	uint32_t max_concurrent_streams;
	int32_t goaway_error;
@@ -155,6 +157,8 @@ static void cf_h2_ctx_clear(struct cf_h2_ctx *ctx)
	Curl_bufq_free(&ctx->outbufq);
	Curl_bufcp_free(&ctx->stream_bufcp);
	Curl_dyn_free(&ctx->scratch);
+	Curl_hash_clean(&ctx->streams);
+	Curl_hash_destroy(&ctx->streams);
	memset(ctx, 0, sizeof(*ctx));
	ctx->call_data = save;
	}
@@ -200,13 +204,58 @@ struct h2_stream_ctx {
	buffered data in stream->sendbuf to upload. */
	};

-	#define H2_STREAM_CTX(d) ((struct h2_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)
+	#define H2_STREAM_CTX(ctx,data) ((struct h2_stream_ctx *)(\
+	data? Curl_hash_offt_get(&(ctx)->streams, (data)->id) : NULL))
+
+	static struct h2_stream_ctx h2_stream_ctx_create(struct cf_h2_ctx ctx)
+	{
+	struct h2_stream_ctx *stream;
+
+	(void)ctx;
+	stream = calloc(1, sizeof(*stream));
+	if(!stream)
+	return NULL;
+
+	stream->id = -1;
+	Curl_bufq_initp(&stream->sendbuf, &ctx->stream_bufcp,
+	H2_STREAM_SEND_CHUNKS, BUFQ_OPT_NONE);
+	Curl_h1_req_parse_init(&stream->h1, H1_PARSE_DEFAULT_MAX_LINE_LEN);
+	Curl_dynhds_init(&stream->resp_trailers, 0, DYN_HTTP_REQUEST);
+	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->local_window_size = H2_STREAM_WINDOW_SIZE;
+	stream->upload_left = 0;
+	stream->nrcvd_data = 0;
+	return stream;
+	}
+
+	static void free_push_headers(struct h2_stream_ctx *stream)
+	{
+	size_t i;
+	for(i = 0; i<stream->push_headers_used; i++)
+	free(stream->push_headers[i]);
+	Curl_safefree(stream->push_headers);
+	stream->push_headers_used = 0;
+	}
+
+	static void h2_stream_ctx_free(struct h2_stream_ctx *stream)
+	{
+	Curl_bufq_free(&stream->sendbuf);
+	Curl_h1_req_parse_free(&stream->h1);
+	Curl_dynhds_free(&stream->resp_trailers);
+	free_push_headers(stream);
+	free(stream);
+	}
+
+	static void h2_stream_hash_free(void *stream)
+	{
+	DEBUGASSERT(stream);
+	h2_stream_ctx_free((struct h2_stream_ctx *)stream);
+	}

	/*
	* Mark this transfer to get "drained".
@@ -243,49 +292,29 @@ static CURLcode http2_data_setup(struct Curl_cfilter *cf,
	failf(data, "initialization failure, transfer not http initialized");
	return CURLE_FAILED_INIT;
	}
-	stream = H2_STREAM_CTX(data);
+	stream = H2_STREAM_CTX(ctx, data);
	if(stream) {
	*pstream = stream;
	return CURLE_OK;
	}

-	stream = calloc(1, sizeof(*stream));
+	stream = h2_stream_ctx_create(ctx);
	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_h1_req_parse_init(&stream->h1, H1_PARSE_DEFAULT_MAX_LINE_LEN);
-	Curl_dynhds_init(&stream->resp_trailers, 0, DYN_HTTP_REQUEST);
-	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->local_window_size = H2_STREAM_WINDOW_SIZE;
-	stream->upload_left = 0;
-	stream->nrcvd_data = 0;
+	if(!Curl_hash_offt_set(&ctx->streams, data->id, stream)) {
+	h2_stream_ctx_free(stream);
+	return CURLE_OUT_OF_MEMORY;
+	}

-	H2_STREAM_LCTX(data) = stream;
	*pstream = stream;
	return CURLE_OK;
	}

-	static void free_push_headers(struct h2_stream_ctx *stream)
-	{
-	size_t i;
-	for(i = 0; i<stream->push_headers_used; i++)
-	free(stream->push_headers[i]);
-	Curl_safefree(stream->push_headers);
-	stream->push_headers_used = 0;
-	}
-
	static void http2_data_done(struct Curl_cfilter cf, struct Curl_easy data)
	{
	struct cf_h2_ctx *ctx = cf->ctx;
-	struct h2_stream_ctx *stream = H2_STREAM_CTX(data);
+	struct h2_stream_ctx *stream = H2_STREAM_CTX(ctx, data);

	DEBUGASSERT(ctx);
	if(!stream)
@@ -312,12 +341,7 @@ static void http2_data_done(struct Curl_cfilter cf, struct Curl_easy data)
	nghttp2_session_send(ctx->h2);
	}

-	Curl_bufq_free(&stream->sendbuf);
-	Curl_h1_req_parse_free(&stream->h1);
-	Curl_dynhds_free(&stream->resp_trailers);
-	free_push_headers(stream);
-	free(stream);
-	H2_STREAM_LCTX(data) = NULL;
+	Curl_hash_offt_remove(&ctx->streams, data->id);
	}

	static int h2_client_new(struct Curl_cfilter *cf,
@@ -411,6 +435,7 @@ static CURLcode cf_h2_ctx_init(struct Curl_cfilter *cf,
	Curl_bufq_initp(&ctx->inbufq, &ctx->stream_bufcp, H2_NW_RECV_CHUNKS, 0);
	Curl_bufq_initp(&ctx->outbufq, &ctx->stream_bufcp, H2_NW_SEND_CHUNKS, 0);
	Curl_dyn_init(&ctx->scratch, CURL_MAX_HTTP_HEADER);
+	Curl_hash_offt_init(&ctx->streams, 63, h2_stream_hash_free);
	ctx->last_stream_id = 2147483647;

	rc = nghttp2_session_callbacks_new(&cbs);
@@ -709,6 +734,7 @@ static ssize_t send_callback(nghttp2_session *h2,
	the struct are hidden from the user. */
	struct curl_pushheaders {
	struct Curl_easy *data;
+	struct h2_stream_ctx *stream;
	const nghttp2_push_promise *frame;
	};

@@ -722,9 +748,8 @@ char curl_pushheader_bynum(struct curl_pushheaders h, size_t num)
	if(!h \|\| !GOOD_EASY_HANDLE(h->data))
	return NULL;
	else {
-	struct h2_stream_ctx *stream = H2_STREAM_CTX(h->data);
-	if(stream && num < stream->push_headers_used)
-	return stream->push_headers[num];
+	if(h->stream && num < h->stream->push_headers_used)
+	return h->stream->push_headers[num];
	}
	return NULL;
	}
@@ -747,7 +772,7 @@ char curl_pushheader_byname(struct curl_pushheaders h, const char *header)
	!strcmp(header, ":") \|\| strchr(header + 1, ':'))
	return NULL;

-	stream = H2_STREAM_CTX(h->data);
+	stream = h->stream;
	if(!stream)
	return NULL;

@@ -870,12 +895,10 @@ static int push_promise(struct Curl_cfilter *cf,
	goto fail;
	}

-	heads.data = data;
-	heads.frame = frame;
	/* ask the application */
	CURL_TRC_CF(data, cf, "Got PUSH_PROMISE, ask application");

-	stream = H2_STREAM_CTX(data);
+	stream = H2_STREAM_CTX(ctx, data);
	if(!stream) {
	failf(data, "Internal NULL stream");
	discard_newhandle(cf, newhandle);
@@ -883,6 +906,10 @@ static int push_promise(struct Curl_cfilter *cf,
	goto fail;
	}

+	heads.data = data;
+	heads.stream = stream;
+	heads.frame = frame;
+
	rv = set_transfer_url(newhandle, &heads);
	if(rv) {
	discard_newhandle(cf, newhandle);
@@ -953,7 +980,7 @@ static CURLcode on_stream_frame(struct Curl_cfilter *cf,
	const nghttp2_frame *frame)
	{
	struct cf_h2_ctx *ctx = cf->ctx;
-	struct h2_stream_ctx *stream = H2_STREAM_CTX(data);
+	struct h2_stream_ctx *stream = H2_STREAM_CTX(ctx, data);
	int32_t stream_id = frame->hd.stream_id;
	CURLcode result;
	int rv;
@@ -1184,7 +1211,7 @@ static int on_frame_recv(nghttp2_session session, const nghttp2_frame frame,
	* servers send an explicit WINDOW_UPDATE, but not all seem to do that.
	* To be safe, we UNHOLD a stream in order not to stall. */
	if(CURL_WANT_SEND(data)) {
-	struct h2_stream_ctx *stream = H2_STREAM_CTX(data);
+	struct h2_stream_ctx *stream = H2_STREAM_CTX(ctx, data);
	if(stream)
	drain_stream(cf, data, stream);
	}
@@ -1243,7 +1270,7 @@ static int on_data_chunk_recv(nghttp2_session *session, uint8_t flags,
	return 0;
	}

-	stream = H2_STREAM_CTX(data_s);
+	stream = H2_STREAM_CTX(ctx, data_s);
	if(!stream)
	return NGHTTP2_ERR_CALLBACK_FAILURE;

@@ -1266,6 +1293,7 @@ static int on_stream_close(nghttp2_session *session, int32_t stream_id,
	uint32_t error_code, void *userp)
	{
	struct Curl_cfilter *cf = userp;
+	struct cf_h2_ctx *ctx = cf->ctx;
	struct Curl_easy data_s, call_data = CF_DATA_CURRENT(cf);
	struct h2_stream_ctx *stream;
	int rv;
@@ -1290,7 +1318,7 @@ static int on_stream_close(nghttp2_session *session, int32_t stream_id,
	(void)nghttp2_session_set_stream_user_data(session, stream_id, 0);
	return NGHTTP2_ERR_CALLBACK_FAILURE;
	}
-	stream = H2_STREAM_CTX(data_s);
+	stream = H2_STREAM_CTX(ctx, data_s);
	if(!stream) {
	CURL_TRC_CF(data_s, cf,
	"[%d] on_stream_close, GOOD easy but no stream", stream_id);
@@ -1325,6 +1353,7 @@ static int on_begin_headers(nghttp2_session *session,
	const nghttp2_frame frame, void userp)
	{
	struct Curl_cfilter *cf = userp;
+	struct cf_h2_ctx *ctx = cf->ctx;
	struct h2_stream_ctx *stream;
	struct Curl_easy *data_s = NULL;

@@ -1338,7 +1367,7 @@ static int on_begin_headers(nghttp2_session *session,
	return 0;
	}

-	stream = H2_STREAM_CTX(data_s);
+	stream = H2_STREAM_CTX(ctx, data_s);
	if(!stream \|\| !stream->bodystarted) {
	return 0;
	}
@@ -1370,7 +1399,7 @@ static int on_header(nghttp2_session session, const nghttp2_frame frame,
	internal error more than anything else! */
	return NGHTTP2_ERR_CALLBACK_FAILURE;

-	stream = H2_STREAM_CTX(data_s);
+	stream = H2_STREAM_CTX(ctx, data_s);
	if(!stream) {
	failf(data_s, "Internal NULL stream");
	return NGHTTP2_ERR_CALLBACK_FAILURE;
@@ -1518,6 +1547,7 @@ static ssize_t req_body_read_callback(nghttp2_session *session,
	void *userp)
	{
	struct Curl_cfilter *cf = userp;
+	struct cf_h2_ctx *ctx = cf->ctx;
	struct Curl_easy *data_s;
	struct h2_stream_ctx *stream = NULL;
	CURLcode result;
@@ -1534,7 +1564,7 @@ static ssize_t req_body_read_callback(nghttp2_session *session,
	internal error more than anything else! */
	return NGHTTP2_ERR_CALLBACK_FAILURE;

-	stream = H2_STREAM_CTX(data_s);
+	stream = H2_STREAM_CTX(ctx, data_s);
	if(!stream)
	return NGHTTP2_ERR_CALLBACK_FAILURE;
	}
@@ -1621,7 +1651,7 @@ static CURLcode http2_data_done_send(struct Curl_cfilter *cf,
	{
	struct cf_h2_ctx *ctx = cf->ctx;
	CURLcode result = CURLE_OK;
-	struct h2_stream_ctx *stream = H2_STREAM_CTX(data);
+	struct h2_stream_ctx *stream = H2_STREAM_CTX(ctx, data);

	if(!ctx \|\| !ctx->h2 \|\| !stream)
	goto out;
@@ -1737,11 +1767,12 @@ static int sweight_in_effect(const struct Curl_easy *data)
	* struct.
	*/

-	static void h2_pri_spec(struct Curl_easy *data,
+	static void h2_pri_spec(struct cf_h2_ctx *ctx,
+	struct Curl_easy *data,
	nghttp2_priority_spec *pri_spec)
	{
	struct Curl_data_priority *prio = &data->set.priority;
-	struct h2_stream_ctx *depstream = H2_STREAM_CTX(prio->parent);
+	struct h2_stream_ctx *depstream = H2_STREAM_CTX(ctx, prio->parent);
	int32_t depstream_id = depstream? depstream->id:0;
	nghttp2_priority_spec_init(pri_spec, depstream_id,
	sweight_wanted(data),
@@ -1759,7 +1790,7 @@ static CURLcode h2_progress_egress(struct Curl_cfilter *cf,
	struct Curl_easy *data)
	{
	struct cf_h2_ctx *ctx = cf->ctx;
-	struct h2_stream_ctx *stream = H2_STREAM_CTX(data);
+	struct h2_stream_ctx *stream = H2_STREAM_CTX(ctx, data);
	int rv = 0;

	if(stream && stream->id > 0 &&
@@ -1769,7 +1800,7 @@ static CURLcode h2_progress_egress(struct Curl_cfilter *cf,
	/* send new weight and/or dependency */
	nghttp2_priority_spec pri_spec;

-	h2_pri_spec(data, &pri_spec);
+	h2_pri_spec(ctx, data, &pri_spec);
	CURL_TRC_CF(data, cf, "[%d] Queuing PRIORITY", stream->id);
	DEBUGASSERT(stream->id != -1);
	rv = nghttp2_submit_priority(ctx->h2, NGHTTP2_FLAG_NONE,
@@ -1839,7 +1870,7 @@ static CURLcode h2_progress_ingress(struct Curl_cfilter *cf,
	* 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)) {
-	stream = H2_STREAM_CTX(data);
+	stream = H2_STREAM_CTX(ctx, data);
	if(stream && (stream->closed \|\| !data_max_bytes)) {
	/* We would like to abort here and stop processing, so that
	* the transfer loop can handle the data/close here. However,
@@ -1885,7 +1916,7 @@ 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 h2_stream_ctx *stream = H2_STREAM_CTX(data);
+	struct h2_stream_ctx *stream = H2_STREAM_CTX(ctx, data);
	ssize_t nread = -1;
	CURLcode result;
	struct cf_call_data save;
@@ -2017,7 +2048,7 @@ static ssize_t h2_submit(struct h2_stream_ctx **pstream,
	goto out;
	}

-	h2_pri_spec(data, &pri_spec);
+	h2_pri_spec(ctx, data, &pri_spec);
	if(!nghttp2_session_check_request_allowed(ctx->h2))
	CURL_TRC_CF(data, cf, "send request NOT allowed (via nghttp2)");

@@ -2114,7 +2145,7 @@ static ssize_t cf_h2_send(struct Curl_cfilter cf, struct Curl_easy data,
	const void buf, size_t len, CURLcode err)
	{
	struct cf_h2_ctx *ctx = cf->ctx;
-	struct h2_stream_ctx *stream = H2_STREAM_CTX(data);
+	struct h2_stream_ctx *stream = H2_STREAM_CTX(ctx, data);
	struct cf_call_data save;
	int rv;
	ssize_t nwritten;
@@ -2295,7 +2326,7 @@ static void cf_h2_adjust_pollset(struct Curl_cfilter *cf,
	sock = Curl_conn_cf_get_socket(cf, data);
	Curl_pollset_check(data, ps, sock, &want_recv, &want_send);
	if(want_recv \|\| want_send) {
-	struct h2_stream_ctx *stream = H2_STREAM_CTX(data);
+	struct h2_stream_ctx *stream = H2_STREAM_CTX(ctx, data);
	struct cf_call_data save;
	bool c_exhaust, s_exhaust;

@@ -2396,7 +2427,7 @@ static CURLcode http2_data_pause(struct Curl_cfilter *cf,
	{
	#ifdef NGHTTP2_HAS_SET_LOCAL_WINDOW_SIZE
	struct cf_h2_ctx *ctx = cf->ctx;
-	struct h2_stream_ctx *stream = H2_STREAM_CTX(data);
+	struct h2_stream_ctx *stream = H2_STREAM_CTX(ctx, data);

	DEBUGASSERT(data);
	if(ctx && ctx->h2 && stream) {
@@ -2481,7 +2512,7 @@ static bool cf_h2_data_pending(struct Curl_cfilter *cf,
	const struct Curl_easy *data)
	{
	struct cf_h2_ctx *ctx = cf->ctx;
-	struct h2_stream_ctx *stream = H2_STREAM_CTX(data);
+	struct h2_stream_ctx *stream = H2_STREAM_CTX(ctx, data);

	if(ctx && (!Curl_bufq_is_empty(&ctx->inbufq)
	\|\| (stream && !Curl_bufq_is_empty(&stream->sendbuf))))
@@ -2540,6 +2571,11 @@ static CURLcode cf_h2_query(struct Curl_cfilter *cf,
	*pres1 = (effective_max > INT_MAX)? INT_MAX : (int)effective_max;
	CF_DATA_RESTORE(cf, save);
	return CURLE_OK;
+	case CF_QUERY_STREAM_ERROR: {
+	struct h2_stream_ctx *stream = H2_STREAM_CTX(ctx, data);
+	*pres1 = stream? (int)stream->error : 0;
+	return CURLE_OK;
+	}
	default:
	break;
	}
@@ -2769,8 +2805,11 @@ CURLcode Curl_http2_upgrade(struct Curl_easy *data,
	CURLE_HTTP2_STREAM error! */
	bool Curl_h2_http_1_1_error(struct Curl_easy *data)
	{
-	struct h2_stream_ctx *stream = H2_STREAM_CTX(data);
-	return (stream && stream->error == NGHTTP2_HTTP_1_1_REQUIRED);
+	if(Curl_conn_is_http2(data, data->conn, FIRSTSOCKET)) {
+	int err = Curl_conn_get_stream_error(data, data->conn, FIRSTSOCKET);
+	return (err == NGHTTP2_HTTP_1_1_REQUIRED);
+	}
+	return FALSE;
	}

	#else /* !USE_NGHTTP2 */

lib/vquic/curl_msh3.c+72 -28

@@ -27,6 +27,7 @@
	#ifdef USE_MSH3

	#include "urldata.h"
+	#include "hash.h"
	#include "timeval.h"
	#include "multiif.h"
	#include "sendf.h"
@@ -118,6 +119,7 @@ struct cf_msh3_ctx {
	struct cf_call_data call_data;
	struct curltime connect_started; /* time the current attempt started */
	struct curltime handshake_at; /* time connect handshake finished */
+	struct Curl_hash streams; /* hash `data->id` to `stream_ctx` */
	/* Flags written by msh3/msquic thread */
	bool handshake_complete;
	bool handshake_succeeded;
@@ -127,6 +129,8 @@ struct cf_msh3_ctx {
	BIT(active);
	};

+	static struct cf_msh3_ctx h3_get_msh3_ctx(struct Curl_easy data);
+
	/* How to access `call_data` from a cf_msh3 filter */
	#undef CF_CTX_CALL_DATA
	#define CF_CTX_CALL_DATA(cf) \
@@ -153,18 +157,26 @@ struct stream_ctx {
	bool recv_header_complete;
	};

-	#define H3_STREAM_CTX(d) ((struct stream_ctx *)(((d) && (d)->req.p.http)? \
-	((struct HTTP *)(d)->req.p.http)->h3_ctx \
-	: NULL))
-	#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)
+	#define H3_STREAM_CTX(ctx,data) ((struct stream_ctx *)((data && ctx)? \
+	Curl_hash_offt_get(&(ctx)->streams, (data)->id) : NULL))
+
+	static void h3_stream_ctx_free(struct stream_ctx *stream)
+	{
+	Curl_bufq_free(&stream->recvbuf);
+	free(stream);
+	}

+	static void h3_stream_hash_free(void *stream)
+	{
+	DEBUGASSERT(stream);
+	h3_stream_ctx_free((struct stream_ctx *)stream);
+	}

	static CURLcode h3_data_setup(struct Curl_cfilter *cf,
	struct Curl_easy *data)
	{
-	struct stream_ctx *stream = H3_STREAM_CTX(data);
+	struct cf_msh3_ctx *ctx = cf->ctx;
+	struct stream_ctx *stream = H3_STREAM_CTX(ctx, data);

	if(stream)
	return CURLE_OK;
@@ -173,25 +185,29 @@ static CURLcode h3_data_setup(struct Curl_cfilter *cf,
	if(!stream)
	return CURLE_OUT_OF_MEMORY;

-	H3_STREAM_LCTX(data) = stream;
	stream->req = ZERO_NULL;
	msh3_lock_initialize(&stream->recv_lock);
	Curl_bufq_init2(&stream->recvbuf, H3_STREAM_CHUNK_SIZE,
	H3_STREAM_RECV_CHUNKS, BUFQ_OPT_SOFT_LIMIT);
	CURL_TRC_CF(data, cf, "data setup");
+
+	if(!Curl_hash_offt_set(&ctx->streams, data->id, stream)) {
+	h3_stream_ctx_free(stream);
+	return CURLE_OUT_OF_MEMORY;
+	}
+
	return CURLE_OK;
	}

	static void h3_data_done(struct Curl_cfilter cf, struct Curl_easy data)
	{
-	struct stream_ctx *stream = H3_STREAM_CTX(data);
+	struct cf_msh3_ctx *ctx = cf->ctx;
+	struct stream_ctx *stream = H3_STREAM_CTX(ctx, data);

	(void)cf;
	if(stream) {
	CURL_TRC_CF(data, cf, "easy handle is done");
-	Curl_bufq_free(&stream->recvbuf);
-	free(stream);
-	H3_STREAM_LCTX(data) = NULL;
+	Curl_hash_offt_remove(&ctx->streams, data->id);
	}
	}

@@ -213,7 +229,8 @@ static void drain_stream_from_other_thread(struct Curl_easy *data,
	static void drain_stream(struct Curl_cfilter *cf,
	struct Curl_easy *data)
	{
-	struct stream_ctx *stream = H3_STREAM_CTX(data);
+	struct cf_msh3_ctx *ctx = cf->ctx;
+	struct stream_ctx *stream = H3_STREAM_CTX(ctx, data);
	unsigned char bits;

	(void)cf;
@@ -311,7 +328,8 @@ static int decode_status_code(const char *value, size_t len)
	static CURLcode write_resp_raw(struct Curl_easy *data,
	const void *mem, size_t memlen)
	{
-	struct stream_ctx *stream = H3_STREAM_CTX(data);
+	struct cf_msh3_ctx *ctx = h3_get_msh3_ctx(data);
+	struct stream_ctx *stream = H3_STREAM_CTX(ctx, data);
	CURLcode result = CURLE_OK;
	ssize_t nwritten;

@@ -337,10 +355,12 @@ static void MSH3_CALL msh3_header_received(MSH3_REQUEST *Request,
	const MSH3_HEADER *hd)
	{
	struct Curl_easy *data = userp;
-	struct stream_ctx *stream = H3_STREAM_CTX(data);
+	struct cf_msh3_ctx *ctx = h3_get_msh3_ctx(data);
+	struct stream_ctx *stream = H3_STREAM_CTX(ctx, data);
	CURLcode result;
	(void)Request;

+	DEBUGF(infof(data, "[MSH3] header received, stream=%d", !!stream));
	if(!stream \|\| stream->recv_header_complete) {
	return;
	}
@@ -386,7 +406,8 @@ static bool MSH3_CALL msh3_data_received(MSH3_REQUEST *Request,
	const uint8_t *buf)
	{
	struct Curl_easy *data = IfContext;
-	struct stream_ctx *stream = H3_STREAM_CTX(data);
+	struct cf_msh3_ctx *ctx = h3_get_msh3_ctx(data);
+	struct stream_ctx *stream = H3_STREAM_CTX(ctx, data);
	CURLcode result;
	bool rv = FALSE;

@@ -425,7 +446,8 @@ static void MSH3_CALL msh3_complete(MSH3_REQUEST Request, void IfContext,
	bool aborted, uint64_t error)
	{
	struct Curl_easy *data = IfContext;
-	struct stream_ctx *stream = H3_STREAM_CTX(data);
+	struct cf_msh3_ctx *ctx = h3_get_msh3_ctx(data);
+	struct stream_ctx *stream = H3_STREAM_CTX(ctx, data);

	(void)Request;
	if(!stream)
@@ -444,7 +466,8 @@ static void MSH3_CALL msh3_shutdown_complete(MSH3_REQUEST *Request,
	void *IfContext)
	{
	struct Curl_easy *data = IfContext;
-	struct stream_ctx *stream = H3_STREAM_CTX(data);
+	struct cf_msh3_ctx *ctx = h3_get_msh3_ctx(data);
+	struct stream_ctx *stream = H3_STREAM_CTX(ctx, data);

	if(!stream)
	return;
@@ -456,7 +479,8 @@ static void MSH3_CALL msh3_data_sent(MSH3_REQUEST *Request,
	void IfContext, void SendContext)
	{
	struct Curl_easy *data = IfContext;
-	struct stream_ctx *stream = H3_STREAM_CTX(data);
+	struct cf_msh3_ctx *ctx = h3_get_msh3_ctx(data);
+	struct stream_ctx *stream = H3_STREAM_CTX(ctx, data);
	if(!stream)
	return;
	(void)Request;
@@ -468,7 +492,8 @@ static ssize_t recv_closed_stream(struct Curl_cfilter *cf,
	struct Curl_easy *data,
	CURLcode *err)
	{
-	struct stream_ctx *stream = H3_STREAM_CTX(data);
+	struct cf_msh3_ctx *ctx = cf->ctx;
+	struct stream_ctx *stream = H3_STREAM_CTX(ctx, data);
	ssize_t nread = -1;

	if(!stream) {
@@ -501,7 +526,8 @@ out:

	static void set_quic_expire(struct Curl_cfilter cf, struct Curl_easy data)
	{
-	struct stream_ctx *stream = H3_STREAM_CTX(data);
+	struct cf_msh3_ctx *ctx = cf->ctx;
+	struct stream_ctx *stream = H3_STREAM_CTX(ctx, data);

	/* we have no indication from msh3 when it would be a good time
	* to juggle the connection again. So, we compromise by calling
@@ -518,17 +544,17 @@ static void set_quic_expire(struct Curl_cfilter cf, struct Curl_easy data)
	static ssize_t cf_msh3_recv(struct Curl_cfilter cf, struct Curl_easy data,
	char buf, size_t len, CURLcode err)
	{
-	struct stream_ctx *stream = H3_STREAM_CTX(data);
+	struct cf_msh3_ctx *ctx = cf->ctx;
+	struct stream_ctx *stream = H3_STREAM_CTX(ctx, data);
	ssize_t nread = -1;
	struct cf_call_data save;

-	(void)cf;
+	CURL_TRC_CF(data, cf, "cf_recv(len=%zu), stream=%d", len, !!stream);
	if(!stream) {
	*err = CURLE_RECV_ERROR;
	return -1;
	}
	CF_DATA_SAVE(save, cf, data);
-	CURL_TRC_CF(data, cf, "req: recv with %zu byte buffer", len);

	msh3_lock_acquire(&stream->recv_lock);

@@ -570,7 +596,7 @@ static ssize_t cf_msh3_send(struct Curl_cfilter cf, struct Curl_easy data,
	const void buf, size_t len, CURLcode err)
	{
	struct cf_msh3_ctx *ctx = cf->ctx;
-	struct stream_ctx *stream = H3_STREAM_CTX(data);
+	struct stream_ctx *stream = H3_STREAM_CTX(ctx, data);
	struct h1_req_parser h1;
	struct dynhds h2_headers;
	MSH3_HEADER *nva = NULL;
@@ -682,7 +708,7 @@ static void cf_msh3_adjust_pollset(struct Curl_cfilter *cf,
	struct easy_pollset *ps)
	{
	struct cf_msh3_ctx *ctx = cf->ctx;
-	struct stream_ctx *stream = H3_STREAM_CTX(data);
+	struct stream_ctx *stream = H3_STREAM_CTX(ctx, data);
	struct cf_call_data save;

	CF_DATA_SAVE(save, cf, data);
@@ -701,7 +727,8 @@ static void cf_msh3_adjust_pollset(struct Curl_cfilter *cf,
	static bool cf_msh3_data_pending(struct Curl_cfilter *cf,
	const struct Curl_easy *data)
	{
-	struct stream_ctx *stream = H3_STREAM_CTX(data);
+	struct cf_msh3_ctx *ctx = cf->ctx;
+	struct stream_ctx *stream = H3_STREAM_CTX(ctx, data);
	struct cf_call_data save;
	bool pending = FALSE;

@@ -737,7 +764,8 @@ static CURLcode cf_msh3_data_event(struct Curl_cfilter *cf,
	struct Curl_easy *data,
	int event, int arg1, void *arg2)
	{
-	struct stream_ctx *stream = H3_STREAM_CTX(data);
+	struct cf_msh3_ctx *ctx = cf->ctx;
+	struct stream_ctx *stream = H3_STREAM_CTX(ctx, data);
	struct cf_call_data save;
	CURLcode result = CURLE_OK;

@@ -785,6 +813,7 @@ static CURLcode cf_connect_start(struct Curl_cfilter *cf,
	CURLcode result;
	bool verify;

+	Curl_hash_offt_init(&ctx->streams, 63, h3_stream_hash_free);
	conn_config = Curl_ssl_cf_get_primary_config(cf);
	if(!conn_config)
	return CURLE_FAILED_INIT;
@@ -911,6 +940,7 @@ static void cf_msh3_close(struct Curl_cfilter cf, struct Curl_easy data)
	MsH3ApiClose(ctx->api);
	ctx->api = NULL;
	}
+	Curl_hash_destroy(&ctx->streams);

	if(ctx->active) {
	/* We share our socket at cf->conn->sock[cf->sockindex] when active.
@@ -1019,6 +1049,20 @@ struct Curl_cftype Curl_cft_http3 = {
	cf_msh3_query,
	};

+	static struct cf_msh3_ctx h3_get_msh3_ctx(struct Curl_easy data)
+	{
+	if(data && data->conn) {
+	struct Curl_cfilter *cf = data->conn->cfilter[FIRSTSOCKET];
+	while(cf) {
+	if(cf->cft == &Curl_cft_http3)
+	return cf->ctx;
+	cf = cf->next;
+	}
+	}
+	DEBUGF(infof(data, "no filter context found"));
+	return NULL;
+	}
+
	CURLcode Curl_cf_msh3_create(struct Curl_cfilter **pcf,
	struct Curl_easy *data,
	struct connectdata *conn,

lib/vquic/curl_ngtcp2.c+66 -36

@@ -44,6 +44,7 @@
	#endif

	#include "urldata.h"
+	#include "hash.h"
	#include "sendf.h"
	#include "strdup.h"
	#include "rand.h"
@@ -131,6 +132,7 @@ struct cf_ngtcp2_ctx {
	struct curltime reconnect_at; /* time the next attempt should start */
	struct bufc_pool stream_bufcp; /* chunk pool for streams */
	struct dynbuf scratch; /* temp buffer for header construction */
+	struct Curl_hash streams; /* hash `data->id` to `h3_stream_ctx` */
	size_t max_stream_window; /* max flow window for one stream */
	uint64_t max_idle_ms; /* max idle time for QUIC connection */
	int qlogfd;
@@ -160,18 +162,27 @@ struct h3_stream_ctx {
	BIT(quic_flow_blocked); /* stream is blocked by QUIC flow control */
	};

-	#define H3_STREAM_CTX(d) ((struct h3_stream_ctx *)(((d) && (d)->req.p.http)? \
-	((struct HTTP *)(d)->req.p.http)->h3_ctx \
-	: NULL))
-	#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)
+	#define H3_STREAM_CTX(ctx,data) ((struct h3_stream_ctx *)(\
+	data? Curl_hash_offt_get(&(ctx)->streams, (data)->id) : NULL))
+
+	static void h3_stream_ctx_free(struct h3_stream_ctx *stream)
+	{
+	Curl_bufq_free(&stream->sendbuf);
+	Curl_h1_req_parse_free(&stream->h1);
+	free(stream);
+	}
+
+	static void h3_stream_hash_free(void *stream)
+	{
+	DEBUGASSERT(stream);
+	h3_stream_ctx_free((struct h3_stream_ctx *)stream);
+	}

	static CURLcode h3_data_setup(struct Curl_cfilter *cf,
	struct Curl_easy *data)
	{
	struct cf_ngtcp2_ctx *ctx = cf->ctx;
-	struct h3_stream_ctx *stream = H3_STREAM_CTX(data);
+	struct h3_stream_ctx *stream = H3_STREAM_CTX(ctx, data);

	if(!data \|\| !data->req.p.http) {
	failf(data, "initialization failure, transfer not http initialized");
@@ -192,14 +203,18 @@ static CURLcode h3_data_setup(struct Curl_cfilter *cf,
	stream->sendbuf_len_in_flight = 0;
	Curl_h1_req_parse_init(&stream->h1, H1_PARSE_DEFAULT_MAX_LINE_LEN);

-	H3_STREAM_LCTX(data) = stream;
+	if(!Curl_hash_offt_set(&ctx->streams, data->id, stream)) {
+	h3_stream_ctx_free(stream);
+	return CURLE_OUT_OF_MEMORY;
+	}
+
	return CURLE_OK;
	}

	static void h3_data_done(struct Curl_cfilter cf, struct Curl_easy data)
	{
	struct cf_ngtcp2_ctx *ctx = cf->ctx;
-	struct h3_stream_ctx *stream = H3_STREAM_CTX(data);
+	struct h3_stream_ctx *stream = H3_STREAM_CTX(ctx, data);

	(void)cf;
	if(stream) {
@@ -214,38 +229,46 @@ static void h3_data_done(struct Curl_cfilter cf, struct Curl_easy data)
	stream->closed = TRUE;
	}

-	Curl_bufq_free(&stream->sendbuf);
-	Curl_h1_req_parse_free(&stream->h1);
-	free(stream);
-	H3_STREAM_LCTX(data) = NULL;
+	Curl_hash_offt_remove(&ctx->streams, data->id);
	}
	}

	static struct Curl_easy get_stream_easy(struct Curl_cfilter cf,
	struct Curl_easy *data,
-	int64_t stream_id)
+	int64_t stream_id,
+	struct h3_stream_ctx **pstream)
	{
+	struct cf_ngtcp2_ctx *ctx = cf->ctx;
	struct Curl_easy *sdata;
+	struct h3_stream_ctx *stream;

	(void)cf;
-	if(H3_STREAM_ID(data) == stream_id) {
+	stream = H3_STREAM_CTX(ctx, data);
+	if(stream && stream->id == stream_id) {
+	*pstream = stream;
	return data;
	}
	else {
	DEBUGASSERT(data->multi);
	for(sdata = data->multi->easyp; sdata; sdata = sdata->next) {
-	if((sdata->conn == data->conn) && H3_STREAM_ID(sdata) == stream_id) {
+	if(sdata->conn != data->conn)
+	continue;
+	stream = H3_STREAM_CTX(ctx, sdata);
+	if(stream && stream->id == stream_id) {
+	*pstream = stream;
	return sdata;
	}
	}
	}
+	*pstream = NULL;
	return NULL;
	}

	static void h3_drain_stream(struct Curl_cfilter *cf,
	struct Curl_easy *data)
	{
-	struct h3_stream_ctx *stream = H3_STREAM_CTX(data);
+	struct cf_ngtcp2_ctx *ctx = cf->ctx;
+	struct h3_stream_ctx *stream = H3_STREAM_CTX(ctx, data);
	unsigned char bits;

	(void)cf;
@@ -552,12 +575,12 @@ static int cb_extend_max_stream_data(ngtcp2_conn *tconn, int64_t sid,
	if(rv && rv != NGHTTP3_ERR_STREAM_NOT_FOUND) {
	return NGTCP2_ERR_CALLBACK_FAILURE;
	}
-	s_data = get_stream_easy(cf, data, stream_id);
-	stream = H3_STREAM_CTX(s_data);
-	if(stream && stream->quic_flow_blocked) {
-	CURL_TRC_CF(data, cf, "[%" CURL_PRId64 "] unblock quic flow", stream_id);
+	s_data = get_stream_easy(cf, data, stream_id, &stream);
+	if(s_data && stream && stream->quic_flow_blocked) {
+	CURL_TRC_CF(s_data, cf, "[%" CURL_PRId64 "] unblock quic flow",
+	stream_id);
	stream->quic_flow_blocked = FALSE;
-	h3_drain_stream(cf, data);
+	h3_drain_stream(cf, s_data);
	}
	return 0;
	}
@@ -723,7 +746,7 @@ static void cf_ngtcp2_adjust_pollset(struct Curl_cfilter *cf,

	Curl_pollset_check(data, ps, ctx->q.sockfd, &want_recv, &want_send);
	if(want_recv \|\| want_send) {
-	struct h3_stream_ctx *stream = H3_STREAM_CTX(data);
+	struct h3_stream_ctx *stream = H3_STREAM_CTX(ctx, data);
	struct cf_call_data save;
	bool c_exhaust, s_exhaust;

@@ -746,9 +769,10 @@ static int cb_h3_stream_close(nghttp3_conn *conn, int64_t sid,
	void *stream_user_data)
	{
	struct Curl_cfilter *cf = user_data;
+	struct cf_ngtcp2_ctx *ctx = cf->ctx;
	struct Curl_easy *data = stream_user_data;
	curl_int64_t stream_id = (curl_int64_t)sid;
-	struct h3_stream_ctx *stream = H3_STREAM_CTX(data);
+	struct h3_stream_ctx *stream = H3_STREAM_CTX(ctx, data);
	(void)conn;
	(void)stream_id;

@@ -778,7 +802,7 @@ static int cb_h3_recv_data(nghttp3_conn *conn, int64_t stream3_id,
	struct Curl_cfilter *cf = user_data;
	struct cf_ngtcp2_ctx *ctx = cf->ctx;
	struct Curl_easy *data = stream_user_data;
-	struct h3_stream_ctx *stream = H3_STREAM_CTX(data);
+	struct h3_stream_ctx *stream = H3_STREAM_CTX(ctx, data);
	CURLcode result;

	(void)conn;
@@ -827,9 +851,10 @@ static int cb_h3_end_headers(nghttp3_conn *conn, int64_t sid,
	int fin, void user_data, void stream_user_data)
	{
	struct Curl_cfilter *cf = user_data;
+	struct cf_ngtcp2_ctx *ctx = cf->ctx;
	struct Curl_easy *data = stream_user_data;
	curl_int64_t stream_id = (curl_int64_t)sid;
-	struct h3_stream_ctx *stream = H3_STREAM_CTX(data);
+	struct h3_stream_ctx *stream = H3_STREAM_CTX(ctx, data);
	CURLcode result = CURLE_OK;
	(void)conn;
	(void)stream_id;
@@ -864,7 +889,7 @@ static int cb_h3_recv_header(nghttp3_conn *conn, int64_t sid,
	nghttp3_vec h3name = nghttp3_rcbuf_get_buf(name);
	nghttp3_vec h3val = nghttp3_rcbuf_get_buf(value);
	struct Curl_easy *data = stream_user_data;
-	struct h3_stream_ctx *stream = H3_STREAM_CTX(data);
+	struct h3_stream_ctx *stream = H3_STREAM_CTX(ctx, data);
	CURLcode result = CURLE_OK;
	(void)conn;
	(void)stream_id;
@@ -1075,7 +1100,7 @@ static ssize_t cf_ngtcp2_recv(struct Curl_cfilter cf, struct Curl_easy data,
	char buf, size_t blen, CURLcode err)
	{
	struct cf_ngtcp2_ctx *ctx = cf->ctx;
-	struct h3_stream_ctx *stream = H3_STREAM_CTX(data);
+	struct h3_stream_ctx *stream = H3_STREAM_CTX(ctx, data);
	ssize_t nread = -1;
	struct cf_call_data save;
	struct pkt_io_ctx pktx;
@@ -1133,8 +1158,9 @@ static int cb_h3_acked_req_body(nghttp3_conn *conn, int64_t stream_id,
	void *stream_user_data)
	{
	struct Curl_cfilter *cf = user_data;
+	struct cf_ngtcp2_ctx *ctx = cf->ctx;
	struct Curl_easy *data = stream_user_data;
-	struct h3_stream_ctx *stream = H3_STREAM_CTX(data);
+	struct h3_stream_ctx *stream = H3_STREAM_CTX(ctx, data);
	size_t skiplen;

	(void)cf;
@@ -1167,8 +1193,9 @@ cb_h3_read_req_body(nghttp3_conn *conn, int64_t stream_id,
	void *stream_user_data)
	{
	struct Curl_cfilter *cf = user_data;
+	struct cf_ngtcp2_ctx *ctx = cf->ctx;
	struct Curl_easy *data = stream_user_data;
-	struct h3_stream_ctx *stream = H3_STREAM_CTX(data);
+	struct h3_stream_ctx *stream = H3_STREAM_CTX(ctx, data);
	ssize_t nwritten = 0;
	size_t nvecs = 0;
	(void)cf;
@@ -1252,7 +1279,7 @@ static ssize_t h3_stream_open(struct Curl_cfilter *cf,
	*err = h3_data_setup(cf, data);
	if(*err)
	goto out;
-	stream = H3_STREAM_CTX(data);
+	stream = H3_STREAM_CTX(ctx, data);
	DEBUGASSERT(stream);
	if(!stream) {
	*err = CURLE_FAILED_INIT;
@@ -1364,7 +1391,7 @@ static ssize_t cf_ngtcp2_send(struct Curl_cfilter cf, struct Curl_easy data,
	const void buf, size_t len, CURLcode err)
	{
	struct cf_ngtcp2_ctx *ctx = cf->ctx;
-	struct h3_stream_ctx *stream = H3_STREAM_CTX(data);
+	struct h3_stream_ctx *stream = H3_STREAM_CTX(ctx, data);
	ssize_t sent = 0;
	struct cf_call_data save;
	struct pkt_io_ctx pktx;
@@ -1389,7 +1416,7 @@ static ssize_t cf_ngtcp2_send(struct Curl_cfilter cf, struct Curl_easy data,
	CURL_TRC_CF(data, cf, "failed to open stream -> %d", *err);
	goto out;
	}
-	stream = H3_STREAM_CTX(data);
+	stream = H3_STREAM_CTX(ctx, data);
	}
	else if(stream->upload_blocked_len) {
	/* the data in `buf` has already been submitted or added to the
@@ -1616,7 +1643,7 @@ static ssize_t read_pkt_to_send(void *userp,
	else if(n < 0) {
	switch(n) {
	case NGTCP2_ERR_STREAM_DATA_BLOCKED: {
-	struct h3_stream_ctx *stream = H3_STREAM_CTX(x->data);
+	struct h3_stream_ctx *stream = H3_STREAM_CTX(ctx, x->data);
	DEBUGASSERT(ndatalen == -1);
	nghttp3_conn_block_stream(ctx->h3conn, stream_id);
	CURL_TRC_CF(x->data, x->cf, "[%" CURL_PRId64 "] block quic flow",
@@ -1830,7 +1857,7 @@ static CURLcode cf_ngtcp2_data_event(struct Curl_cfilter *cf,
	h3_data_done(cf, data);
	break;
	case CF_CTRL_DATA_DONE_SEND: {
-	struct h3_stream_ctx *stream = H3_STREAM_CTX(data);
+	struct h3_stream_ctx *stream = H3_STREAM_CTX(ctx, data);
	if(stream && !stream->send_closed) {
	stream->send_closed = TRUE;
	stream->upload_left = Curl_bufq_len(&stream->sendbuf);
@@ -1839,7 +1866,7 @@ static CURLcode cf_ngtcp2_data_event(struct Curl_cfilter *cf,
	break;
	}
	case CF_CTRL_DATA_IDLE: {
-	struct h3_stream_ctx *stream = H3_STREAM_CTX(data);
+	struct h3_stream_ctx *stream = H3_STREAM_CTX(ctx, data);
	CURL_TRC_CF(data, cf, "data idle");
	if(stream && !stream->closed) {
	result = check_and_set_expiry(cf, data, NULL);
@@ -1870,6 +1897,8 @@ static void cf_ngtcp2_ctx_clear(struct cf_ngtcp2_ctx *ctx)
	ngtcp2_conn_del(ctx->qconn);
	Curl_bufcp_free(&ctx->stream_bufcp);
	Curl_dyn_free(&ctx->scratch);
+	Curl_hash_clean(&ctx->streams);
+	Curl_hash_destroy(&ctx->streams);
	Curl_ssl_peer_cleanup(&ctx->peer);

	memset(ctx, 0, sizeof(*ctx));
@@ -2008,6 +2037,7 @@ static CURLcode cf_connect_start(struct Curl_cfilter *cf,
	Curl_bufcp_init(&ctx->stream_bufcp, H3_STREAM_CHUNK_SIZE,
	H3_STREAM_POOL_SPARES);
	Curl_dyn_init(&ctx->scratch, CURL_MAX_HTTP_HEADER);
+	Curl_hash_offt_init(&ctx->streams, 63, h3_stream_hash_free);

	result = Curl_ssl_peer_init(&ctx->peer, cf, TRNSPRT_QUIC);
	if(result)

lib/vquic/curl_osslq.c+68 -39

@@ -32,6 +32,7 @@
	#include <nghttp3/nghttp3.h>

	#include "urldata.h"
+	#include "hash.h"
	#include "sendf.h"
	#include "strdup.h"
	#include "rand.h"
@@ -289,6 +290,7 @@ struct cf_osslq_ctx {
	struct curltime first_byte_at; /* when first byte was recvd */
	struct curltime reconnect_at; /* time the next attempt should start */
	struct bufc_pool stream_bufcp; /* chunk pool for streams */
+	struct Curl_hash streams; /* hash `data->id` to `h3_stream_ctx` */
	size_t max_stream_window; /* max flow window for one stream */
	uint64_t max_idle_ms; /* max idle time for QUIC connection */
	BIT(got_first_byte); /* if first byte was received */
@@ -306,6 +308,8 @@ static void cf_osslq_ctx_clear(struct cf_osslq_ctx *ctx)
	Curl_vquic_tls_cleanup(&ctx->tls);
	vquic_ctx_free(&ctx->q);
	Curl_bufcp_free(&ctx->stream_bufcp);
+	Curl_hash_clean(&ctx->streams);
+	Curl_hash_destroy(&ctx->streams);
	Curl_ssl_peer_cleanup(&ctx->peer);

	memset(ctx, 0, sizeof(*ctx));
@@ -493,18 +497,29 @@ struct h3_stream_ctx {
	BIT(quic_flow_blocked); /* stream is blocked by QUIC flow control */
	};

-	#define H3_STREAM_CTX(d) ((struct h3_stream_ctx *)(((d) && (d)->req.p.http)? \
-	((struct HTTP *)(d)->req.p.http)->h3_ctx \
-	: NULL))
-	#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)->s.id : -2)
+	#define H3_STREAM_CTX(ctx,data) ((struct h3_stream_ctx *)(\
+	data? Curl_hash_offt_get(&(ctx)->streams, (data)->id) : NULL))
+
+	static void h3_stream_ctx_free(struct h3_stream_ctx *stream)
+	{
+	cf_osslq_stream_cleanup(&stream->s);
+	Curl_bufq_free(&stream->sendbuf);
+	Curl_bufq_free(&stream->recvbuf);
+	Curl_h1_req_parse_free(&stream->h1);
+	free(stream);
+	}
+
+	static void h3_stream_hash_free(void *stream)
+	{
+	DEBUGASSERT(stream);
+	h3_stream_ctx_free((struct h3_stream_ctx *)stream);
+	}

	static CURLcode h3_data_setup(struct Curl_cfilter *cf,
	struct Curl_easy *data)
	{
	struct cf_osslq_ctx *ctx = cf->ctx;
-	struct h3_stream_ctx *stream = H3_STREAM_CTX(data);
+	struct h3_stream_ctx *stream = H3_STREAM_CTX(ctx, data);

	if(!data \|\| !data->req.p.http) {
	failf(data, "initialization failure, transfer not http initialized");
@@ -530,14 +545,18 @@ static CURLcode h3_data_setup(struct Curl_cfilter *cf,
	stream->recv_buf_nonflow = 0;
	Curl_h1_req_parse_init(&stream->h1, H1_PARSE_DEFAULT_MAX_LINE_LEN);

-	H3_STREAM_LCTX(data) = stream;
+	if(!Curl_hash_offt_set(&ctx->streams, data->id, stream)) {
+	h3_stream_ctx_free(stream);
+	return CURLE_OUT_OF_MEMORY;
+	}
+
	return CURLE_OK;
	}

	static void h3_data_done(struct Curl_cfilter cf, struct Curl_easy data)
	{
	struct cf_osslq_ctx *ctx = cf->ctx;
-	struct h3_stream_ctx *stream = H3_STREAM_CTX(data);
+	struct h3_stream_ctx *stream = H3_STREAM_CTX(ctx, data);

	(void)cf;
	if(stream) {
@@ -551,12 +570,7 @@ static void h3_data_done(struct Curl_cfilter cf, struct Curl_easy data)
	stream->closed = TRUE;
	}

-	cf_osslq_stream_cleanup(&stream->s);
-	Curl_bufq_free(&stream->sendbuf);
-	Curl_bufq_free(&stream->recvbuf);
-	Curl_h1_req_parse_free(&stream->h1);
-	free(stream);
-	H3_STREAM_LCTX(data) = NULL;
+	Curl_hash_offt_remove(&ctx->streams, data->id);
	}
	}

@@ -565,7 +579,7 @@ static struct cf_osslq_stream cf_osslq_get_qstream(struct Curl_cfilter cf,
	int64_t stream_id)
	{
	struct cf_osslq_ctx *ctx = cf->ctx;
-	struct h3_stream_ctx *stream = H3_STREAM_CTX(data);
+	struct h3_stream_ctx *stream = H3_STREAM_CTX(ctx, data);
	struct Curl_easy *sdata;

	if(stream && stream->s.id == stream_id) {
@@ -583,9 +597,11 @@ static struct cf_osslq_stream cf_osslq_get_qstream(struct Curl_cfilter cf,
	else {
	DEBUGASSERT(data->multi);
	for(sdata = data->multi->easyp; sdata; sdata = sdata->next) {
-	if((sdata->conn == data->conn) && H3_STREAM_ID(sdata) == stream_id) {
-	stream = H3_STREAM_CTX(sdata);
-	return stream? &stream->s : NULL;
+	if(sdata->conn != data->conn)
+	continue;
+	stream = H3_STREAM_CTX(ctx, sdata);
+	if(stream && stream->s.id == stream_id) {
+	return &stream->s;
	}
	}
	}
@@ -595,7 +611,8 @@ static struct cf_osslq_stream cf_osslq_get_qstream(struct Curl_cfilter cf,
	static void h3_drain_stream(struct Curl_cfilter *cf,
	struct Curl_easy *data)
	{
-	struct h3_stream_ctx *stream = H3_STREAM_CTX(data);
+	struct cf_osslq_ctx *ctx = cf->ctx;
+	struct h3_stream_ctx *stream = H3_STREAM_CTX(ctx, data);
	unsigned char bits;

	(void)cf;
@@ -625,8 +642,9 @@ static int cb_h3_stream_close(nghttp3_conn *conn, int64_t stream_id,
	void *stream_user_data)
	{
	struct Curl_cfilter *cf = user_data;
+	struct cf_osslq_ctx *ctx = cf->ctx;
	struct Curl_easy *data = stream_user_data;
-	struct h3_stream_ctx *stream = H3_STREAM_CTX(data);
+	struct h3_stream_ctx *stream = H3_STREAM_CTX(ctx, data);
	(void)conn;
	(void)stream_id;

@@ -659,7 +677,8 @@ static CURLcode write_resp_raw(struct Curl_cfilter *cf,
	const void *mem, size_t memlen,
	bool flow)
	{
-	struct h3_stream_ctx *stream = H3_STREAM_CTX(data);
+	struct cf_osslq_ctx *ctx = cf->ctx;
+	struct h3_stream_ctx *stream = H3_STREAM_CTX(ctx, data);
	CURLcode result = CURLE_OK;
	ssize_t nwritten;

@@ -689,8 +708,9 @@ static int cb_h3_recv_data(nghttp3_conn *conn, int64_t stream3_id,
	void user_data, void stream_user_data)
	{
	struct Curl_cfilter *cf = user_data;
+	struct cf_osslq_ctx *ctx = cf->ctx;
	struct Curl_easy *data = stream_user_data;
-	struct h3_stream_ctx *stream = H3_STREAM_CTX(data);
+	struct h3_stream_ctx *stream = H3_STREAM_CTX(ctx, data);
	CURLcode result;

	(void)conn;
@@ -717,8 +737,9 @@ static int cb_h3_deferred_consume(nghttp3_conn *conn, int64_t stream_id,
	void *stream_user_data)
	{
	struct Curl_cfilter *cf = user_data;
+	struct cf_osslq_ctx *ctx = cf->ctx;
	struct Curl_easy *data = stream_user_data;
-	struct h3_stream_ctx *stream = H3_STREAM_CTX(data);
+	struct h3_stream_ctx *stream = H3_STREAM_CTX(ctx, data);

	(void)conn;
	(void)stream_id;
@@ -735,10 +756,11 @@ static int cb_h3_recv_header(nghttp3_conn *conn, int64_t sid,
	{
	struct Curl_cfilter *cf = user_data;
	curl_int64_t stream_id = sid;
+	struct cf_osslq_ctx *ctx = cf->ctx;
	nghttp3_vec h3name = nghttp3_rcbuf_get_buf(name);
	nghttp3_vec h3val = nghttp3_rcbuf_get_buf(value);
	struct Curl_easy *data = stream_user_data;
-	struct h3_stream_ctx *stream = H3_STREAM_CTX(data);
+	struct h3_stream_ctx *stream = H3_STREAM_CTX(ctx, data);
	CURLcode result = CURLE_OK;
	(void)conn;
	(void)stream_id;
@@ -795,9 +817,10 @@ static int cb_h3_end_headers(nghttp3_conn *conn, int64_t sid,
	int fin, void user_data, void stream_user_data)
	{
	struct Curl_cfilter *cf = user_data;
+	struct cf_osslq_ctx *ctx = cf->ctx;
	struct Curl_easy *data = stream_user_data;
	curl_int64_t stream_id = sid;
-	struct h3_stream_ctx *stream = H3_STREAM_CTX(data);
+	struct h3_stream_ctx *stream = H3_STREAM_CTX(ctx, data);
	CURLcode result = CURLE_OK;
	(void)conn;
	(void)stream_id;
@@ -826,9 +849,10 @@ static int cb_h3_stop_sending(nghttp3_conn *conn, int64_t sid,
	void *stream_user_data)
	{
	struct Curl_cfilter *cf = user_data;
+	struct cf_osslq_ctx *ctx = cf->ctx;
	struct Curl_easy *data = stream_user_data;
	curl_int64_t stream_id = sid;
-	struct h3_stream_ctx *stream = H3_STREAM_CTX(data);
+	struct h3_stream_ctx *stream = H3_STREAM_CTX(ctx, data);
	(void)conn;
	(void)app_error_code;

@@ -844,9 +868,10 @@ static int cb_h3_reset_stream(nghttp3_conn *conn, int64_t sid,
	uint64_t app_error_code, void *user_data,
	void *stream_user_data) {
	struct Curl_cfilter *cf = user_data;
+	struct cf_osslq_ctx *ctx = cf->ctx;
	struct Curl_easy *data = stream_user_data;
	curl_int64_t stream_id = sid;
-	struct h3_stream_ctx *stream = H3_STREAM_CTX(data);
+	struct h3_stream_ctx *stream = H3_STREAM_CTX(ctx, data);
	int rv;
	(void)conn;

@@ -869,8 +894,9 @@ cb_h3_read_req_body(nghttp3_conn *conn, int64_t stream_id,
	void *stream_user_data)
	{
	struct Curl_cfilter *cf = user_data;
+	struct cf_osslq_ctx *ctx = cf->ctx;
	struct Curl_easy *data = stream_user_data;
-	struct h3_stream_ctx *stream = H3_STREAM_CTX(data);
+	struct h3_stream_ctx *stream = H3_STREAM_CTX(ctx, data);
	ssize_t nwritten = 0;
	size_t nvecs = 0;
	(void)cf;
@@ -933,8 +959,9 @@ static int cb_h3_acked_stream_data(nghttp3_conn *conn, int64_t stream_id,
	void *stream_user_data)
	{
	struct Curl_cfilter *cf = user_data;
+	struct cf_osslq_ctx *ctx = cf->ctx;
	struct Curl_easy *data = stream_user_data;
-	struct h3_stream_ctx *stream = H3_STREAM_CTX(data);
+	struct h3_stream_ctx *stream = H3_STREAM_CTX(ctx, data);
	size_t skiplen;

	(void)cf;
@@ -1047,6 +1074,7 @@ static CURLcode cf_osslq_ctx_start(struct Curl_cfilter *cf,

	Curl_bufcp_init(&ctx->stream_bufcp, H3_STREAM_CHUNK_SIZE,
	H3_STREAM_POOL_SPARES);
+	Curl_hash_offt_init(&ctx->streams, 63, h3_stream_hash_free);
	result = Curl_ssl_peer_init(&ctx->peer, cf, TRNSPRT_QUIC);
	if(result)
	goto out;
@@ -1325,7 +1353,7 @@ static CURLcode cf_progress_ingress(struct Curl_cfilter *cf,
	DEBUGASSERT(data->multi);
	for(sdata = data->multi->easyp; sdata; sdata = sdata->next) {
	if(sdata->conn == data->conn && CURL_WANT_RECV(sdata)) {
-	stream = H3_STREAM_CTX(sdata);
+	stream = H3_STREAM_CTX(ctx, sdata);
	if(stream && !stream->closed &&
	!Curl_bufq_is_full(&stream->recvbuf)) {
	result = cf_osslq_stream_recv(&stream->s, cf, sdata);
@@ -1352,7 +1380,7 @@ static CURLcode cf_osslq_check_and_unblock(struct Curl_cfilter *cf,
	if(ctx->h3.conn) {
	for(sdata = data->multi->easyp; sdata; sdata = sdata->next) {
	if(sdata->conn == data->conn) {
-	stream = H3_STREAM_CTX(sdata);
+	stream = H3_STREAM_CTX(ctx, sdata);
	if(stream && stream->s.ssl && stream->s.send_blocked &&
	!SSL_want_write(stream->s.ssl)) {
	nghttp3_conn_unblock_stream(ctx->h3.conn, stream->s.id);
@@ -1693,7 +1721,7 @@ static ssize_t h3_stream_open(struct Curl_cfilter *cf,
	*err = h3_data_setup(cf, data);
	if(*err)
	goto out;
-	stream = H3_STREAM_CTX(data);
+	stream = H3_STREAM_CTX(ctx, data);
	DEBUGASSERT(stream);
	if(!stream) {
	*err = CURLE_FAILED_INIT;
@@ -1806,7 +1834,7 @@ static ssize_t cf_osslq_send(struct Curl_cfilter cf, struct Curl_easy data,
	const void buf, size_t len, CURLcode err)
	{
	struct cf_osslq_ctx *ctx = cf->ctx;
-	struct h3_stream_ctx *stream = H3_STREAM_CTX(data);
+	struct h3_stream_ctx *stream = H3_STREAM_CTX(ctx, data);
	struct cf_call_data save;
	ssize_t nwritten;
	CURLcode result;
@@ -1837,7 +1865,7 @@ static ssize_t cf_osslq_send(struct Curl_cfilter cf, struct Curl_easy data,
	CURL_TRC_CF(data, cf, "failed to open stream -> %d", *err);
	goto out;
	}
-	stream = H3_STREAM_CTX(data);
+	stream = H3_STREAM_CTX(ctx, data);
	}
	else if(stream->upload_blocked_len) {
	/* the data in `buf` has already been submitted or added to the
@@ -1946,7 +1974,7 @@ static ssize_t cf_osslq_recv(struct Curl_cfilter cf, struct Curl_easy data,
	char buf, size_t len, CURLcode err)
	{
	struct cf_osslq_ctx *ctx = cf->ctx;
-	struct h3_stream_ctx *stream = H3_STREAM_CTX(data);
+	struct h3_stream_ctx *stream = H3_STREAM_CTX(ctx, data);
	ssize_t nread = -1;
	struct cf_call_data save;
	CURLcode result;
@@ -2029,7 +2057,8 @@ out:
	static bool cf_osslq_data_pending(struct Curl_cfilter *cf,
	const struct Curl_easy *data)
	{
-	const struct h3_stream_ctx *stream = H3_STREAM_CTX(data);
+	struct cf_osslq_ctx *ctx = cf->ctx;
+	const struct h3_stream_ctx *stream = H3_STREAM_CTX(ctx, data);
	(void)cf;
	return stream && !Curl_bufq_is_empty(&stream->recvbuf);
	}
@@ -2058,7 +2087,7 @@ static CURLcode cf_osslq_data_event(struct Curl_cfilter *cf,
	h3_data_done(cf, data);
	break;
	case CF_CTRL_DATA_DONE_SEND: {
-	struct h3_stream_ctx *stream = H3_STREAM_CTX(data);
+	struct h3_stream_ctx *stream = H3_STREAM_CTX(ctx, data);
	if(stream && !stream->send_closed) {
	stream->send_closed = TRUE;
	stream->upload_left = Curl_bufq_len(&stream->sendbuf);
@@ -2067,7 +2096,7 @@ static CURLcode cf_osslq_data_event(struct Curl_cfilter *cf,
	break;
	}
	case CF_CTRL_DATA_IDLE: {
-	struct h3_stream_ctx *stream = H3_STREAM_CTX(data);
+	struct h3_stream_ctx *stream = H3_STREAM_CTX(ctx, data);
	CURL_TRC_CF(data, cf, "data idle");
	if(stream && !stream->closed) {
	result = check_and_set_expiry(cf, data);

lib/vquic/curl_quiche.c+83 -54

@@ -29,6 +29,7 @@
	#include <openssl/err.h>
	#include <openssl/ssl.h>
	#include "bufq.h"
+	#include "hash.h"
	#include "urldata.h"
	#include "cfilters.h"
	#include "cf-socket.h"
@@ -98,6 +99,7 @@ struct cf_quiche_ctx {
	struct curltime handshake_at; /* time connect handshake finished */
	struct curltime reconnect_at; /* time the next attempt should start */
	struct bufc_pool stream_bufcp; /* chunk pool for streams */
+	struct Curl_hash streams; /* hash `data->id` to `stream_ctx` */
	curl_off_t data_recvd;
	curl_uint64_t max_idle_ms; /* max idle time for QUIC conn */
	BIT(goaway); /* got GOAWAY from server */
@@ -129,6 +131,8 @@ static void cf_quiche_ctx_clear(struct cf_quiche_ctx *ctx)
	Curl_ssl_peer_cleanup(&ctx->peer);
	vquic_ctx_free(&ctx->q);
	Curl_bufcp_free(&ctx->stream_bufcp);
+	Curl_hash_clean(&ctx->streams);
+	Curl_hash_destroy(&ctx->streams);

	memset(ctx, 0, sizeof(*ctx));
	}
@@ -152,23 +156,33 @@ struct stream_ctx {
	BIT(quic_flow_blocked); /* stream is blocked by QUIC flow control */
	};

-	#define H3_STREAM_CTX(d) ((struct stream_ctx *)(((d) && (d)->req.p.http)? \
-	((struct HTTP *)(d)->req.p.http)->h3_ctx \
-	: NULL))
-	#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)
+	#define H3_STREAM_CTX(ctx,data) ((struct stream_ctx *)(\
+	data? Curl_hash_offt_get(&(ctx)->streams, (data)->id) : NULL))
+
+	static void h3_stream_ctx_free(struct stream_ctx *stream)
+	{
+	Curl_bufq_free(&stream->recvbuf);
+	Curl_h1_req_parse_free(&stream->h1);
+	free(stream);
+	}
+
+	static void h3_stream_hash_free(void *stream)
+	{
+	DEBUGASSERT(stream);
+	h3_stream_ctx_free((struct stream_ctx *)stream);
+	}

	static void check_resumes(struct Curl_cfilter *cf,
	struct Curl_easy *data)
	{
+	struct cf_quiche_ctx *ctx = cf->ctx;
	struct Curl_easy *sdata;
	struct stream_ctx *stream;

	DEBUGASSERT(data->multi);
	for(sdata = data->multi->easyp; sdata; sdata = sdata->next) {
	if(sdata->conn == data->conn) {
-	stream = H3_STREAM_CTX(sdata);
+	stream = H3_STREAM_CTX(ctx, sdata);
	if(stream && stream->quic_flow_blocked) {
	stream->quic_flow_blocked = FALSE;
	Curl_expire(data, 0, EXPIRE_RUN_NOW);
@@ -182,7 +196,7 @@ static CURLcode h3_data_setup(struct Curl_cfilter *cf,
	struct Curl_easy *data)
	{
	struct cf_quiche_ctx *ctx = cf->ctx;
-	struct stream_ctx *stream = H3_STREAM_CTX(data);
+	struct stream_ctx *stream = H3_STREAM_CTX(ctx, data);

	if(stream)
	return CURLE_OK;
@@ -191,18 +205,23 @@ static CURLcode h3_data_setup(struct Curl_cfilter *cf,
	if(!stream)
	return CURLE_OUT_OF_MEMORY;

-	H3_STREAM_LCTX(data) = stream;
	stream->id = -1;
	Curl_bufq_initp(&stream->recvbuf, &ctx->stream_bufcp,
	H3_STREAM_RECV_CHUNKS, BUFQ_OPT_SOFT_LIMIT);
	Curl_h1_req_parse_init(&stream->h1, H1_PARSE_DEFAULT_MAX_LINE_LEN);
+
+	if(!Curl_hash_offt_set(&ctx->streams, data->id, stream)) {
+	h3_stream_ctx_free(stream);
+	return CURLE_OUT_OF_MEMORY;
+	}
+
	return CURLE_OK;
	}

	static void h3_data_done(struct Curl_cfilter cf, struct Curl_easy data)
	{
	struct cf_quiche_ctx *ctx = cf->ctx;
-	struct stream_ctx *stream = H3_STREAM_CTX(data);
+	struct stream_ctx *stream = H3_STREAM_CTX(ctx, data);

	(void)cf;
	if(stream) {
@@ -217,17 +236,15 @@ static void h3_data_done(struct Curl_cfilter cf, struct Curl_easy data)
	}
	stream->closed = TRUE;
	}
-	Curl_bufq_free(&stream->recvbuf);
-	Curl_h1_req_parse_free(&stream->h1);
-	free(stream);
-	H3_STREAM_LCTX(data) = NULL;
+	Curl_hash_offt_remove(&ctx->streams, data->id);
	}
	}

	static void drain_stream(struct Curl_cfilter *cf,
	struct Curl_easy *data)
	{
-	struct stream_ctx *stream = H3_STREAM_CTX(data);
+	struct cf_quiche_ctx *ctx = cf->ctx;
+	struct stream_ctx *stream = H3_STREAM_CTX(ctx, data);
	unsigned char bits;

	(void)cf;
@@ -242,22 +259,32 @@ static void drain_stream(struct Curl_cfilter *cf,

	static struct Curl_easy get_stream_easy(struct Curl_cfilter cf,
	struct Curl_easy *data,
-	curl_uint64_t stream3_id)
+	curl_uint64_t stream_id,
+	struct stream_ctx **pstream)
	{
+	struct cf_quiche_ctx *ctx = cf->ctx;
	struct Curl_easy *sdata;
+	struct stream_ctx *stream;

	(void)cf;
-	if(H3_STREAM_ID(data) == stream3_id) {
+	stream = H3_STREAM_CTX(ctx, data);
+	if(stream && stream->id == stream_id) {
+	*pstream = stream;
	return data;
	}
	else {
	DEBUGASSERT(data->multi);
	for(sdata = data->multi->easyp; sdata; sdata = sdata->next) {
-	if((sdata->conn == data->conn) && H3_STREAM_ID(sdata) == stream3_id) {
+	if(sdata->conn != data->conn)
+	continue;
+	stream = H3_STREAM_CTX(ctx, sdata);
+	if(stream && stream->id == stream_id) {
+	*pstream = stream;
	return sdata;
	}
	}
	}
+	*pstream = NULL;
	return NULL;
	}

@@ -270,7 +297,8 @@ static CURLcode write_resp_raw(struct Curl_cfilter *cf,
	struct Curl_easy *data,
	const void *mem, size_t memlen)
	{
-	struct stream_ctx *stream = H3_STREAM_CTX(data);
+	struct cf_quiche_ctx *ctx = cf->ctx;
+	struct stream_ctx *stream = H3_STREAM_CTX(ctx, data);
	CURLcode result = CURLE_OK;
	ssize_t nwritten;

@@ -300,7 +328,8 @@ static int cb_each_header(uint8_t *name, size_t name_len,
	void *argp)
	{
	struct cb_ctx *x = argp;
-	struct stream_ctx *stream = H3_STREAM_CTX(x->data);
+	struct cf_quiche_ctx *ctx = x->cf->ctx;
+	struct stream_ctx *stream = H3_STREAM_CTX(ctx, x->data);
	CURLcode result;

	if(!stream)
@@ -340,7 +369,7 @@ static ssize_t stream_resp_read(void *reader_ctx,
	{
	struct cb_ctx *x = reader_ctx;
	struct cf_quiche_ctx *ctx = x->cf->ctx;
-	struct stream_ctx *stream = H3_STREAM_CTX(x->data);
+	struct stream_ctx *stream = H3_STREAM_CTX(ctx, x->data);
	ssize_t nread;

	if(!stream) {
@@ -363,7 +392,8 @@ static ssize_t stream_resp_read(void *reader_ctx,
	static CURLcode cf_recv_body(struct Curl_cfilter *cf,
	struct Curl_easy *data)
	{
-	struct stream_ctx *stream = H3_STREAM_CTX(data);
+	struct cf_quiche_ctx *ctx = cf->ctx;
+	struct stream_ctx *stream = H3_STREAM_CTX(ctx, data);
	ssize_t nwritten;
	struct cb_ctx cb_ctx;
	CURLcode result = CURLE_OK;
@@ -421,17 +451,15 @@ static const char cf_ev_name(quiche_h3_event ev)

	static CURLcode h3_process_event(struct Curl_cfilter *cf,
	struct Curl_easy *data,
-	curl_uint64_t stream3_id,
+	struct stream_ctx *stream,
	quiche_h3_event *ev)
	{
-	struct stream_ctx *stream = H3_STREAM_CTX(data);
	struct cb_ctx cb_ctx;
	CURLcode result = CURLE_OK;
	int rc;

	if(!stream)
	return CURLE_OK;
-	DEBUGASSERT(stream3_id == stream->id);
	switch(quiche_h3_event_type(ev)) {
	case QUICHE_H3_EVENT_HEADERS:
	stream->resp_got_header = TRUE;
@@ -440,10 +468,10 @@ static CURLcode h3_process_event(struct Curl_cfilter *cf,
	rc = quiche_h3_event_for_each_header(ev, cb_each_header, &cb_ctx);
	if(rc) {
	failf(data, "Error %d in HTTP/3 response header for stream[%"
-	CURL_PRIu64"]", rc, stream3_id);
+	CURL_PRIu64"]", rc, stream->id);
	return CURLE_RECV_ERROR;
	}
-	CURL_TRC_CF(data, cf, "[%"CURL_PRIu64"] <- [HEADERS]", stream3_id);
+	CURL_TRC_CF(data, cf, "[%"CURL_PRIu64"] <- [HEADERS]", stream->id);
	break;

	case QUICHE_H3_EVENT_DATA:
@@ -453,7 +481,7 @@ static CURLcode h3_process_event(struct Curl_cfilter *cf,
	break;

	case QUICHE_H3_EVENT_RESET:
-	CURL_TRC_CF(data, cf, "[%"CURL_PRIu64"] RESET", stream3_id);
+	CURL_TRC_CF(data, cf, "[%"CURL_PRIu64"] RESET", stream->id);
	stream->closed = TRUE;
	stream->reset = TRUE;
	stream->send_closed = TRUE;
@@ -461,7 +489,7 @@ static CURLcode h3_process_event(struct Curl_cfilter *cf,
	break;

	case QUICHE_H3_EVENT_FINISHED:
-	CURL_TRC_CF(data, cf, "[%"CURL_PRIu64"] CLOSED", stream3_id);
+	CURL_TRC_CF(data, cf, "[%"CURL_PRIu64"] CLOSED", stream->id);
	if(!stream->resp_hds_complete) {
	result = write_resp_raw(cf, data, "\r\n", 2);
	if(result)
@@ -473,12 +501,12 @@ static CURLcode h3_process_event(struct Curl_cfilter *cf,
	break;

	case QUICHE_H3_EVENT_GOAWAY:
-	CURL_TRC_CF(data, cf, "[%"CURL_PRIu64"] <- [GOAWAY]", stream3_id);
+	CURL_TRC_CF(data, cf, "[%"CURL_PRIu64"] <- [GOAWAY]", stream->id);
	break;

	default:
	CURL_TRC_CF(data, cf, "[%"CURL_PRIu64"] recv, unhandled event %d",
-	stream3_id, quiche_h3_event_type(ev));
+	stream->id, quiche_h3_event_type(ev));
	break;
	}
	return result;
@@ -488,7 +516,7 @@ static CURLcode cf_poll_events(struct Curl_cfilter *cf,
	struct Curl_easy *data)
	{
	struct cf_quiche_ctx *ctx = cf->ctx;
-	struct stream_ctx *stream = H3_STREAM_CTX(data);
+	struct stream_ctx *stream = NULL;
	struct Curl_easy *sdata;
	quiche_h3_event *ev;
	CURLcode result;
@@ -500,24 +528,21 @@ static CURLcode cf_poll_events(struct Curl_cfilter *cf,
	break;
	}
	else if(stream3_id < 0) {
-	CURL_TRC_CF(data, cf, "[%"CURL_PRIu64"] error poll: %"CURL_PRIu64,
-	stream? stream->id : -1, stream3_id);
+	CURL_TRC_CF(data, cf, "error poll: %"CURL_PRId64, stream3_id);
	return CURLE_HTTP3;
	}

-	sdata = get_stream_easy(cf, data, stream3_id);
-	if(!sdata) {
-	CURL_TRC_CF(data, cf, "[%"CURL_PRIu64"] discard event %s for "
-	"unknown [%"CURL_PRIu64"]",
-	stream? stream->id : -1, cf_ev_name(ev), stream3_id);
+	sdata = get_stream_easy(cf, data, stream3_id, &stream);
+	if(!sdata \|\| !stream) {
+	CURL_TRC_CF(data, cf, "discard event %s for unknown [%"CURL_PRId64"]",
+	cf_ev_name(ev), stream3_id);
	}
	else {
-	result = h3_process_event(cf, sdata, stream3_id, ev);
+	result = h3_process_event(cf, sdata, stream, ev);
	drain_stream(cf, sdata);
	if(result) {
-	CURL_TRC_CF(data, cf, "[%"CURL_PRIu64"] error processing event %s "
-	"for [%"CURL_PRIu64"] -> %d",
-	stream? stream->id : -1, cf_ev_name(ev),
+	CURL_TRC_CF(data, cf, "error processing event %s "
+	"for [%"CURL_PRIu64"] -> %d", cf_ev_name(ev),
	stream3_id, result);
	if(data == sdata) {
	/* Only report this error to the caller if it is about the
@@ -726,7 +751,8 @@ static ssize_t recv_closed_stream(struct Curl_cfilter *cf,
	struct Curl_easy *data,
	CURLcode *err)
	{
-	struct stream_ctx *stream = H3_STREAM_CTX(data);
+	struct cf_quiche_ctx *ctx = cf->ctx;
+	struct stream_ctx *stream = H3_STREAM_CTX(ctx, data);
	ssize_t nread = -1;

	DEBUGASSERT(stream);
@@ -758,7 +784,7 @@ static ssize_t cf_quiche_recv(struct Curl_cfilter cf, struct Curl_easy data,
	char buf, size_t len, CURLcode err)
	{
	struct cf_quiche_ctx *ctx = cf->ctx;
-	struct stream_ctx *stream = H3_STREAM_CTX(data);
+	struct stream_ctx *stream = H3_STREAM_CTX(ctx, data);
	ssize_t nread = -1;
	CURLcode result;

@@ -839,7 +865,7 @@ static ssize_t h3_open_stream(struct Curl_cfilter *cf,
	CURLcode *err)
	{
	struct cf_quiche_ctx *ctx = cf->ctx;
-	struct stream_ctx *stream = H3_STREAM_CTX(data);
+	struct stream_ctx *stream = H3_STREAM_CTX(ctx, data);
	size_t nheader, i;
	curl_int64_t stream3_id;
	struct dynhds h2_headers;
@@ -851,7 +877,7 @@ static ssize_t h3_open_stream(struct Curl_cfilter *cf,
	if(*err) {
	return -1;
	}
-	stream = H3_STREAM_CTX(data);
+	stream = H3_STREAM_CTX(ctx, data);
	DEBUGASSERT(stream);
	}

@@ -958,7 +984,7 @@ static ssize_t cf_quiche_send(struct Curl_cfilter cf, struct Curl_easy data,
	const void buf, size_t len, CURLcode err)
	{
	struct cf_quiche_ctx *ctx = cf->ctx;
-	struct stream_ctx *stream = H3_STREAM_CTX(data);
+	struct stream_ctx *stream = H3_STREAM_CTX(ctx, data);
	CURLcode result;
	ssize_t nwritten;

@@ -974,7 +1000,7 @@ static ssize_t cf_quiche_send(struct Curl_cfilter cf, struct Curl_easy data,
	nwritten = h3_open_stream(cf, data, buf, len, err);
	if(nwritten < 0)
	goto out;
-	stream = H3_STREAM_CTX(data);
+	stream = H3_STREAM_CTX(ctx, data);
	}
	else if(stream->closed) {
	if(stream->resp_hds_complete) {
@@ -1067,7 +1093,7 @@ static bool stream_is_writeable(struct Curl_cfilter *cf,
	struct Curl_easy *data)
	{
	struct cf_quiche_ctx *ctx = cf->ctx;
-	struct stream_ctx *stream = H3_STREAM_CTX(data);
+	struct stream_ctx *stream = H3_STREAM_CTX(ctx, data);

	return stream && (quiche_conn_stream_writable(
	ctx->qconn, (curl_uint64_t)stream->id, 1) > 0);
@@ -1085,7 +1111,7 @@ static void cf_quiche_adjust_pollset(struct Curl_cfilter *cf,

	Curl_pollset_check(data, ps, ctx->q.sockfd, &want_recv, &want_send);
	if(want_recv \|\| want_send) {
-	struct stream_ctx *stream = H3_STREAM_CTX(data);
+	struct stream_ctx *stream = H3_STREAM_CTX(ctx, data);
	bool c_exhaust, s_exhaust;

	c_exhaust = FALSE; /* Have not found any call in quiche that tells
@@ -1107,7 +1133,8 @@ static void cf_quiche_adjust_pollset(struct Curl_cfilter *cf,
	static bool cf_quiche_data_pending(struct Curl_cfilter *cf,
	const struct Curl_easy *data)
	{
-	const struct stream_ctx *stream = H3_STREAM_CTX(data);
+	struct cf_quiche_ctx *ctx = cf->ctx;
+	const struct stream_ctx *stream = H3_STREAM_CTX(ctx, data);
	(void)cf;
	return stream && !Curl_bufq_is_empty(&stream->recvbuf);
	}
@@ -1129,6 +1156,7 @@ static CURLcode cf_quiche_data_event(struct Curl_cfilter *cf,
	struct Curl_easy *data,
	int event, int arg1, void *arg2)
	{
+	struct cf_quiche_ctx *ctx = cf->ctx;
	CURLcode result = CURLE_OK;

	(void)arg1;
@@ -1146,7 +1174,7 @@ static CURLcode cf_quiche_data_event(struct Curl_cfilter *cf,
	h3_data_done(cf, data);
	break;
	case CF_CTRL_DATA_DONE_SEND: {
-	struct stream_ctx *stream = H3_STREAM_CTX(data);
+	struct stream_ctx *stream = H3_STREAM_CTX(ctx, data);
	if(stream && !stream->send_closed) {
	unsigned char body[1];
	ssize_t sent;
@@ -1161,7 +1189,7 @@ static CURLcode cf_quiche_data_event(struct Curl_cfilter *cf,
	break;
	}
	case CF_CTRL_DATA_IDLE: {
-	struct stream_ctx *stream = H3_STREAM_CTX(data);
+	struct stream_ctx *stream = H3_STREAM_CTX(ctx, data);
	if(stream && !stream->closed) {
	result = cf_flush_egress(cf, data);
	if(result)
@@ -1196,6 +1224,7 @@ static CURLcode cf_connect_start(struct Curl_cfilter *cf,
	ctx->max_idle_ms = CURL_QUIC_MAX_IDLE_MS;
	Curl_bufcp_init(&ctx->stream_bufcp, H3_STREAM_CHUNK_SIZE,
	H3_STREAM_POOL_SPARES);
+	Curl_hash_offt_init(&ctx->streams, 63, h3_stream_hash_free);
	ctx->data_recvd = 0;

	result = vquic_ctx_init(&ctx->q);

tests/data/Makefile.inc+1 -1

@@ -205,7 +205,7 @@ test1590 test1591 test1592 test1593 test1594 test1595 test1596 test1597 \
	test1598 \
	test1600 test1601 test1602 test1603 test1604 test1605 test1606 test1607 \
	test1608 test1609 test1610 test1611 test1612 test1613 test1614 test1615 \
-	\
+	test1616 \
	test1620 test1621 \
	\
	test1630 test1631 test1632 test1633 test1634 test1635 \

tests/data/test1616+22 -0

@@ -0,0 +1,22 @@
+	<testcase>
+	<info>
+	<keywords>
+	unittest
+	hash
+	</keywords>
+	</info>
+
+	#
+	# Client-side
+	<client>
+	<server>
+	none
+	</server>
+	<features>
+	unittest
+	</features>
+	<name>
+	Internal hash_offt create/add/destroy testing, exercising clean functions
+	</name>
+	</client>
+	</testcase>

tests/unit/Makefile.inc+3 -1

@@ -34,7 +34,7 @@ UNITPROGS = unit1300 unit1302 unit1303 unit1304 unit1305 unit1307 \
	unit1330 unit1394 unit1395 unit1396 unit1397 unit1398 \
	unit1399 \
	unit1600 unit1601 unit1602 unit1603 unit1604 unit1605 unit1606 unit1607 \
-	unit1608 unit1609 unit1610 unit1611 unit1612 unit1614 unit1615 \
+	unit1608 unit1609 unit1610 unit1611 unit1612 unit1614 unit1615 unit1616 \
	unit1620 unit1621 \
	unit1650 unit1651 unit1652 unit1653 unit1654 unit1655 \
	unit1660 unit1661 \
@@ -103,6 +103,8 @@ unit1614_SOURCES = unit1614.c $(UNITFILES)

	unit1615_SOURCES = unit1615.c $(UNITFILES)

+	unit1616_SOURCES = unit1616.c $(UNITFILES)
+
	unit1620_SOURCES = unit1620.c $(UNITFILES)

	unit1621_SOURCES = unit1621.c $(UNITFILES)

tests/unit/unit1616.c+87 -0

@@ -0,0 +1,87 @@
+	/***************************************************************************
+	* _ _ ____ _
+	* Project ___\| \| \| \| _ \\| \|
+	* / __\| \| \| \| \|_) \| \|
+	* \| (__\| \|_\| \| _ <\| \|___
+	* \___\|\___/\|_\| \_\_____\|
+	*
+	* Copyright (C) Daniel Stenberg, <[email protected]>, et al.
+	*
+	* This software is licensed as described in the file COPYING, which
+	* you should have received as part of this distribution. The terms
+	* are also available at https://curl.se/docs/copyright.html.
+	*
+	* You may opt to use, copy, modify, merge, publish, distribute and/or sell
+	* copies of the Software, and permit persons to whom the Software is
+	* furnished to do so, under the terms of the COPYING file.
+	*
+	* This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+	* KIND, either express or implied.
+	*
+	* SPDX-License-Identifier: curl
+	*
+	***************************************************************************/
+	#include "curlcheck.h"
+
+	#define ENABLE_CURLX_PRINTF
+	#include "curlx.h"
+
+	#include "hash.h"
+
+	#include "memdebug.h" /* LAST include file */
+
+	static struct Curl_hash hash_static;
+
+	static void mydtor(void *elem)
+	{
+	int ptr = (int )elem;
+	free(ptr);
+	}
+
+	static CURLcode unit_setup(void)
+	{
+	Curl_hash_offt_init(&hash_static, 15, mydtor);
+	return CURLE_OK;
+	}
+
+	static void unit_stop(void)
+	{
+	Curl_hash_destroy(&hash_static);
+	}
+
+	UNITTEST_START
+	int value, v;
+	int *value2;
+	int *nodep;
+
+	curl_off_t key = 20;
+	curl_off_t key2 = 25;
+
+
+	value = malloc(sizeof(int));
+	abort_unless(value != NULL, "Out of memory");
+	*value = 199;
+	nodep = Curl_hash_offt_set(&hash_static, key, value);
+	if(!nodep)
+	free(value);
+	abort_unless(nodep, "insertion into hash failed");
+	v = Curl_hash_offt_get(&hash_static, key);
+	abort_unless(v == value, "lookup present entry failed");
+	v = Curl_hash_offt_get(&hash_static, key2);
+	abort_unless(!v, "lookup missing entry failed");
+	Curl_hash_clean(&hash_static);
+
+	/* Attempt to add another key/value pair */
+	value2 = malloc(sizeof(int));
+	abort_unless(value2 != NULL, "Out of memory");
+	*value2 = 204;
+	nodep = Curl_hash_offt_set(&hash_static, key2, value2);
+	if(!nodep)
+	free(value2);
+	abort_unless(nodep, "insertion into hash failed");
+	v = Curl_hash_offt_get(&hash_static, key2);
+	abort_unless(v == value2, "lookup present entry failed");
+	v = Curl_hash_offt_get(&hash_static, key);
+	abort_unless(!v, "lookup missing entry failed");
+
+	UNITTEST_STOP