← Commit list

fc3e1cbc50

Daniel Stenberg

2024-12-21

SUCCESS Duration: 88s

Subject

hyper: drop support

Binary

Download Binary (866 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 fc3e1cbc508f70f3dc21c2d55e5e2fa294f771cb
Previous HEAD position was 40c264db61 curl: add byte range support to --variable reading from file
HEAD is now at fc3e1cbc50 hyper: drop support

$ git clean -fdx
Removing Makefile
Removing Makefile.in
Removing aclocal.m4
Removing autom4te.cache/
Removing buildinfo.txt
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-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_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-dllmain.lo
Removing lib/libcurl_la-dllmain.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-strparse.lo
Removing lib/libcurl_la-strparse.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-curl_path.lo
Removing lib/vssh/libcurl_la-curl_path.o
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-cipher_suite.lo
Removing lib/vtls/libcurl_la-cipher_suite.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-vtls_scache.lo
Removing lib/vtls/libcurl_la-vtls_scache.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/terminal.o
Removing src/tool_binmode.o
Removing src/tool_bname.o
Removing src/tool_ca_embed.c
Removing src/tool_ca_embed.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_soc.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:125: installing './compile'
configure.ac:429: installing './config.guess'
configure.ac:429: installing './config.sub'
configure.ac:125: installing './install-sh'
configure.ac:131: 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.11.2-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... /usr/bin/caddy
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 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 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 build libcurl and curl in "unity" mode... no
checking whether to build tests into single-binary bundles... no
checking whether to support http... yes
checking whether to support ftp... yes
checking whether to support file... yes
checking whether to support IPFS... 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 pkg-config... (cached) /usr/bin/pkg-config
checking for libpsl options with pkg-config... found
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 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 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/eventfd.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 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_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 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... yes
checking if memrchr is compilable... yes
checking if memrchr usage allowed... yes
checking if memrchr 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... 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 eventfd... yes
checking for fnmatch... yes
checking for geteuid... yes
checking for getpass_r... 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 for pipe... yes
checking for poll... yes
checking for sched_yield... yes
checking for sendmsg... yes
checking for sendmmsg... yes
checking for setlocale... yes
checking for setmode... no
checking for setrlimit... yes
checking for snprintf... yes
checking for utime... yes
checking for utimes... yes
checking for arc4random... no
checking for fseeko... 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 link macOS CoreFoundation, CoreServices, and SystemConfiguration frameworks... no
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 the SHA-512/256 hash algorithm... 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... yes
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/configurehelp.pm
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
CFLAGS extras:
CPPFLAGS: -D_GNU_SOURCE
LDFLAGS:
curl-config:
LIBS: -lpsl -lz

curl version: 8.11.2-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 cert embed: no
ca fallback:
LDAP: no (--enable-ldap / --with-ldap-lib / --with-lber-lib)
LDAPS: no (--enable-ldaps)
IPFS/IPNS: enabled
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)
Protocols: dict file ftp gopher http imap ipfs ipns mqtt pop3 rtsp smtp telnet tftp ws
Features: alt-svc AsynchDNS IPv6 Largefile libz PSL threadsafe UnixSockets

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

$ 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-cf-h1-proxy.lo
CC libcurl_la-cf-h2-proxy.lo
CC libcurl_la-cf-haproxy.lo
CC libcurl_la-cf-https-connect.lo
CC libcurl_la-cf-socket.lo
CC libcurl_la-cfilters.lo
CC libcurl_la-connect.lo
CC libcurl_la-conncache.lo
CC libcurl_la-content_encoding.lo
CC libcurl_la-cookie.lo
CC libcurl_la-curl_addrinfo.lo
CC libcurl_la-curl_des.lo
CC libcurl_la-curl_endian.lo
CC libcurl_la-curl_fnmatch.lo
CC libcurl_la-curl_gethostname.lo
CC libcurl_la-curl_get_line.lo
CC libcurl_la-curl_gssapi.lo
CC libcurl_la-curl_memrchr.lo
CC libcurl_la-curl_multibyte.lo
CC libcurl_la-curl_ntlm_core.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-dllmain.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-psl.lo
CC libcurl_la-progress.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-strparse.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-cipher_suite.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-vtls_scache.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-curl_path.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'
CC terminal.o
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_soc.o
CC tool_cb_wrt.o
CC tool_cfgable.o
CC tool_dirhie.o
CC tool_doswin.o
CC tool_easysrc.o
CC tool_filetime.o
CC tool_findfile.o
CC tool_formparse.o
CC tool_getparam.o
CC tool_getpass.o
CC tool_help.o
CC tool_helpers.o
echo '#include "tool_hugehelp.h"' >> tool_hugehelp.c
CC tool_ipfs.o
CC tool_libinfo.o
CC tool_listhelp.o
CC tool_main.o
CC tool_msgs.o
CC tool_operate.o
CC tool_operhlp.o
CC tool_paramhlp.o
CC tool_parsecfg.o
CC tool_progress.o
CC tool_setopt.o
CC tool_sleep.o
CC tool_stderr.o
CC tool_strdup.o
CC tool_urlglob.o
CC tool_util.o
CC tool_vms.o
CC tool_writeout.o
CC tool_writeout_json.o
CC tool_xattr.o
CC var.o
echo 'extern const void *curl_ca_embed; const void *curl_ca_embed;' > tool_ca_embed.c
CC tool_hugehelp.o
CC tool_ca_embed.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[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 →

.github/labeler.yml+0 -8

@@ -292,14 +292,6 @@ HTTP/3:
	tests/nghttpx.conf\
	}"

-	Hyper:
-	- all:
-	- changed-files:
-	- any-glob-to-all-files: "{\
-	docs/HYPER.md,\
-	lib/c-hyper.*\
-	}"
-
	IMAP:
	- all:
	- changed-files:

.github/scripts/binarycheck.sums+1 -1

@@ -18,7 +18,7 @@ b967734c9bfe3d7a1a7795f348f0bce4d9ba15ca9590697ef2d4d15b92822db0 ./tests/certs/
	d640923e45809a3fe277e0af90459d82d32603aacc7b8db88754fcb335bf98df ./tests/data/test1531
	6f51bc318104fb5fe4b6013fc4e8e1c3c8dec1819202e8ea025bdbc4bbc8c02d ./tests/data/test1938
	28a957ec3397881bbafd0d97879cedfd475bcd1ece903e531576affd7aa3865c ./tests/data/test2080
-	db99126801fd5e7cb0c1ec1a0078e5599038c8c07073f3d62ed51f155e0e3d38 ./tests/data/test262
+	33809cab2442488e5985b4939727bc4ead9fc65150f53008e3e4c93140675a94 ./tests/data/test262
	2d073a52984bab1f196d80464ea8ab6dafd887bd5fee9ed58603f8510df0c6a5 ./tests/data/test35
	4cc9fd6f31d0bb4dcb38e1565796e7ec5e48ea5ac9d3c1101de576be618786ba ./tests/data/test463
	d655a29dcf2423b420b508c9e381b0fad0b88feb74caa8978725e22c9f7c374d ./tests/data/test467

configure.ac+7 -106

@@ -677,7 +677,7 @@ AS_HELP_STRING([--disable-http],[Disable HTTP support]),
	dnl toggle off alt-svc too when HTTP is disabled
	AC_DEFINE(CURL_DISABLE_ALTSVC, 1, [disable alt-svc])
	AC_DEFINE(CURL_DISABLE_HSTS, 1, [disable HSTS])
-	curl_h1_msg="no (--enable-http, --with-hyper)"
+	curl_h1_msg="no (--enable-http)"
	curl_altsvc_msg="no";
	curl_hsts_msg="no (--enable-hsts)";
	enable_altsvc="no"
@@ -800,110 +800,12 @@ AS_HELP_STRING([--disable-ldaps],[Disable LDAPS support]),
	fi ]
	)

-	dnl **********************************************************************
-	dnl Check for Hyper
-	dnl **********************************************************************
-
-	OPT_HYPER="no"
-
-	AC_ARG_WITH(hyper,
-	AS_HELP_STRING([--with-hyper=PATH],[Enable hyper usage])
-	AS_HELP_STRING([--without-hyper],[Disable hyper usage]),
-	[OPT_HYPER=$withval])
-	case "$OPT_HYPER" in
-	no)
-	dnl --without-hyper option used
-	want_hyper="no"
-	;;
-	yes)
-	dnl --with-hyper option used without path
-	want_hyper="default"
-	want_hyper_path=""
-	;;
-	*)
-	dnl --with-hyper option used with path
-	want_hyper="yes"
-	want_hyper_path="$withval"
-	;;
-	esac
-
-	if test X"$want_hyper" != Xno; then
-	if test "x$disable_http" = "xyes"; then
-	AC_MSG_ERROR([--with-hyper is not compatible with --disable-http])
-	fi
-
-	dnl backup the pre-hyper variables
-	CLEANLDFLAGS="$LDFLAGS"
-	CLEANCPPFLAGS="$CPPFLAGS"
-	CLEANLIBS="$LIBS"
-
-	CURL_CHECK_PKGCONFIG(hyper, $want_hyper_path)
-
-	if test "$PKGCONFIG" != "no"; then
-	LIB_HYPER=`CURL_EXPORT_PCDIR([$want_hyper_path])
-	$PKGCONFIG --libs-only-l hyper`
-	CPP_HYPER=`CURL_EXPORT_PCDIR([$want_hyper_path]) dnl
-	$PKGCONFIG --cflags-only-I hyper`
-	LD_HYPER=`CURL_EXPORT_PCDIR([$want_hyper_path])
-	$PKGCONFIG --libs-only-L hyper`
-	else
-	dnl no hyper pkg-config found
-	LIB_HYPER="-lhyper -ldl -lpthread -lm"
-	if test X"$want_hyper" != Xdefault; then
-	CPP_HYPER=-I"$want_hyper_path/capi/include"
-	LD_HYPER="-L$want_hyper_path/target/release -L$want_hyper_path/target/debug"
-	fi
-	fi
-	if test -n "$LIB_HYPER"; then
-	AC_MSG_NOTICE([-l is $LIB_HYPER])
-	AC_MSG_NOTICE([-I is $CPP_HYPER])
-	AC_MSG_NOTICE([-L is $LD_HYPER])
-
-	LDFLAGS="$LDFLAGS $LD_HYPER"
-	CPPFLAGS="$CPPFLAGS $CPP_HYPER"
-	LIBS="$LIB_HYPER $LIBS"
-
-	if test "x$cross_compiling" != "xyes"; then
-	dnl remove -L, separate with colon if more than one
-	DIR_HYPER=`echo $LD_HYPER \| $SED -e 's/^-L//' -e 's/ -L/:/g'`
-	fi
-
-	AC_CHECK_LIB(hyper, hyper_io_new,
-	[
-	AC_CHECK_HEADERS(hyper.h,
-	experimental="$experimental Hyper"
-	AC_MSG_NOTICE([Hyper support is experimental])
-	curl_h1_msg="enabled (Hyper)"
-	HYPER_ENABLED=1
-	AC_DEFINE(USE_HYPER, 1, [if hyper is in use])
-	AC_SUBST(USE_HYPER, [1])
-	CURL_LIBRARY_PATH="$CURL_LIBRARY_PATH:$DIR_HYPER"
-	export CURL_LIBRARY_PATH
-	AC_MSG_NOTICE([Added $DIR_HYPER to CURL_LIBRARY_PATH])
-	LIBCURL_PC_REQUIRES_PRIVATE="$LIBCURL_PC_REQUIRES_PRIVATE hyper"
-	)
-	],
-	for d in `echo $DIR_HYPER \| $SED -e 's/:/ /'`; do
-	if test -f "$d/libhyper.a"; then
-	AC_MSG_ERROR([hyper was found in $d but was probably built with wrong flags. See docs/HYPER.md.])
-	fi
-	done
-	AC_MSG_ERROR([--with-hyper but hyper was not found. See docs/HYPER.md.])
-	)
-	fi
-	fi
-
-	if test X"$want_hyper" != Xno; then
-	AC_MSG_NOTICE([Disable RTSP support with hyper])
-	AC_DEFINE(CURL_DISABLE_RTSP, 1, [to disable RTSP])
-	CURL_DISABLE_RTSP=1
-	else
-	AC_MSG_CHECKING([whether to support rtsp])
-	AC_ARG_ENABLE(rtsp,
+	AC_MSG_CHECKING([whether to support rtsp])
+	AC_ARG_ENABLE(rtsp,
	AS_HELP_STRING([--enable-rtsp],[Enable RTSP support])
	AS_HELP_STRING([--disable-rtsp],[Disable RTSP support]),
	[ case "$enableval" in
-	no)
+	no)
	AC_MSG_RESULT(no)
	AC_DEFINE(CURL_DISABLE_RTSP, 1, [to disable RTSP])
	CURL_DISABLE_RTSP=1
@@ -923,8 +825,7 @@ AS_HELP_STRING([--disable-rtsp],[Disable RTSP support]),
	else
	AC_MSG_RESULT(no)
	fi
-	)
-	fi
+	)

	AC_MSG_CHECKING([whether to support proxies])
	AC_ARG_ENABLE(proxy,
@@ -2989,8 +2890,8 @@ dnl **********************************************************************

	OPT_H2="yes"

-	if test "x$disable_http" = "xyes" -o X"$want_hyper" != Xno; then
-	# without HTTP or with Hyper, nghttp2 is no use
+	if test "x$disable_http" = "xyes"; then
+	# without HTTP nghttp2 is no use
	OPT_H2="no"
	fi

docs/DEPRECATE.md+1 -30

@@ -23,36 +23,6 @@ and use TLS 1.3, or else it is not good enough.
	As of May 2024, the libraries that need to get fixed to remain supported after
	May 2025 are: BearSSL and Secure Transport.

-	## Hyper
-
-	Hyper is an alternative HTTP backend for curl. It uses the hyper library and
-	could in theory be used for HTTP/1, HTTP/2 and even HTTP/3 in the future with
-	curl.
-
-	The original plan and goal was that we would add this HTTP alternative (using
-	a memory-safe library) and that users could eventually build and use libcurl
-	exactly as previously but with parts of the core being more memory-safe.
-
-	The hyper implementation ran into some snags and 10-15 tests and HTTP/2
-	support have remained disabled with hyper. For these reasons, hyper support
-	has remained tagged EXPERIMENTAL.
-
-	It is undoubtedly hard work to fix these remaining problems, as they typically
-	require both rust and C knowledge in addition to deep HTTP familiarity. There
-	does not seem to be that many persons interested or available for this
-	challenge. Meanwhile, there is little if any demand for hyper from existing
-	(lib)curl users.
-
-	Finally: having support for hyper in curl has a significant cost: we need to
-	maintain and develop a lot of functionality and tests twice to make sure
-	libcurl works identically using either HTTP backend.
-
-	The only way to keep hyper support in curl is to give it a good polish by
-	someone with time, skill and energy to spend on this task.
-
-	Unless a significant overhaul has proven to be in progress, hyper support is
-	removed from curl in January 2025.
-
	## Past removals

	- Pipelining
@@ -65,3 +35,4 @@ removed from curl in January 2025.
	- MinGW v1
	- NTLM_WB
	- space-separated `NOPROXY` patterns
+	- hyper

docs/EXPERIMENTAL.md+0 -8

@@ -34,14 +34,6 @@ Experimental support in curl means:

	## Experimental features right now

-	### The Hyper HTTP backend
-
-	Graduation requirements:
-
-	- HTTP/1 and HTTP/2 support, including multiplexing
-
-	(Hyper is marked for deprecation. It cannot graduate.)
-
	### HTTP/3 support (non-ngtcp2 backends)

	Graduation requirements:

docs/Makefile.am+0 -1

@@ -50,7 +50,6 @@ INTERNALDOCS = \
	internals/CONNECTION-FILTERS.md \
	internals/DYNBUF.md \
	internals/HASH.md \
-	internals/HYPER.md \
	internals/LLIST.md \
	internals/MQTT.md \
	internals/NEW-PROTOCOL.md \

docs/cmdline-opts/ignore-content-length.md+3 -5

@@ -15,11 +15,9 @@ Example:

	# `--ignore-content-length`

-	For HTTP, Ignore the Content-Length header. This is particularly useful for
-	servers running Apache 1.x, which reports incorrect Content-Length for
-	files larger than 2 gigabytes.
+	For HTTP, ignore the Content-Length header. This is particularly useful for
+	servers running Apache 1.x, which reports incorrect Content-Length for files
+	larger than 2 gigabytes.

	For FTP, this makes curl skip the SIZE command to figure out the size before
	downloading a file (added in 7.46.0).
-
-	This option does not work for HTTP if libcurl was built to use hyper.

docs/internals/HYPER.md+0 -78

@@ -1,78 +0,0 @@
-	<!--
-	Copyright (C) Daniel Stenberg, <[email protected]>, et al.
-
-	SPDX-License-Identifier: curl
-	-->
-
-	# Hyper
-
-	Hyper is a separate HTTP library written in Rust. curl can be told to use this
-	library as a backend to deal with HTTP.
-
-	## EXPERIMENTAL
-
-	Hyper support in curl is considered EXPERIMENTAL until further notice. It
-	needs to be explicitly enabled at build-time.
-
-	Further development and tweaking of the Hyper backend support in curl happens
-	in the master branch using pull-requests, just like ordinary changes.
-
-	## Hyper version
-
-	The C API for Hyper is brand new and is still under development.
-
-	## Build curl with hyper
-
-	Using Rust 1.64.0 or later, build hyper and enable its C API like this:
-
-	% git clone https://github.com/hyperium/hyper
-	% cd hyper
-	% RUSTFLAGS="--cfg hyper_unstable_ffi" cargo rustc --features client,http1,http2,ffi --crate-type cdylib
-
-	Also, `--release` can be added for a release (optimized) build.
-
-	Build curl to use hyper's C API:
-
-	% git clone https://github.com/curl/curl
-	% cd curl
-	% autoreconf -fi
-	% ./configure LDFLAGS="-Wl,-rpath,<hyper-dir>/target/debug -Wl,-rpath,<hyper-dir>/target/release" --with-openssl --with-hyper=<hyper-dir>
-	% make
-
-	# Using Hyper internally
-
-	Hyper is a low level HTTP transport library. curl itself provides all HTTP
-	headers and Hyper provides all received headers back to curl.
-
-	Therefore, most of the "header logic" in curl as in responding to and acting
-	on specific input and output headers are done the same way in curl code.
-
-	The API in Hyper delivers received HTTP headers as (cleaned up) name=value
-	pairs, making it impossible for curl to know the exact byte representation
-	over the wire with Hyper.
-
-	## Limitations
-
-	The hyper backend does not support
-
-	- `CURLOPT_IGNORE_CONTENT_LENGTH`
-	- `--raw` and disabling `CURLOPT_HTTP_TRANSFER_DECODING`
-	- RTSP
-	- hyper is much stricter about what HTTP header contents it allows
-	- leading whitespace in first HTTP/1 response header
-	- HTTP/0.9
-	- HTTP/2 upgrade using HTTP:// URLs. Aka 'h2c'
-	- HTTP/2 in general. Hyper has support for HTTP/2 but the curl side
-	needs changes so that a `hyper_clientconn` can last for the duration
-	of a connection. Probably this means turning the Hyper HTTP/2 backend
-	into a connection filter.
-
-	## Remaining issues
-
-	This backend is still not feature complete with the native backend. Areas that
-	still need attention and verification include:
-
-	- multiplexed HTTP/2
-	- h2 Upgrade:
-	- receiving HTTP/1 trailers
-	- sending HTTP/1 trailers

docs/internals/WEBSOCKET.md+0 -1

@@ -99,7 +99,6 @@ Ideas:

	- Verify the Sec-WebSocket-Accept response. It requires a sha-1 function.
	- Verify Sec-WebSocket-Extensions and Sec-WebSocket-Protocol in the response
-	- Make WebSocket work with hyper
	- Consider a `curl_ws_poll()`
	- Make sure WebSocket code paths are fuzzed
	- Add client-side PING interval

docs/libcurl/opts/CURLOPT_HTTP_TRANSFER_DECODING.md+0 -5

@@ -31,11 +31,6 @@ Pass a long to tell libcurl how to act on transfer decoding. If set to zero,
	transfer decoding is disabled, if set to 1 it is enabled (default). libcurl
	does chunked transfer decoding by default unless this option is set to zero.

-	# NOTES
-
-	This option does not work with the hyper backend as that always has transfer
-	decoding enabled.
-
	# DEFAULT

	1

docs/libcurl/opts/CURLOPT_IGNORE_CONTENT_LENGTH.md+0 -5

@@ -69,11 +69,6 @@ int main(void)

	Support for FTP added in 7.46.0.

-	# NOTES
-
-	This option is not working for HTTP when libcurl is built to use the hyper
-	backend.
-
	# %AVAILABILITY%

	# RETURN VALUE

lib/Makefile.inc+0 -2

@@ -114,7 +114,6 @@ LIB_CFILES = \
	base64.c \
	bufq.c \
	bufref.c \
-	c-hyper.c \
	cf-h1-proxy.c \
	cf-h2-proxy.c \
	cf-haproxy.c \
@@ -248,7 +247,6 @@ LIB_HFILES = \
	asyn.h \
	bufq.h \
	bufref.h \
-	c-hyper.h \
	cf-h1-proxy.h \
	cf-h2-proxy.h \
	cf-haproxy.h \

lib/c-hyper.c+0 -1254

@@ -1,1254 +0,0 @@
-	/***************************************************************************
-	* _ _ ____ _
-	* 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.haxx.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
-	*
-	***************************************************************************/
-
-	/* Curl's integration with Hyper. This replaces certain functions in http.c,
-	* based on configuration #defines. This implementation supports HTTP/1.1 but
-	* not HTTP/2.
-	*/
-	#include "curl_setup.h"
-
-	#if !defined(CURL_DISABLE_HTTP) && defined(USE_HYPER)
-
-	#ifdef HAVE_NETINET_IN_H
-	#include <netinet/in.h>
-	#endif
-
-	#ifdef HAVE_NETDB_H
-	#include <netdb.h>
-	#endif
-	#ifdef HAVE_ARPA_INET_H
-	#include <arpa/inet.h>
-	#endif
-	#ifdef HAVE_NET_IF_H
-	#include <net/if.h>
-	#endif
-	#ifdef HAVE_SYS_IOCTL_H
-	#include <sys/ioctl.h>
-	#endif
-
-	#ifdef HAVE_SYS_PARAM_H
-	#include <sys/param.h>
-	#endif
-
-	#include <hyper.h>
-	#include "urldata.h"
-	#include "cfilters.h"
-	#include "sendf.h"
-	#include "headers.h"
-	#include "transfer.h"
-	#include "multiif.h"
-	#include "progress.h"
-	#include "content_encoding.h"
-	#include "ws.h"
-
-	/* The last 3 #include files should be in this order */
-	#include "curl_printf.h"
-	#include "curl_memory.h"
-	#include "memdebug.h"
-
-
-	static CURLcode cr_hyper_add(struct Curl_easy *data);
-
-	typedef enum {
-	USERDATA_NOT_SET = 0, /* for tasks with no userdata set; must be zero */
-	USERDATA_RESP_BODY
-	} userdata_t;
-
-	size_t Curl_hyper_recv(void userp, hyper_context ctx,
-	uint8_t *buf, size_t buflen)
-	{
-	struct hyp_io_ctx *io_ctx = userp;
-	struct Curl_easy *data = io_ctx->data;
-	struct connectdata *conn = data->conn;
-	CURLcode result;
-	ssize_t nread;
-	DEBUGASSERT(conn);
-	(void)ctx;
-
-	DEBUGF(infof(data, "Curl_hyper_recv(%zu)", buflen));
-	result = Curl_conn_recv(data, io_ctx->sockindex,
-	(char *)buf, buflen, &nread);
-	if(result == CURLE_AGAIN) {
-	/* would block, register interest */
-	DEBUGF(infof(data, "Curl_hyper_recv(%zu) -> EAGAIN", buflen));
-	if(data->hyp.read_waker)
-	hyper_waker_free(data->hyp.read_waker);
-	data->hyp.read_waker = hyper_context_waker(ctx);
-	if(!data->hyp.read_waker) {
-	failf(data, "Couldn't make the read hyper_context_waker");
-	return HYPER_IO_ERROR;
-	}
-	return HYPER_IO_PENDING;
-	}
-	else if(result) {
-	failf(data, "Curl_read failed");
-	return HYPER_IO_ERROR;
-	}
-	DEBUGF(infof(data, "Curl_hyper_recv(%zu) -> %zd", buflen, nread));
-	return (size_t)nread;
-	}
-
-	size_t Curl_hyper_send(void userp, hyper_context ctx,
-	const uint8_t *buf, size_t buflen)
-	{
-	struct hyp_io_ctx *io_ctx = userp;
-	struct Curl_easy *data = io_ctx->data;
-	CURLcode result;
-	size_t nwrote;
-
-	DEBUGF(infof(data, "Curl_hyper_send(%zu)", buflen));
-	result = Curl_conn_send(data, io_ctx->sockindex,
-	(void *)buf, buflen, FALSE, &nwrote);
-	if(result == CURLE_AGAIN) {
-	DEBUGF(infof(data, "Curl_hyper_send(%zu) -> EAGAIN", buflen));
-	/* would block, register interest */
-	if(data->hyp.write_waker)
-	hyper_waker_free(data->hyp.write_waker);
-	data->hyp.write_waker = hyper_context_waker(ctx);
-	if(!data->hyp.write_waker) {
-	failf(data, "Couldn't make the write hyper_context_waker");
-	return HYPER_IO_ERROR;
-	}
-	return HYPER_IO_PENDING;
-	}
-	else if(result) {
-	failf(data, "Curl_write failed");
-	return HYPER_IO_ERROR;
-	}
-	DEBUGF(infof(data, "Curl_hyper_send(%zu) -> %zd", buflen, nwrote));
-	return (size_t)nwrote;
-	}
-
-	static int hyper_each_header(void *userdata,
-	const uint8_t *name,
-	size_t name_len,
-	const uint8_t *value,
-	size_t value_len)
-	{
-	struct Curl_easy data = (struct Curl_easy )userdata;
-	size_t len;
-	char *headp;
-	CURLcode result;
-	int writetype;
-
-	if(name_len + value_len + 2 > CURL_MAX_HTTP_HEADER) {
-	failf(data, "Too long response header");
-	data->state.hresult = CURLE_TOO_LARGE;
-	return HYPER_ITER_BREAK;
-	}
-
-	Curl_dyn_reset(&data->state.headerb);
-	if(name_len) {
-	if(Curl_dyn_addf(&data->state.headerb, "%.s: %.s\r\n",
-	(int) name_len, name, (int) value_len, value))
-	return HYPER_ITER_BREAK;
-	}
-	else {
-	if(Curl_dyn_addn(&data->state.headerb, STRCONST("\r\n")))
-	return HYPER_ITER_BREAK;
-	}
-	len = Curl_dyn_len(&data->state.headerb);
-	headp = Curl_dyn_ptr(&data->state.headerb);
-
-	result = Curl_http_header(data, headp, len);
-	if(result) {
-	data->state.hresult = result;
-	return HYPER_ITER_BREAK;
-	}
-
-	Curl_debug(data, CURLINFO_HEADER_IN, headp, len);
-
-	writetype = CLIENTWRITE_HEADER;
-	if(data->state.hconnect)
-	writetype \|= CLIENTWRITE_CONNECT;
-	if(data->req.httpcode/100 == 1)
-	writetype \|= CLIENTWRITE_1XX;
-	result = Curl_client_write(data, writetype, headp, len);
-	if(result) {
-	data->state.hresult = CURLE_ABORTED_BY_CALLBACK;
-	return HYPER_ITER_BREAK;
-	}
-
-	result = Curl_bump_headersize(data, len, FALSE);
-	if(result) {
-	data->state.hresult = result;
-	return HYPER_ITER_BREAK;
-	}
-	return HYPER_ITER_CONTINUE;
-	}
-
-	static int hyper_body_chunk(void userdata, const hyper_buf chunk)
-	{
-	char buf = (char )hyper_buf_bytes(chunk);
-	size_t len = hyper_buf_len(chunk);
-	struct Curl_easy data = (struct Curl_easy )userdata;
-	struct SingleRequest *k = &data->req;
-	CURLcode result = CURLE_OK;
-
-	if(!k->bodywritten) {
-	#if defined(USE_NTLM)
-	struct connectdata *conn = data->conn;
-	if(conn->bits.close &&
-	(((data->req.httpcode == 401) &&
-	(conn->http_ntlm_state == NTLMSTATE_TYPE2)) \|\|
-	((data->req.httpcode == 407) &&
-	(conn->proxy_ntlm_state == NTLMSTATE_TYPE2)))) {
-	infof(data, "Connection closed while negotiating NTLM");
-	data->state.authproblem = TRUE;
-	Curl_safefree(data->req.newurl);
-	}
-	#endif
-	if(Curl_http_exp100_is_selected(data)) {
-	if(data->req.httpcode < 400) {
-	Curl_http_exp100_got100(data);
-	if(data->hyp.send_body_waker) {
-	hyper_waker_wake(data->hyp.send_body_waker);
-	data->hyp.send_body_waker = NULL;
-	}
-	}
-	else { /* >= 4xx */
-	Curl_req_abort_sending(data);
-	}
-	}
-	if(data->state.hconnect && (data->req.httpcode/100 != 2) &&
-	data->state.authproxy.done) {
-	data->req.done = TRUE;
-	result = CURLE_OK;
-	}
-	else
-	result = Curl_http_firstwrite(data);
-	if(result \|\| data->req.done) {
-	infof(data, "Return early from hyper_body_chunk");
-	data->state.hresult = result;
-	return HYPER_ITER_BREAK;
-	}
-	}
-	result = Curl_client_write(data, CLIENTWRITE_BODY, buf, len);
-
-	if(result) {
-	data->state.hresult = result;
-	return HYPER_ITER_BREAK;
-	}
-
-	return HYPER_ITER_CONTINUE;
-	}
-
-	/*
-	* Hyper does not consider the status line, the first line in an HTTP/1
-	* response, to be a header. The libcurl API does. This function sends the
-	* status line in the header callback. */
-	static CURLcode status_line(struct Curl_easy *data,
-	struct connectdata *conn,
-	uint16_t http_status,
-	int http_version,
-	const uint8_t *reason, size_t rlen)
-	{
-	CURLcode result;
-	size_t len;
-	const char *vstr;
-	int writetype;
-	vstr = http_version == HYPER_HTTP_VERSION_1_1 ? "1.1" :
-	(http_version == HYPER_HTTP_VERSION_2 ? "2" : "1.0");
-
-	/* We need to set 'httpcodeq' for functions that check the response code in
-	a single place. */
-	data->req.httpcode = http_status;
-	data->req.httpversion = http_version == HYPER_HTTP_VERSION_1_1 ? 11 :
-	(http_version == HYPER_HTTP_VERSION_2 ? 20 : 10);
-	if(data->state.hconnect)
-	/* CONNECT */
-	data->info.httpproxycode = http_status;
-	else {
-	conn->httpversion = (unsigned char)data->req.httpversion;
-	if(http_version == HYPER_HTTP_VERSION_1_0)
-	data->state.httpwant = CURL_HTTP_VERSION_1_0;
-
-	result = Curl_http_statusline(data, conn);
-	if(result)
-	return result;
-	}
-
-	Curl_dyn_reset(&data->state.headerb);
-
-	result = Curl_dyn_addf(&data->state.headerb, "HTTP/%s %03d %.*s\r\n",
-	vstr,
-	(int)http_status,
-	(int)rlen, reason);
-	if(result)
-	return result;
-	len = Curl_dyn_len(&data->state.headerb);
-	Curl_debug(data, CURLINFO_HEADER_IN, Curl_dyn_ptr(&data->state.headerb),
-	len);
-
-	writetype = CLIENTWRITE_HEADER\|CLIENTWRITE_STATUS;
-	if(data->state.hconnect)
-	writetype \|= CLIENTWRITE_CONNECT;
-	result = Curl_client_write(data, writetype,
-	Curl_dyn_ptr(&data->state.headerb), len);
-	if(result)
-	return result;
-
-	result = Curl_bump_headersize(data, len, FALSE);
-	return result;
-	}
-
-	/*
-	* Hyper does not pass on the last empty response header. The libcurl API
-	* does. This function sends an empty header in the header callback.
-	*/
-	static CURLcode empty_header(struct Curl_easy *data)
-	{
-	CURLcode result = Curl_http_size(data);
-	if(!result) {
-	result = hyper_each_header(data, NULL, 0, NULL, 0) ?
-	CURLE_WRITE_ERROR : CURLE_OK;
-	if(result)
-	failf(data, "hyperstream: could not pass blank header");
-	/* Hyper does chunked decoding itself. If it was added during
-	* response header processing, remove it again. */
-	Curl_cwriter_remove_by_name(data, "chunked");
-	}
-	return result;
-	}
-
-	CURLcode Curl_hyper_stream(struct Curl_easy *data,
-	struct connectdata *conn,
-	int *didwhat,
-	int select_res)
-	{
-	hyper_response *resp = NULL;
-	uint16_t http_status;
-	int http_version;
-	hyper_headers *headers = NULL;
-	hyper_body *resp_body = NULL;
-	struct hyptransfer *h = &data->hyp;
-	hyper_task *task;
-	hyper_task *foreach;
-	const uint8_t *reasonp;
-	size_t reason_len;
-	CURLcode result = CURLE_OK;
-	struct SingleRequest *k = &data->req;
-	(void)conn;
-
-	if(data->hyp.send_body_waker) {
-	/* If there is still something to upload, wake it to give it
-	* another try. */
-	hyper_waker_wake(data->hyp.send_body_waker);
-	data->hyp.send_body_waker = NULL;
-	}
-
-	if(select_res & CURL_CSELECT_IN) {
-	if(h->read_waker)
-	hyper_waker_wake(h->read_waker);
-	h->read_waker = NULL;
-	}
-	if(select_res & CURL_CSELECT_OUT) {
-	if(h->write_waker)
-	hyper_waker_wake(h->write_waker);
-	h->write_waker = NULL;
-	}
-
-	while(1) {
-	hyper_task_return_type t;
-	task = hyper_executor_poll(h->exec);
-	if(!task) {
-	*didwhat = KEEP_RECV;
-	break;
-	}
-	t = hyper_task_type(task);
-	if(t == HYPER_TASK_ERROR) {
-	hyper_error *hypererr = hyper_task_value(task);
-	hyper_task_free(task);
-	if(data->state.hresult) {
-	/* override Hyper's view, might not even be an error */
-	result = data->state.hresult;
-	infof(data, "hyperstream is done (by early callback)");
-	}
-	else {
-	uint8_t errbuf[256];
-	size_t errlen = hyper_error_print(hypererr, errbuf, sizeof(errbuf));
-	hyper_code code = hyper_error_code(hypererr);
-	failf(data, "Hyper: [%d] %.*s", (int)code, (int)errlen, errbuf);
-	switch(code) {
-	case HYPERE_ABORTED_BY_CALLBACK:
-	result = CURLE_OK;
-	goto out;
-	case HYPERE_UNEXPECTED_EOF:
-	if(!data->req.bytecount)
-	result = CURLE_GOT_NOTHING;
-	else
-	result = CURLE_RECV_ERROR;
-	goto out;
-	case HYPERE_INVALID_PEER_MESSAGE:
-	/* bump headerbytecount to avoid the count remaining at zero and
-	appearing to not having read anything from the peer at all */
-	data->req.headerbytecount++;
-	result = CURLE_UNSUPPORTED_PROTOCOL; /* maybe */
-	goto out;
-	default:
-	result = CURLE_RECV_ERROR;
-	goto out;
-	}
-	}
-	data->req.done = TRUE;
-	hyper_error_free(hypererr);
-	break;
-	}
-	else if(t == HYPER_TASK_EMPTY) {
-	void *userdata = hyper_task_userdata(task);
-	hyper_task_free(task);
-	if(userdata == (void *)USERDATA_RESP_BODY) {
-	/* end of transfer */
-	data->req.done = TRUE;
-	infof(data, "hyperstream is done");
-	if(!k->bodywritten) {
-	/* hyper does not always call the body write callback */
-	result = Curl_http_firstwrite(data);
-	}
-	break;
-	}
-	else {
-	/* A background task for hyper; ignore */
-	DEBUGF(infof(data, "hyper: some background task done"));
-	continue;
-	}
-	}
-	else if(t == HYPER_TASK_RESPONSE) {
-	resp = hyper_task_value(task);
-	hyper_task_free(task);
-
-	*didwhat = KEEP_RECV;
-	if(!resp) {
-	failf(data, "hyperstream: could not get response");
-	result = CURLE_RECV_ERROR;
-	goto out;
-	}
-
-	http_status = hyper_response_status(resp);
-	http_version = hyper_response_version(resp);
-	reasonp = hyper_response_reason_phrase(resp);
-	reason_len = hyper_response_reason_phrase_len(resp);
-
-	if(http_status == 417 && Curl_http_exp100_is_selected(data)) {
-	infof(data, "Got 417 while waiting for a 100");
-	data->state.disableexpect = TRUE;
-	data->req.newurl = strdup(data->state.url);
-	Curl_req_abort_sending(data);
-	}
-
-	result = status_line(data, conn,
-	http_status, http_version, reasonp, reason_len);
-	if(result)
-	goto out;
-
-	headers = hyper_response_headers(resp);
-	if(!headers) {
-	failf(data, "hyperstream: could not get response headers");
-	result = CURLE_RECV_ERROR;
-	goto out;
-	}
-
-	/* the headers are already received */
-	hyper_headers_foreach(headers, hyper_each_header, data);
-	if(data->state.hresult) {
-	result = data->state.hresult;
-	goto out;
-	}
-
-	result = empty_header(data);
-	if(result)
-	goto out;
-
-	k->deductheadercount =
-	(100 <= http_status && 199 >= http_status) ? k->headerbytecount : 0;
-	#ifndef CURL_DISABLE_WEBSOCKETS
-	if(k->upgr101 == UPGR101_WS) {
-	if(http_status == 101) {
-	/* verify the response */
-	result = Curl_ws_accept(data, NULL, 0);
-	if(result)
-	goto out;
-	}
-	else {
-	failf(data, "Expected 101, got %u", k->httpcode);
-	result = CURLE_HTTP_RETURNED_ERROR;
-	goto out;
-	}
-	}
-	#endif
-
-	/* Curl_http_auth_act() checks what authentication methods that are
-	* available and decides which one (if any) to use. It will set 'newurl'
-	* if an auth method was picked. */
-	result = Curl_http_auth_act(data);
-	if(result)
-	goto out;
-
-	resp_body = hyper_response_body(resp);
-	if(!resp_body) {
-	failf(data, "hyperstream: could not get response body");
-	result = CURLE_RECV_ERROR;
-	goto out;
-	}
-	foreach = hyper_body_foreach(resp_body, hyper_body_chunk, data);
-	if(!foreach) {
-	failf(data, "hyperstream: body foreach failed");
-	result = CURLE_OUT_OF_MEMORY;
-	goto out;
-	}
-	hyper_task_set_userdata(foreach, (void *)USERDATA_RESP_BODY);
-	if(HYPERE_OK != hyper_executor_push(h->exec, foreach)) {
-	failf(data, "Couldn't hyper_executor_push the body-foreach");
-	result = CURLE_OUT_OF_MEMORY;
-	goto out;
-	}
-
-	hyper_response_free(resp);
-	resp = NULL;
-	}
-	else {
-	DEBUGF(infof(data, "hyper: unhandled tasktype %x", t));
-	}
-	} /* while(1) */
-
-	if(!result && Curl_xfer_needs_flush(data)) {
-	DEBUGF(infof(data, "Curl_hyper_stream(), connection needs flush"));
-	result = Curl_xfer_flush(data);
-	}
-
-	out:
-	DEBUGF(infof(data, "Curl_hyper_stream() -> %d", result));
-	if(resp)
-	hyper_response_free(resp);
-	return result;
-	}
-
-	static CURLcode debug_request(struct Curl_easy *data,
-	const char *method,
-	const char *path)
-	{
-	char *req = aprintf("%s %s HTTP/1.1\r\n", method, path);
-	if(!req)
-	return CURLE_OUT_OF_MEMORY;
-	Curl_debug(data, CURLINFO_HEADER_OUT, req, strlen(req));
-	free(req);
-	return CURLE_OK;
-	}
-
-	/*
-	* Given a full header line "name: value" (optional CRLF in the input, should
-	* be in the output), add to Hyper and send to the debug callback.
-	*
-	* Supports multiple headers.
-	*/
-
-	CURLcode Curl_hyper_header(struct Curl_easy data, hyper_headers headers,
-	const char *line)
-	{
-	const char *p;
-	const char *n;
-	size_t nlen;
-	const char *v;
-	size_t vlen;
-	bool newline = TRUE;
-	int numh = 0;
-
-	if(!line)
-	return CURLE_OK;
-	n = line;
-	do {
-	size_t linelen = 0;
-
-	p = strchr(n, ':');
-	if(!p)
-	/* this is fine if we already added at least one header */
-	return numh ? CURLE_OK : CURLE_BAD_FUNCTION_ARGUMENT;
-	nlen = p - n;
-	p++; /* move past the colon */
-	while(*p == ' ')
-	p++;
-	v = p;
-	p = strchr(v, '\r');
-	if(!p) {
-	p = strchr(v, '\n');
-	if(p)
-	linelen = 1; /* LF only */
-	else {
-	p = strchr(v, '\0');
-	newline = FALSE; /* no newline */
-	}
-	}
-	else
-	linelen = 2; /* CRLF ending */
-	linelen += (p - n);
-	vlen = p - v;
-
-	if(HYPERE_OK != hyper_headers_add(headers, (uint8_t *)n, nlen,
-	(uint8_t *)v, vlen)) {
-	failf(data, "hyper refused to add header '%s'", line);
-	return CURLE_OUT_OF_MEMORY;
-	}
-	if(data->set.verbose) {
-	char *ptr = NULL;
-	if(!newline) {
-	ptr = aprintf("%.*s\r\n", (int)linelen, line);
-	if(!ptr)
-	return CURLE_OUT_OF_MEMORY;
-	Curl_debug(data, CURLINFO_HEADER_OUT, ptr, linelen + 2);
-	free(ptr);
-	}
-	else
-	Curl_debug(data, CURLINFO_HEADER_OUT, (char *)n, linelen);
-	}
-	numh++;
-	n += linelen;
-	} while(newline);
-	return CURLE_OK;
-	}
-
-	static CURLcode request_target(struct Curl_easy *data,
-	struct connectdata *conn,
-	const char *method,
-	hyper_request *req)
-	{
-	CURLcode result;
-	struct dynbuf r;
-
-	Curl_dyn_init(&r, DYN_HTTP_REQUEST);
-
-	result = Curl_http_target(data, conn, &r);
-	if(result)
-	return result;
-
-	if(hyper_request_set_uri(req, (uint8_t *)Curl_dyn_uptr(&r),
-	Curl_dyn_len(&r))) {
-	failf(data, "error setting uri to hyper");
-	result = CURLE_OUT_OF_MEMORY;
-	}
-	else
-	result = debug_request(data, method, Curl_dyn_ptr(&r));
-
-	Curl_dyn_free(&r);
-
-	return result;
-	}
-
-	static int uploadstreamed(void userdata, hyper_context ctx,
-	hyper_buf **chunk)
-	{
-	size_t fillcount;
-	struct Curl_easy data = (struct Curl_easy )userdata;
-	CURLcode result;
-	char *xfer_ulbuf;
-	size_t xfer_ulblen;
-	bool eos;
-	int rc = HYPER_POLL_ERROR;
-	(void)ctx;
-
-	result = Curl_multi_xfer_ulbuf_borrow(data, &xfer_ulbuf, &xfer_ulblen);
-	if(result)
-	goto out;
-
-	result = Curl_client_read(data, xfer_ulbuf, xfer_ulblen, &fillcount, &eos);
-	if(result)
-	goto out;
-
-	if(fillcount) {
-	hyper_buf copy = hyper_buf_copy((uint8_t )xfer_ulbuf, fillcount);
-	if(copy)
-	*chunk = copy;
-	else {
-	result = CURLE_OUT_OF_MEMORY;
-	goto out;
-	}
-	/* increasing the writebytecount here is a little premature but we
-	do not know exactly when the body is sent */
-	data->req.writebytecount += fillcount;
-	if(eos)
-	data->req.eos_read = TRUE;
-	Curl_pgrsSetUploadCounter(data, data->req.writebytecount);
-	rc = HYPER_POLL_READY;
-	}
-	else if(eos) {
-	data->req.eos_read = TRUE;
-	*chunk = NULL;
-	rc = HYPER_POLL_READY;
-	}
-	else {
-	/* paused, save a waker */
-	if(data->hyp.send_body_waker)
-	hyper_waker_free(data->hyp.send_body_waker);
-	data->hyp.send_body_waker = hyper_context_waker(ctx);
-	rc = HYPER_POLL_PENDING;
-	}
-
-	if(!data->req.upload_done && data->req.eos_read) {
-	DEBUGF(infof(data, "hyper: uploadstreamed(), upload is done"));
-	result = Curl_req_set_upload_done(data);
-	}
-
-	out:
-	Curl_multi_xfer_ulbuf_release(data, xfer_ulbuf);
-	data->state.hresult = result;
-	DEBUGF(infof(data, "hyper: uploadstreamed() -> %d", result));
-	return rc;
-	}
-
-	/*
-	* finalize_request() sets up last headers and optional body settings
-	*/
-	static CURLcode finalize_request(struct Curl_easy *data,
-	hyper_headers *headers,
-	hyper_request *hyperreq,
-	Curl_HttpReq httpreq)
-	{
-	CURLcode result = CURLE_OK;
-	struct dynbuf req;
-	if((httpreq == HTTPREQ_GET) \|\| (httpreq == HTTPREQ_HEAD)) {
-	Curl_pgrsSetUploadSize(data, 0); /* no request body */
-	}
-	else {
-	hyper_body *body;
-	Curl_dyn_init(&req, DYN_HTTP_REQUEST);
-	result = Curl_http_req_complete(data, &req, httpreq);
-	if(result)
-	return result;
-
-	/* if the "complete" above did produce more than the closing line,
-	parse the added headers */
-	if(Curl_dyn_len(&req) != 2 \|\| strcmp(Curl_dyn_ptr(&req), "\r\n")) {
-	result = Curl_hyper_header(data, headers, Curl_dyn_ptr(&req));
-	if(result)
-	return result;
-	}
-
-	Curl_dyn_free(&req);
-
-	body = hyper_body_new();
-	hyper_body_set_userdata(body, data);
-	hyper_body_set_data_func(body, uploadstreamed);
-
-	if(HYPERE_OK != hyper_request_set_body(hyperreq, body)) {
-	/* fail */
-	result = CURLE_OUT_OF_MEMORY;
-	}
-	}
-
-	return cr_hyper_add(data);
-	}
-
-	static CURLcode cookies(struct Curl_easy *data,
-	struct connectdata *conn,
-	hyper_headers *headers)
-	{
-	struct dynbuf req;
-	CURLcode result;
-	Curl_dyn_init(&req, DYN_HTTP_REQUEST);
-
-	result = Curl_http_cookies(data, conn, &req);
-	if(!result)
-	result = Curl_hyper_header(data, headers, Curl_dyn_ptr(&req));
-	Curl_dyn_free(&req);
-	return result;
-	}
-
-	/* called on 1xx responses */
-	static void http1xx_cb(void arg, struct hyper_response resp)
-	{
-	struct Curl_easy data = (struct Curl_easy )arg;
-	hyper_headers *headers = NULL;
-	CURLcode result = CURLE_OK;
-	uint16_t http_status;
-	int http_version;
-	const uint8_t *reasonp;
-	size_t reason_len;
-
-	infof(data, "Got HTTP 1xx informational");
-
-	http_status = hyper_response_status(resp);
-	http_version = hyper_response_version(resp);
-	reasonp = hyper_response_reason_phrase(resp);
-	reason_len = hyper_response_reason_phrase_len(resp);
-
-	result = status_line(data, data->conn,
-	http_status, http_version, reasonp, reason_len);
-	if(!result) {
-	headers = hyper_response_headers(resp);
-	if(!headers) {
-	failf(data, "hyperstream: could not get 1xx response headers");
-	result = CURLE_RECV_ERROR;
-	}
-	}
-	data->state.hresult = result;
-
-	if(!result) {
-	/* the headers are already received */
-	hyper_headers_foreach(headers, hyper_each_header, data);
-	/* this callback also sets data->state.hresult on error */
-
-	if(empty_header(data))
-	result = CURLE_OUT_OF_MEMORY;
-	}
-
-	if(data->state.hresult)
-	infof(data, "ERROR in 1xx, bail out");
-	}
-
-	/*
-	* Curl_http() gets called from the generic multi_do() function when an HTTP
-	* request is to be performed. This creates and sends a properly constructed
-	* HTTP request.
-	*/
-	CURLcode Curl_http(struct Curl_easy data, bool done)
-	{
-	struct connectdata *conn = data->conn;
-	struct hyptransfer *h = &data->hyp;
-	hyper_io *io = NULL;
-	hyper_clientconn_options *options = NULL;
-	hyper_task task = NULL; / for the handshake */
-	hyper_task sendtask = NULL; / for the send */
-	hyper_clientconn *client = NULL;
-	hyper_request *req = NULL;
-	hyper_headers *headers = NULL;
-	hyper_task *handshake = NULL;
-	CURLcode result;
-	const char p_accept; / Accept: string */
-	const char *method;
-	Curl_HttpReq httpreq;
-	const char te = NULL; / transfer-encoding */
-	hyper_code rc;
-
-	/* Always consider the DO phase done after this function call, even if there
-	may be parts of the request that is not yet sent, since we can deal with
-	the rest of the request in the PERFORM phase. */
-	*done = TRUE;
-	result = Curl_client_start(data);
-	if(result)
-	goto out;
-
-	/* Add collecting of headers written to client. For a new connection,
-	* we might have done that already, but reuse
-	* or multiplex needs it here as well. */
-	result = Curl_headers_init(data);
-	if(result)
-	goto out;
-
-	infof(data, "Time for the Hyper dance");
-	memset(h, 0, sizeof(struct hyptransfer));
-
-	result = Curl_http_host(data, conn);
-	if(result)
-	goto out;
-
-	Curl_http_method(data, conn, &method, &httpreq);
-
-	DEBUGASSERT(data->req.bytecount == 0);
-
-	/* setup the authentication headers */
-	{
-	char *pq = NULL;
-	if(data->state.up.query) {
-	pq = aprintf("%s?%s", data->state.up.path, data->state.up.query);
-	if(!pq) {
-	result = CURLE_OUT_OF_MEMORY;
-	goto out;
-	}
-	}
-	result = Curl_http_output_auth(data, conn, method, httpreq,
-	(pq ? pq : data->state.up.path), FALSE);
-	free(pq);
-	if(result)
-	goto out;
-	}
-
-	result = Curl_http_req_set_reader(data, httpreq, &te);
-	if(result)
-	goto out;
-
-	result = Curl_http_range(data, httpreq);
-	if(result)
-	goto out;
-
-	result = Curl_http_useragent(data);
-	if(result)
-	goto out;
-
-	io = hyper_io_new();
-	if(!io) {
-	failf(data, "Couldn't create hyper IO");
-	result = CURLE_OUT_OF_MEMORY;
-	goto out;
-	}
-	/* tell Hyper how to read/write network data */
-	h->io_ctx.data = data;
-	h->io_ctx.sockindex = FIRSTSOCKET;
-	hyper_io_set_userdata(io, &h->io_ctx);
-	hyper_io_set_read(io, Curl_hyper_recv);
-	hyper_io_set_write(io, Curl_hyper_send);
-
-	/* create an executor to poll futures */
-	if(!h->exec) {
-	h->exec = hyper_executor_new();
-	if(!h->exec) {
-	failf(data, "Couldn't create hyper executor");
-	result = CURLE_OUT_OF_MEMORY;
-	goto out;
-	}
-	}
-
-	options = hyper_clientconn_options_new();
-	if(!options) {
-	failf(data, "Couldn't create hyper client options");
-	result = CURLE_OUT_OF_MEMORY;
-	goto out;
-	}
-	if(conn->alpn == CURL_HTTP_VERSION_2) {
-	failf(data, "ALPN protocol h2 not supported with Hyper");
-	result = CURLE_UNSUPPORTED_PROTOCOL;
-	goto out;
-	}
-	hyper_clientconn_options_set_preserve_header_case(options, 1);
-	hyper_clientconn_options_set_preserve_header_order(options, 1);
-	hyper_clientconn_options_http1_allow_multiline_headers(options, 1);
-
-	hyper_clientconn_options_exec(options, h->exec);
-
-	/* "Both the `io` and the `options` are consumed in this function call" */
-	handshake = hyper_clientconn_handshake(io, options);
-	if(!handshake) {
-	failf(data, "Couldn't create hyper client handshake");
-	result = CURLE_OUT_OF_MEMORY;
-	goto out;
-	}
-	io = NULL;
-	options = NULL;
-
-	if(HYPERE_OK != hyper_executor_push(h->exec, handshake)) {
-	failf(data, "Couldn't hyper_executor_push the handshake");
-	result = CURLE_OUT_OF_MEMORY;
-	goto out;
-	}
-	handshake = NULL; /* ownership passed on */
-
-	task = hyper_executor_poll(h->exec);
-	if(!task) {
-	failf(data, "Couldn't hyper_executor_poll the handshake");
-	result = CURLE_OUT_OF_MEMORY;
-	goto out;
-	}
-
-	client = hyper_task_value(task);
-	hyper_task_free(task);
-
-	req = hyper_request_new();
-	if(!req) {
-	failf(data, "Couldn't hyper_request_new");
-	result = CURLE_OUT_OF_MEMORY;
-	goto out;
-	}
-
-	if(!Curl_use_http_1_1plus(data, conn)) {
-	if(HYPERE_OK != hyper_request_set_version(req,
-	HYPER_HTTP_VERSION_1_0)) {
-	failf(data, "error setting HTTP version");
-	result = CURLE_OUT_OF_MEMORY;
-	goto out;
-	}
-	}
-
-	if(hyper_request_set_method(req, (uint8_t *)method, strlen(method))) {
-	failf(data, "error setting method");
-	result = CURLE_OUT_OF_MEMORY;
-	goto out;
-	}
-
-	result = request_target(data, conn, method, req);
-	if(result)
-	goto out;
-
-	headers = hyper_request_headers(req);
-	if(!headers) {
-	failf(data, "hyper_request_headers");
-	result = CURLE_OUT_OF_MEMORY;
-	goto out;
-	}
-
-	rc = hyper_request_on_informational(req, http1xx_cb, data);
-	if(rc) {
-	result = CURLE_OUT_OF_MEMORY;
-	goto out;
-	}
-
-	if(data->state.aptr.host) {
-	result = Curl_hyper_header(data, headers, data->state.aptr.host);
-	if(result)
-	goto out;
-	}
-
-	#ifndef CURL_DISABLE_PROXY
-	if(data->state.aptr.proxyuserpwd) {
-	result = Curl_hyper_header(data, headers, data->state.aptr.proxyuserpwd);
-	if(result)
-	goto out;
-	}
-	#endif
-
-	if(data->state.aptr.userpwd) {
-	result = Curl_hyper_header(data, headers, data->state.aptr.userpwd);
-	if(result)
-	goto out;
-	}
-
-	if((data->state.use_range && data->state.aptr.rangeline)) {
-	result = Curl_hyper_header(data, headers, data->state.aptr.rangeline);
-	if(result)
-	goto out;
-	}
-
-	if(data->set.str[STRING_USERAGENT] &&
-	*data->set.str[STRING_USERAGENT] &&
-	data->state.aptr.uagent) {
-	result = Curl_hyper_header(data, headers, data->state.aptr.uagent);
-	if(result)
-	goto out;
-	}
-
-	p_accept = Curl_checkheaders(data,
-	STRCONST("Accept")) ? NULL : "Accept: /\r\n";
-	if(p_accept) {
-	result = Curl_hyper_header(data, headers, p_accept);
-	if(result)
-	goto out;
-	}
-	if(te) {
-	result = Curl_hyper_header(data, headers, te);
-	if(result)
-	goto out;
-	}
-
-	#ifndef CURL_DISABLE_ALTSVC
-	if(conn->bits.altused && !Curl_checkheaders(data, STRCONST("Alt-Used"))) {
-	char *altused = aprintf("Alt-Used: %s:%d\r\n",
-	conn->conn_to_host.name, conn->conn_to_port);
-	if(!altused) {
-	result = CURLE_OUT_OF_MEMORY;
-	goto out;
-	}
-	result = Curl_hyper_header(data, headers, altused);
-	if(result)
-	goto out;
-	free(altused);
-	}
-	#endif
-
-	#ifndef CURL_DISABLE_PROXY
-	if(conn->bits.httpproxy && !conn->bits.tunnel_proxy &&
-	!Curl_checkheaders(data, STRCONST("Proxy-Connection")) &&
-	!Curl_checkProxyheaders(data, conn, STRCONST("Proxy-Connection"))) {
-	result = Curl_hyper_header(data, headers, "Proxy-Connection: Keep-Alive");
-	if(result)
-	goto out;
-	}
-	#endif
-
-	Curl_safefree(data->state.aptr.ref);
-	if(data->state.referer && !Curl_checkheaders(data, STRCONST("Referer"))) {
-	data->state.aptr.ref = aprintf("Referer: %s\r\n", data->state.referer);
-	if(!data->state.aptr.ref)
-	result = CURLE_OUT_OF_MEMORY;
-	else
-	result = Curl_hyper_header(data, headers, data->state.aptr.ref);
-	if(result)
-	goto out;
-	}
-
-	#ifdef HAVE_LIBZ
-	/* we only consider transfer-encoding magic if libz support is built-in */
-	result = Curl_transferencode(data);
-	if(result)
-	goto out;
-	result = Curl_hyper_header(data, headers, data->state.aptr.te);
-	if(result)
-	goto out;
-	#endif
-
-	if(!Curl_checkheaders(data, STRCONST("Accept-Encoding")) &&
-	data->set.str[STRING_ENCODING]) {
-	Curl_safefree(data->state.aptr.accept_encoding);
-	data->state.aptr.accept_encoding =
-	aprintf("Accept-Encoding: %s\r\n", data->set.str[STRING_ENCODING]);
-	if(!data->state.aptr.accept_encoding)
-	result = CURLE_OUT_OF_MEMORY;
-	else
-	result = Curl_hyper_header(data, headers,
-	data->state.aptr.accept_encoding);
-	if(result)
-	goto out;
-	}
-	else
-	Curl_safefree(data->state.aptr.accept_encoding);
-
-	result = cookies(data, conn, headers);
-	if(result)
-	goto out;
-
-	if(!result && conn->handler->protocol&(CURLPROTO_WS\|CURLPROTO_WSS))
-	result = Curl_ws_request(data, headers);
-
-	result = Curl_add_timecondition(data, headers);
-	if(result)
-	goto out;
-
-	result = Curl_add_custom_headers(data, FALSE, headers);
-	if(result)
-	goto out;
-
-	result = finalize_request(data, headers, req, httpreq);
-	if(result)
-	goto out;
-
-	Curl_debug(data, CURLINFO_HEADER_OUT, (char *)"\r\n", 2);
-
-	if(data->req.upload_chunky && data->req.authneg) {
-	data->req.upload_chunky = TRUE;
-	}
-	else {
-	data->req.upload_chunky = FALSE;
-	}
-	sendtask = hyper_clientconn_send(client, req);
-	if(!sendtask) {
-	failf(data, "hyper_clientconn_send");
-	result = CURLE_OUT_OF_MEMORY;
-	goto out;
-	}
-	req = NULL;
-
-	if(HYPERE_OK != hyper_executor_push(h->exec, sendtask)) {
-	failf(data, "Couldn't hyper_executor_push the send");
-	result = CURLE_OUT_OF_MEMORY;
-	goto out;
-	}
-	sendtask = NULL; /* ownership passed on */
-
-	hyper_clientconn_free(client);
-	client = NULL;
-
-	if((httpreq == HTTPREQ_GET) \|\| (httpreq == HTTPREQ_HEAD)) {
-	/* HTTP GET/HEAD download */
-	Curl_pgrsSetUploadSize(data, 0); /* nothing */
-	result = Curl_req_set_upload_done(data);
-	if(result)
-	goto out;
-	}
-
-	Curl_xfer_setup1(data, CURL_XFER_SENDRECV, -1, TRUE);
-	conn->datastream = Curl_hyper_stream;
-
-	/* clear userpwd and proxyuserpwd to avoid reusing old credentials
-	* from reused connections */
-	Curl_safefree(data->state.aptr.userpwd);
-	#ifndef CURL_DISABLE_PROXY
-	Curl_safefree(data->state.aptr.proxyuserpwd);
-	#endif
-
-	out:
-	if(result) {
-	if(io)
-	hyper_io_free(io);
-	if(options)
-	hyper_clientconn_options_free(options);
-	if(handshake)
-	hyper_task_free(handshake);
-	if(client)
-	hyper_clientconn_free(client);
-	if(req)
-	hyper_request_free(req);
-	}
-	return result;
-	}
-
-	void Curl_hyper_done(struct Curl_easy *data)
-	{
-	struct hyptransfer *h = &data->hyp;
-	if(h->exec) {
-	hyper_executor_free(h->exec);
-	h->exec = NULL;
-	}
-	if(h->read_waker) {
-	hyper_waker_free(h->read_waker);
-	h->read_waker = NULL;
-	}
-	if(h->write_waker) {
-	hyper_waker_free(h->write_waker);
-	h->write_waker = NULL;
-	}
-	if(h->send_body_waker) {
-	hyper_waker_free(h->send_body_waker);
-	h->send_body_waker = NULL;
-	}
-	}
-
-	static CURLcode cr_hyper_unpause(struct Curl_easy *data,
-	struct Curl_creader *reader)
-	{
-	(void)reader;
-	if(data->hyp.send_body_waker) {
-	hyper_waker_wake(data->hyp.send_body_waker);
-	data->hyp.send_body_waker = NULL;
-	}
-	return CURLE_OK;
-	}
-
-	/* Hyper client reader, handling unpausing */
-	static const struct Curl_crtype cr_hyper_protocol = {
-	"cr-hyper",
-	Curl_creader_def_init,
-	Curl_creader_def_read,
-	Curl_creader_def_close,
-	Curl_creader_def_needs_rewind,
-	Curl_creader_def_total_length,
-	Curl_creader_def_resume_from,
-	Curl_creader_def_rewind,
-	cr_hyper_unpause,
-	Curl_creader_def_is_paused,
-	Curl_creader_def_done,
-	sizeof(struct Curl_creader)
-	};
-
-	static CURLcode cr_hyper_add(struct Curl_easy *data)
-	{
-	struct Curl_creader *reader = NULL;
-	CURLcode result;
-
-	result = Curl_creader_create(&reader, data, &cr_hyper_protocol,
-	CURL_CR_PROTOCOL);
-	if(!result)
-	result = Curl_creader_add(data, reader);
-
-	if(result && reader)
-	Curl_creader_free(data, reader);
-	return result;
-	}
-
-	#endif /* !defined(CURL_DISABLE_HTTP) && defined(USE_HYPER) */

lib/c-hyper.h+0 -63

@@ -1,63 +0,0 @@
-	#ifndef HEADER_CURL_HYPER_H
-	#define HEADER_CURL_HYPER_H
-	/***************************************************************************
-	* _ _ ____ _
-	* 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.haxx.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 "curl_setup.h"
-
-	#if !defined(CURL_DISABLE_HTTP) && defined(USE_HYPER)
-
-	#include <hyper.h>
-
-	struct hyp_io_ctx {
-	struct Curl_easy *data;
-	int sockindex;
-	};
-
-	/* per-transfer data for the Hyper backend */
-	struct hyptransfer {
-	hyper_waker *write_waker;
-	hyper_waker *read_waker;
-	const hyper_executor *exec;
-	hyper_waker *send_body_waker;
-	struct hyp_io_ctx io_ctx;
-	};
-
-	size_t Curl_hyper_recv(void userp, hyper_context ctx,
-	uint8_t *buf, size_t buflen);
-	size_t Curl_hyper_send(void userp, hyper_context ctx,
-	const uint8_t *buf, size_t buflen);
-	CURLcode Curl_hyper_stream(struct Curl_easy *data,
-	struct connectdata *conn,
-	int *didwhat,
-	int select_res);
-
-	CURLcode Curl_hyper_header(struct Curl_easy data, hyper_headers headers,
-	const char *line);
-	void Curl_hyper_done(struct Curl_easy *);
-
-	#else
-	#define Curl_hyper_done(x)
-
-	#endif /* !defined(CURL_DISABLE_HTTP) && defined(USE_HYPER) */
-	#endif /* HEADER_CURL_HYPER_H */

lib/cf-h1-proxy.c+0 -338

@@ -27,9 +27,6 @@
	#if !defined(CURL_DISABLE_PROXY) && !defined(CURL_DISABLE_HTTP)

	#include <curl/curl.h>
-	#ifdef USE_HYPER
-	#include <hyper.h>
-	#endif
	#include "urldata.h"
	#include "dynbuf.h"
	#include "sendf.h"
@@ -184,9 +181,6 @@ static void h1_tunnel_go_state(struct Curl_cfilter *cf,
	make sure that it is not accidentally used for the document request
	after we have connected. So let's free and clear it here. */
	Curl_safefree(data->state.aptr.proxyuserpwd);
-	#ifdef USE_HYPER
-	data->state.hconnect = FALSE;
-	#endif
	break;
	}
	}
@@ -212,7 +206,6 @@ static bool tunnel_want_send(struct h1_tunnel_state *ts)
	return (ts->tunnel_state == H1_TUNNEL_CONNECT);
	}

-	#ifndef USE_HYPER
	static CURLcode start_CONNECT(struct Curl_cfilter *cf,
	struct Curl_easy *data,
	struct h1_tunnel_state *ts)
@@ -529,337 +522,6 @@ static CURLcode recv_CONNECT_resp(struct Curl_cfilter *cf,
	return result;
	}

-	#else /* USE_HYPER */
-
-	static CURLcode CONNECT_host(struct Curl_cfilter *cf,
-	struct Curl_easy *data,
-	char **pauthority,
-	char **phost_header)
-	{
-	const char *hostname;
-	int port;
-	bool ipv6_ip;
-	CURLcode result;
-	char authority; / for CONNECT, the destination host + port */
-	char host_header = NULL; / Host: authority */
-
-	result = Curl_http_proxy_get_destination(cf, &hostname, &port, &ipv6_ip);
-	if(result)
-	return result;
-
-	authority = aprintf("%s%s%s:%d", ipv6_ip ? "[":"", hostname,
-	ipv6_ip ? "]" : "", port);
-	if(!authority)
-	return CURLE_OUT_OF_MEMORY;
-
-	/* If user is not overriding the Host header later */
-	if(!Curl_checkProxyheaders(data, cf->conn, STRCONST("Host"))) {
-	host_header = aprintf("Host: %s\r\n", authority);
-	if(!host_header) {
-	free(authority);
-	return CURLE_OUT_OF_MEMORY;
-	}
-	}
-	*pauthority = authority;
-	*phost_header = host_header;
-	return CURLE_OK;
-	}
-
-	/* The Hyper version of CONNECT */
-	static CURLcode start_CONNECT(struct Curl_cfilter *cf,
-	struct Curl_easy *data,
-	struct h1_tunnel_state *ts)
-	{
-	struct connectdata *conn = cf->conn;
-	struct hyptransfer *h = &data->hyp;
-	curl_socket_t tunnelsocket = Curl_conn_cf_get_socket(cf, data);
-	hyper_io *io = NULL;
-	hyper_request *req = NULL;
-	hyper_headers *headers = NULL;
-	hyper_clientconn_options *options = NULL;
-	hyper_task *handshake = NULL;
-	hyper_task task = NULL; / for the handshake */
-	hyper_clientconn *client = NULL;
-	hyper_task sendtask = NULL; / for the send */
-	char authority = NULL; / for CONNECT */
-	char host_header = NULL; / Host: */
-	CURLcode result = CURLE_OUT_OF_MEMORY;
-	(void)ts;
-
-	io = hyper_io_new();
-	if(!io) {
-	failf(data, "Couldn't create hyper IO");
-	result = CURLE_OUT_OF_MEMORY;
-	goto error;
-	}
-	/* tell Hyper how to read/write network data */
-	h->io_ctx.data = data;
-	h->io_ctx.sockindex = cf->sockindex;
-	hyper_io_set_userdata(io, &h->io_ctx);
-	hyper_io_set_read(io, Curl_hyper_recv);
-	hyper_io_set_write(io, Curl_hyper_send);
-	conn->sockfd = tunnelsocket;
-
-	data->state.hconnect = TRUE;
-
-	/* create an executor to poll futures */
-	if(!h->exec) {
-	h->exec = hyper_executor_new();
-	if(!h->exec) {
-	failf(data, "Couldn't create hyper executor");
-	result = CURLE_OUT_OF_MEMORY;
-	goto error;
-	}
-	}
-
-	options = hyper_clientconn_options_new();
-	if(!options) {
-	failf(data, "Couldn't create hyper client options");
-	result = CURLE_OUT_OF_MEMORY;
-	goto error;
-	}
-	hyper_clientconn_options_set_preserve_header_case(options, 1);
-	hyper_clientconn_options_set_preserve_header_order(options, 1);
-
-	hyper_clientconn_options_exec(options, h->exec);
-
-	/* "Both the `io` and the `options` are consumed in this function
-	call" */
-	handshake = hyper_clientconn_handshake(io, options);
-	if(!handshake) {
-	failf(data, "Couldn't create hyper client handshake");
-	result = CURLE_OUT_OF_MEMORY;
-	goto error;
-	}
-	io = NULL;
-	options = NULL;
-
-	if(HYPERE_OK != hyper_executor_push(h->exec, handshake)) {
-	failf(data, "Couldn't hyper_executor_push the handshake");
-	result = CURLE_OUT_OF_MEMORY;
-	goto error;
-	}
-	handshake = NULL; /* ownership passed on */
-
-	task = hyper_executor_poll(h->exec);
-	if(!task) {
-	failf(data, "Couldn't hyper_executor_poll the handshake");
-	result = CURLE_OUT_OF_MEMORY;
-	goto error;
-	}
-
-	client = hyper_task_value(task);
-	hyper_task_free(task);
-
-	req = hyper_request_new();
-	if(!req) {
-	failf(data, "Couldn't hyper_request_new");
-	result = CURLE_OUT_OF_MEMORY;
-	goto error;
-	}
-	if(hyper_request_set_method(req, (uint8_t *)"CONNECT",
-	strlen("CONNECT"))) {
-	failf(data, "error setting method");
-	result = CURLE_OUT_OF_MEMORY;
-	goto error;
-	}
-
-	/* This only happens if we have looped here due to authentication
-	reasons, and we do not really use the newly cloned URL here
-	then. Just free() it. */
-	Curl_safefree(data->req.newurl);
-
-	result = CONNECT_host(cf, data, &authority, &host_header);
-	if(result)
-	goto error;
-
-	infof(data, "Establish HTTP proxy tunnel to %s", authority);
-
-	if(hyper_request_set_uri(req, (uint8_t *)authority,
-	strlen(authority))) {
-	failf(data, "error setting path");
-	result = CURLE_OUT_OF_MEMORY;
-	goto error;
-	}
-	if(data->set.verbose) {
-	char *se = aprintf("CONNECT %s HTTP/1.1\r\n", authority);
-	if(!se) {
-	result = CURLE_OUT_OF_MEMORY;
-	goto error;
-	}
-	Curl_debug(data, CURLINFO_HEADER_OUT, se, strlen(se));
-	free(se);
-	}
-	/* Setup the proxy-authorization header, if any */
-	result = Curl_http_output_auth(data, conn, "CONNECT", HTTPREQ_GET,
-	authority, TRUE);
-	if(result)
-	goto error;
-	Curl_safefree(authority);
-
-	/* default is 1.1 */
-	if((conn->http_proxy.proxytype == CURLPROXY_HTTP_1_0) &&
-	(HYPERE_OK != hyper_request_set_version(req,
-	HYPER_HTTP_VERSION_1_0))) {
-	failf(data, "error setting HTTP version");
-	result = CURLE_OUT_OF_MEMORY;
-	goto error;
-	}
-
-	headers = hyper_request_headers(req);
-	if(!headers) {
-	failf(data, "hyper_request_headers");
-	result = CURLE_OUT_OF_MEMORY;
-	goto error;
-	}
-	if(host_header) {
-	result = Curl_hyper_header(data, headers, host_header);
-	if(result)
-	goto error;
-	Curl_safefree(host_header);
-	}
-
-	if(data->state.aptr.proxyuserpwd) {
-	result = Curl_hyper_header(data, headers,
-	data->state.aptr.proxyuserpwd);
-	if(result)
-	goto error;
-	}
-
-	if(!Curl_checkProxyheaders(data, conn, STRCONST("User-Agent")) &&
-	data->set.str[STRING_USERAGENT] && *data->set.str[STRING_USERAGENT]) {
-	struct dynbuf ua;
-	Curl_dyn_init(&ua, DYN_HTTP_REQUEST);
-	result = Curl_dyn_addf(&ua, "User-Agent: %s\r\n",
-	data->set.str[STRING_USERAGENT]);
-	if(result)
-	goto error;
-	result = Curl_hyper_header(data, headers, Curl_dyn_ptr(&ua));
-	if(result)
-	goto error;
-	Curl_dyn_free(&ua);
-	}
-
-	if(!Curl_checkProxyheaders(data, conn, STRCONST("Proxy-Connection"))) {
-	result = Curl_hyper_header(data, headers,
-	"Proxy-Connection: Keep-Alive");
-	if(result)
-	goto error;
-	}
-
-	result = Curl_add_custom_headers(data, TRUE, headers);
-	if(result)
-	goto error;
-
-	result = Curl_creader_set_null(data);
-	if(result)
-	goto error;
-
-	sendtask = hyper_clientconn_send(client, req);
-	if(!sendtask) {
-	failf(data, "hyper_clientconn_send");
-	result = CURLE_OUT_OF_MEMORY;
-	goto error;
-	}
-	req = NULL;
-
-	if(HYPERE_OK != hyper_executor_push(h->exec, sendtask)) {
-	failf(data, "Couldn't hyper_executor_push the send");
-	result = CURLE_OUT_OF_MEMORY;
-	goto error;
-	}
-	sendtask = NULL; /* ownership passed on */
-
-	hyper_clientconn_free(client);
-	client = NULL;
-
-	error:
-	free(host_header);
-	free(authority);
-	if(io)
-	hyper_io_free(io);
-	if(options)
-	hyper_clientconn_options_free(options);
-	if(handshake)
-	hyper_task_free(handshake);
-	if(client)
-	hyper_clientconn_free(client);
-	if(req)
-	hyper_request_free(req);
-
-	return result;
-	}
-
-	static CURLcode send_CONNECT(struct Curl_cfilter *cf,
-	struct Curl_easy *data,
-	struct h1_tunnel_state *ts,
-	bool *done)
-	{
-	struct hyptransfer *h = &data->hyp;
-	struct connectdata *conn = cf->conn;
-	hyper_task *task = NULL;
-	hyper_error *hypererr = NULL;
-	CURLcode result = CURLE_OK;
-
-	(void)ts;
-	(void)conn;
-	do {
-	task = hyper_executor_poll(h->exec);
-	if(task) {
-	bool error = hyper_task_type(task) == HYPER_TASK_ERROR;
-	if(error)
-	hypererr = hyper_task_value(task);
-	hyper_task_free(task);
-	if(error) {
-	/* this could probably use a better error code? */
-	result = CURLE_OUT_OF_MEMORY;
-	goto error;
-	}
-	}
-	} while(task);
-	error:
-	*done = (result == CURLE_OK);
-	if(hypererr) {
-	uint8_t errbuf[256];
-	size_t errlen = hyper_error_print(hypererr, errbuf, sizeof(errbuf));
-	failf(data, "Hyper: %.*s", (int)errlen, errbuf);
-	hyper_error_free(hypererr);
-	}
-	return result;
-	}
-
-	static CURLcode recv_CONNECT_resp(struct Curl_cfilter *cf,
-	struct Curl_easy *data,
-	struct h1_tunnel_state *ts,
-	bool *done)
-	{
-	struct hyptransfer *h = &data->hyp;
-	CURLcode result;
-	int didwhat;
-
-	(void)ts;
-	result = Curl_hyper_stream(data, cf->conn, &didwhat,
-	CURL_CSELECT_IN \| CURL_CSELECT_OUT);
-	*done = data->req.done;
-	if(result \|\| !*done)
-	return result;
-	if(h->exec) {
-	hyper_executor_free(h->exec);
-	h->exec = NULL;
-	}
-	if(h->read_waker) {
-	hyper_waker_free(h->read_waker);
-	h->read_waker = NULL;
-	}
-	if(h->write_waker) {
-	hyper_waker_free(h->write_waker);
-	h->write_waker = NULL;
-	}
-	return result;
-	}
-
-	#endif /* USE_HYPER */
-
	static CURLcode H1_CONNECT(struct Curl_cfilter *cf,
	struct Curl_easy *data,
	struct h1_tunnel_state *ts)

lib/cf-https-connect.c+2 -2

@@ -24,7 +24,7 @@

	#include "curl_setup.h"

-	#if !defined(CURL_DISABLE_HTTP) && !defined(USE_HYPER)
+	#if !defined(CURL_DISABLE_HTTP)

	#include "urldata.h"
	#include <curl/curl.h>
@@ -617,4 +617,4 @@ out:
	return result;
	}

-	#endif /* !defined(CURL_DISABLE_HTTP) && !defined(USE_HYPER) */
+	#endif /* !defined(CURL_DISABLE_HTTP) */

lib/cf-https-connect.h+2 -2

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

-	#if !defined(CURL_DISABLE_HTTP) && !defined(USE_HYPER)
+	#if !defined(CURL_DISABLE_HTTP)

	struct Curl_cfilter;
	struct Curl_easy;
@@ -54,5 +54,5 @@ CURLcode Curl_cf_https_setup(struct Curl_easy *data,
	const struct Curl_dns_entry *remotehost);


-	#endif /* !defined(CURL_DISABLE_HTTP) && !defined(USE_HYPER) */
+	#endif /* !defined(CURL_DISABLE_HTTP) */
	#endif /* HEADER_CURL_CF_HTTP_H */

lib/connect.c+2 -2

@@ -1485,7 +1485,7 @@ CURLcode Curl_conn_setup(struct Curl_easy *data,
	DEBUGASSERT(data);
	DEBUGASSERT(conn->handler);

-	#if !defined(CURL_DISABLE_HTTP) && !defined(USE_HYPER)
+	#if !defined(CURL_DISABLE_HTTP)
	if(!conn->cfilter[sockindex] &&
	conn->handler->protocol == CURLPROTO_HTTPS) {
	DEBUGASSERT(ssl_mode != CURL_CF_SSL_DISABLE);
@@ -1493,7 +1493,7 @@ CURLcode Curl_conn_setup(struct Curl_easy *data,
	if(result)
	goto out;
	}
-	#endif /* !defined(CURL_DISABLE_HTTP) && !defined(USE_HYPER) */
+	#endif /* !defined(CURL_DISABLE_HTTP) */

	/* Still no cfilter set, apply default. */
	if(!conn->cfilter[sockindex]) {

lib/curl_setup.h+0 -1

@@ -939,7 +939,6 @@ int getpwuid_r(uid_t uid, struct passwd pwd, char buf,
	#define UNITTEST static
	#endif

-	/* Hyper supports HTTP2 also, but Curl's integration with Hyper does not */
	#if defined(USE_NGHTTP2)
	#define USE_HTTP2
	#endif

lib/curl_trc.c+1 -1

@@ -319,7 +319,7 @@ static struct trc_cft_def trc_cfts[] = {
	#ifdef USE_HTTP3
	{ &Curl_cft_http3, TRC_CT_PROTOCOL },
	#endif
-	#if !defined(CURL_DISABLE_HTTP) && !defined(USE_HYPER)
+	#if !defined(CURL_DISABLE_HTTP)
	{ &Curl_cft_http_connect, TRC_CT_PROTOCOL },
	#endif
	};

lib/http.c+72 -81

@@ -47,10 +47,6 @@
	#include <sys/param.h>
	#endif

-	#ifdef USE_HYPER
-	#include <hyper.h>
-	#endif
-
	#include "urldata.h"
	#include <curl/curl.h>
	#include "transfer.h"
@@ -88,7 +84,6 @@
	#include "altsvc.h"
	#include "hsts.h"
	#include "ws.h"
-	#include "c-hyper.h"
	#include "curl_ctype.h"

	/* The last 3 #include files should be in this order */
@@ -104,6 +99,31 @@ static bool http_should_fail(struct Curl_easy *data, int httpcode);
	static bool http_exp100_is_waiting(struct Curl_easy *data);
	static CURLcode http_exp100_add_reader(struct Curl_easy *data);
	static void http_exp100_send_anyway(struct Curl_easy *data);
+	static bool http_exp100_is_selected(struct Curl_easy *data);
+	static void http_exp100_got100(struct Curl_easy *data);
+	static CURLcode http_firstwrite(struct Curl_easy *data);
+	static CURLcode http_header(struct Curl_easy *data,
+	const char *hd, size_t hdlen);
+	static CURLcode http_host(struct Curl_easy data, struct connectdata conn);
+	static CURLcode http_range(struct Curl_easy *data,
+	Curl_HttpReq httpreq);
+	static CURLcode http_req_complete(struct Curl_easy *data,
+	struct dynbuf *r, Curl_HttpReq httpreq);
+	static CURLcode http_req_set_reader(struct Curl_easy *data,
+	Curl_HttpReq httpreq,
+	const char **tep);
+	static CURLcode http_size(struct Curl_easy *data);
+	static CURLcode http_statusline(struct Curl_easy *data,
+	struct connectdata *conn);
+	static CURLcode http_target(struct Curl_easy data, struct connectdata conn,
+	struct dynbuf *req);
+	static CURLcode http_useragent(struct Curl_easy *data);
+	#ifdef HAVE_LIBZ
+	static CURLcode http_transferencode(struct Curl_easy *data);
+	#endif
+	static bool use_http_1_1plus(const struct Curl_easy *data,
+	const struct connectdata *conn);
+

	/*
	* HTTP handler interface.
@@ -1169,7 +1189,6 @@ CURLcode Curl_http_done(struct Curl_easy *data,
	data->state.authproxy.multipass = FALSE;

	Curl_dyn_reset(&data->state.headerb);
-	Curl_hyper_done(data);

	if(status)
	return status;
@@ -1202,8 +1221,8 @@ CURLcode Curl_http_done(struct Curl_easy *data,
	* - if any server previously contacted to handle this request only supports
	* 1.0.
	*/
-	bool Curl_use_http_1_1plus(const struct Curl_easy *data,
-	const struct connectdata *conn)
+	static bool use_http_1_1plus(const struct Curl_easy *data,
+	const struct connectdata *conn)
	{
	if((data->state.httpversion == 10) \|\| (conn->httpversion == 10))
	return FALSE;
@@ -1214,7 +1233,6 @@ bool Curl_use_http_1_1plus(const struct Curl_easy *data,
	(data->state.httpwant >= CURL_HTTP_VERSION_1_1));
	}

-	#ifndef USE_HYPER
	static const char get_http_string(const struct Curl_easy data,
	const struct connectdata *conn)
	{
@@ -1222,21 +1240,15 @@ static const char get_http_string(const struct Curl_easy data,
	return "3";
	if(Curl_conn_is_http2(data, conn, FIRSTSOCKET))
	return "2";
-	if(Curl_use_http_1_1plus(data, conn))
+	if(use_http_1_1plus(data, conn))
	return "1.1";

	return "1.0";
	}
-	#endif

	CURLcode Curl_add_custom_headers(struct Curl_easy *data,
	bool is_connect,
-	#ifndef USE_HYPER
-	struct dynbuf *req
-	#else
-	void *req
-	#endif
-	)
+	struct dynbuf *req)
	{
	struct connectdata *conn = data->conn;
	char *ptr;
@@ -1303,9 +1315,7 @@ CURLcode Curl_add_custom_headers(struct Curl_easy *data,
	/* copy the source */
	semicolonp = strdup(headers->data);
	if(!semicolonp) {
-	#ifndef USE_HYPER
	Curl_dyn_free(req);
-	#endif
	return CURLE_OUT_OF_MEMORY;
	}
	/* put a colon where the semicolon is */
@@ -1364,11 +1374,7 @@ CURLcode Curl_add_custom_headers(struct Curl_easy *data,
	!Curl_auth_allowed_to_host(data))
	;
	else {
-	#ifdef USE_HYPER
-	result = Curl_hyper_header(data, req, compare);
-	#else
	result = Curl_dyn_addf(req, "%s\r\n", compare);
-	#endif
	}
	if(semicolonp)
	free(semicolonp);
@@ -1385,12 +1391,7 @@ CURLcode Curl_add_custom_headers(struct Curl_easy *data,

	#ifndef CURL_DISABLE_PARSEDATE
	CURLcode Curl_add_timecondition(struct Curl_easy *data,
-	#ifndef USE_HYPER
-	struct dynbuf *req
-	#else
-	void *req
-	#endif
-	)
+	struct dynbuf *req)
	{
	const struct tm *tm;
	struct tm keeptime;
@@ -1453,12 +1454,7 @@ CURLcode Curl_add_timecondition(struct Curl_easy *data,
	tm->tm_min,
	tm->tm_sec);

-	#ifndef USE_HYPER
	result = Curl_dyn_add(req, datestr);
-	#else
-	result = Curl_hyper_header(data, req, datestr);
-	#endif
-
	return result;
	}
	#else
@@ -1512,7 +1508,7 @@ void Curl_http_method(struct Curl_easy data, struct connectdata conn,
	*reqp = httpreq;
	}

-	CURLcode Curl_http_useragent(struct Curl_easy *data)
+	static CURLcode http_useragent(struct Curl_easy *data)
	{
	/* The User-Agent string might have been allocated in url.c already, because
	it might have been used in the proxy connect, but if we have got a header
@@ -1526,7 +1522,7 @@ CURLcode Curl_http_useragent(struct Curl_easy *data)
	}


-	CURLcode Curl_http_host(struct Curl_easy data, struct connectdata conn)
+	static CURLcode http_host(struct Curl_easy data, struct connectdata conn)
	{
	const char *ptr;
	struct dynamically_allocated_data *aptr = &data->state.aptr;
@@ -1616,9 +1612,9 @@ CURLcode Curl_http_host(struct Curl_easy data, struct connectdata conn)
	/*
	* Append the request-target to the HTTP request
	*/
-	CURLcode Curl_http_target(struct Curl_easy *data,
-	struct connectdata *conn,
-	struct dynbuf *r)
+	static CURLcode http_target(struct Curl_easy *data,
+	struct connectdata *conn,
+	struct dynbuf *r)
	{
	CURLcode result = CURLE_OK;
	const char *path = data->state.up.path;
@@ -1898,9 +1894,9 @@ static CURLcode http_resume(struct Curl_easy *data, Curl_HttpReq httpreq)
	return CURLE_OK;
	}

-	CURLcode Curl_http_req_set_reader(struct Curl_easy *data,
-	Curl_HttpReq httpreq,
-	const char **tep)
+	static CURLcode http_req_set_reader(struct Curl_easy *data,
+	Curl_HttpReq httpreq,
+	const char **tep)
	{
	CURLcode result = CURLE_OK;
	const char *ptr;
@@ -1920,7 +1916,7 @@ CURLcode Curl_http_req_set_reader(struct Curl_easy *data,
	Curl_compareheader(ptr,
	STRCONST("Transfer-Encoding:"), STRCONST("chunked"));
	if(data->req.upload_chunky &&
-	Curl_use_http_1_1plus(data, data->conn) &&
+	use_http_1_1plus(data, data->conn) &&
	(data->conn->httpversion >= 20)) {
	infof(data, "suppressing chunked transfer encoding on connection "
	"using HTTP version 2 or higher");
@@ -1932,7 +1928,7 @@ CURLcode Curl_http_req_set_reader(struct Curl_easy *data,

	if(req_clen < 0) {
	/* indeterminate request content length */
-	if(Curl_use_http_1_1plus(data, data->conn)) {
+	if(use_http_1_1plus(data, data->conn)) {
	/* On HTTP/1.1, enable chunked, on HTTP/2 and later we do not
	* need it */
	data->req.upload_chunky = (data->conn->httpversion < 20);
@@ -1974,7 +1970,7 @@ static CURLcode addexpect(struct Curl_easy data, struct dynbuf r,
	Curl_compareheader(ptr, STRCONST("Expect:"), STRCONST("100-continue"));
	}
	else if(!data->state.disableexpect &&
-	Curl_use_http_1_1plus(data, data->conn) &&
+	use_http_1_1plus(data, data->conn) &&
	(data->conn->httpversion < 20)) {
	/* if not doing HTTP 1.0 or version 2, or disabled explicitly, we add an
	Expect: 100-continue to the headers which actually speeds up post
@@ -1990,21 +1986,19 @@ static CURLcode addexpect(struct Curl_easy data, struct dynbuf r,
	return CURLE_OK;
	}

-	CURLcode Curl_http_req_complete(struct Curl_easy *data,
-	struct dynbuf *r, Curl_HttpReq httpreq)
+	static CURLcode http_req_complete(struct Curl_easy *data,
+	struct dynbuf *r, Curl_HttpReq httpreq)
	{
	CURLcode result = CURLE_OK;
	curl_off_t req_clen;
	bool announced_exp100 = FALSE;

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

	/* Get the request body length that has been set up */
	req_clen = Curl_creader_total_length(data);
@@ -2079,9 +2073,9 @@ out:

	#if !defined(CURL_DISABLE_COOKIES)

-	CURLcode Curl_http_cookies(struct Curl_easy *data,
-	struct connectdata *conn,
-	struct dynbuf *r)
+	static CURLcode http_cookies(struct Curl_easy *data,
+	struct connectdata *conn,
+	struct dynbuf *r)
	{
	CURLcode result = CURLE_OK;
	char *addcookies = NULL;
@@ -2157,8 +2151,8 @@ CURLcode Curl_http_cookies(struct Curl_easy *data,
	}
	#endif

-	CURLcode Curl_http_range(struct Curl_easy *data,
-	Curl_HttpReq httpreq)
+	static CURLcode http_range(struct Curl_easy *data,
+	Curl_HttpReq httpreq)
	{
	if(data->state.use_range) {
	/*
@@ -2214,7 +2208,7 @@ CURLcode Curl_http_range(struct Curl_easy *data,
	return CURLE_OK;
	}

-	CURLcode Curl_http_firstwrite(struct Curl_easy *data)
+	static CURLcode http_firstwrite(struct Curl_easy *data)
	{
	struct connectdata *conn = data->conn;
	struct SingleRequest *k = &data->req;
@@ -2277,7 +2271,7 @@ CURLcode Curl_http_firstwrite(struct Curl_easy *data)
	}

	#ifdef HAVE_LIBZ
-	CURLcode Curl_transferencode(struct Curl_easy *data)
+	static CURLcode http_transferencode(struct Curl_easy *data)
	{
	if(!Curl_checkheaders(data, STRCONST("TE")) &&
	data->set.http_transfer_encoding) {
@@ -2309,7 +2303,6 @@ CURLcode Curl_transferencode(struct Curl_easy *data)
	}
	#endif

-	#ifndef USE_HYPER
	/*
	* Curl_http() gets called from the generic multi_do() function when an HTTP
	* request is to be performed. This creates and sends a properly constructed
@@ -2370,11 +2363,11 @@ CURLcode Curl_http(struct Curl_easy data, bool done)
	if(result)
	goto fail;

-	result = Curl_http_host(data, conn);
+	result = http_host(data, conn);
	if(result)
	goto fail;

-	result = Curl_http_useragent(data);
+	result = http_useragent(data);
	if(result)
	goto fail;

@@ -2415,19 +2408,19 @@ CURLcode Curl_http(struct Curl_easy data, bool done)

	#ifdef HAVE_LIBZ
	/* we only consider transfer-encoding magic if libz support is built-in */
-	result = Curl_transferencode(data);
+	result = http_transferencode(data);
	if(result)
	goto fail;
	#endif

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

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

-	result = Curl_http_range(data, httpreq);
+	result = http_range(data, httpreq);
	if(result)
	goto fail;

@@ -2444,7 +2437,7 @@ CURLcode Curl_http(struct Curl_easy data, bool done)
	/* GET/HEAD/POST/PUT */
	result = Curl_dyn_addf(&req, "%s ", request);
	if(!result)
-	result = Curl_http_target(data, conn, &req);
+	result = http_target(data, conn, &req);
	if(result) {
	Curl_dyn_free(&req);
	goto fail;
@@ -2538,7 +2531,7 @@ CURLcode Curl_http(struct Curl_easy data, bool done)
	}
	}

-	result = Curl_http_cookies(data, conn, &req);
+	result = http_cookies(data, conn, &req);
	#ifndef CURL_DISABLE_WEBSOCKETS
	if(!result && conn->handler->protocol&(CURLPROTO_WS\|CURLPROTO_WSS))
	result = Curl_ws_request(data, &req);
@@ -2550,7 +2543,7 @@ CURLcode Curl_http(struct Curl_easy data, bool done)

	if(!result) {
	/* req_send takes ownership of the 'req' memory on success */
-	result = Curl_http_req_complete(data, &req, httpreq);
+	result = http_req_complete(data, &req, httpreq);
	if(!result)
	result = Curl_req_send(data, &req);
	}
@@ -2569,8 +2562,6 @@ fail:
	return result;
	}

-	#endif /* USE_HYPER */
-
	typedef enum {
	STATUS_UNKNOWN, /* not enough data to tell yet */
	STATUS_DONE, /* a status line was read */
@@ -2657,10 +2648,10 @@ checkprotoprefix(struct Curl_easy data, struct connectdata conn,
	Curl_compareheader(hd, STRCONST(n), STRCONST(v)))

	/*
-	* Curl_http_header() parses a single response header.
+	* http_header() parses a single response header.
	*/
-	CURLcode Curl_http_header(struct Curl_easy *data,
-	const char *hd, size_t hdlen)
+	static CURLcode http_header(struct Curl_easy *data,
+	const char *hd, size_t hdlen)
	{
	struct connectdata *conn = data->conn;
	CURLcode result;
@@ -3022,8 +3013,8 @@ CURLcode Curl_http_header(struct Curl_easy *data,
	* Called after the first HTTP response line (the status line) has been
	* received and parsed.
	*/
-	CURLcode Curl_http_statusline(struct Curl_easy *data,
-	struct connectdata *conn)
+	static CURLcode http_statusline(struct Curl_easy *data,
+	struct connectdata *conn)
	{
	struct SingleRequest *k = &data->req;

@@ -3116,7 +3107,7 @@ CURLcode Curl_http_statusline(struct Curl_easy *data,
	figured out here after all headers have been received but before the final
	call to the user's header callback, so that a valid content length can be
	retrieved by the user in the final call. */
-	CURLcode Curl_http_size(struct Curl_easy *data)
+	static CURLcode http_size(struct Curl_easy *data)
	{
	struct SingleRequest *k = &data->req;
	if(data->req.ignore_cl \|\| k->chunk) {
@@ -3264,7 +3255,7 @@ static CURLcode http_on_response(struct Curl_easy *data,
	* that tells us that the server is OK with this and ready
	* to receive the data.
	*/
-	Curl_http_exp100_got100(data);
+	http_exp100_got100(data);
	break;
	case 101:
	/* Switching Protocols only allowed from HTTP/1.1 */
@@ -3423,7 +3414,7 @@ static CURLcode http_on_response(struct Curl_easy *data,
	* connection for closure after we have read the entire response.
	*/
	if(!Curl_req_done_sending(data)) {
-	if((k->httpcode == 417) && Curl_http_exp100_is_selected(data)) {
+	if((k->httpcode == 417) && http_exp100_is_selected(data)) {
	/* 417 Expectation Failed - try again without the Expect
	header */
	if(!k->writebytecount && http_exp100_is_waiting(data)) {
@@ -3486,13 +3477,13 @@ static CURLcode http_on_response(struct Curl_easy *data,
	k->download_done = TRUE;

	/* final response without error, prepare to receive the body */
-	result = Curl_http_firstwrite(data);
+	result = http_firstwrite(data);

	if(!result)
	/* This is the last response that we get for the current request.
	* Check on the body size and determine if the response is complete.
	*/
-	result = Curl_http_size(data);
+	result = http_size(data);

	out:
	if(last_hd) {
@@ -3645,7 +3636,7 @@ static CURLcode http_rw_hd(struct Curl_easy *data,
	}

	if(fine_statusline) {
-	result = Curl_http_statusline(data, data->conn);
+	result = http_statusline(data, data->conn);
	if(result)
	return result;
	writetype \|= CLIENTWRITE_STATUS;
@@ -3660,7 +3651,7 @@ static CURLcode http_rw_hd(struct Curl_easy *data,
	if(result)
	return result;

-	result = Curl_http_header(data, hd, hdlen);
+	result = http_header(data, hd, hdlen);
	if(result)
	return result;

@@ -4359,7 +4350,7 @@ static CURLcode http_exp100_add_reader(struct Curl_easy *data)
	return result;
	}

-	void Curl_http_exp100_got100(struct Curl_easy *data)
+	static void http_exp100_got100(struct Curl_easy *data)
	{
	struct Curl_creader *r = Curl_creader_get_by_type(data, &cr_exp100);
	if(r)
@@ -4383,7 +4374,7 @@ static void http_exp100_send_anyway(struct Curl_easy *data)
	http_exp100_continue(data, r);
	}

-	bool Curl_http_exp100_is_selected(struct Curl_easy *data)
+	static bool http_exp100_is_selected(struct Curl_easy *data)
	{
	struct Curl_creader *r = Curl_creader_get_by_type(data, &cr_exp100);
	return !!r;

lib/http.h+5 -38

@@ -74,40 +74,14 @@ char Curl_checkProxyheaders(struct Curl_easy data,
	const char *thisheader,
	const size_t thislen);

-	CURLcode Curl_add_timecondition(struct Curl_easy *data,
-	#ifndef USE_HYPER
-	struct dynbuf *req
-	#else
-	void *headers
-	#endif
-	);
-	CURLcode Curl_add_custom_headers(struct Curl_easy *data,
-	bool is_connect,
-	#ifndef USE_HYPER
-	struct dynbuf *req
-	#else
-	void *headers
-	#endif
-	);
+	CURLcode Curl_add_timecondition(struct Curl_easy data, struct dynbuf req);
+	CURLcode Curl_add_custom_headers(struct Curl_easy *data, bool is_connect,
+	struct dynbuf *req);
+	CURLcode Curl_dynhds_add_custom(struct Curl_easy *data, bool is_connect,
+	struct dynhds *hds);

	void Curl_http_method(struct Curl_easy data, struct connectdata conn,
	const char *method, Curl_HttpReq );
-	CURLcode Curl_http_useragent(struct Curl_easy *data);
-	CURLcode Curl_http_host(struct Curl_easy data, struct connectdata conn);
-	CURLcode Curl_http_target(struct Curl_easy data, struct connectdata conn,
-	struct dynbuf *req);
-	CURLcode Curl_http_statusline(struct Curl_easy *data,
-	struct connectdata *conn);
-	CURLcode Curl_http_header(struct Curl_easy *data,
-	const char *hd, size_t hdlen);
-	CURLcode Curl_transferencode(struct Curl_easy *data);
-	CURLcode Curl_http_req_set_reader(struct Curl_easy *data,
-	Curl_HttpReq httpreq,
-	const char **tep);
-	CURLcode Curl_http_req_complete(struct Curl_easy *data,
-	struct dynbuf *r, Curl_HttpReq httpreq);
-	bool Curl_use_http_1_1plus(const struct Curl_easy *data,
-	const struct connectdata *conn);
	#ifndef CURL_DISABLE_COOKIES
	CURLcode Curl_http_cookies(struct Curl_easy *data,
	struct connectdata *conn,
@@ -115,9 +89,6 @@ CURLcode Curl_http_cookies(struct Curl_easy *data,
	#else
	#define Curl_http_cookies(a,b,c) CURLE_OK
	#endif
-	CURLcode Curl_http_range(struct Curl_easy *data,
-	Curl_HttpReq httpreq);
-	CURLcode Curl_http_firstwrite(struct Curl_easy *data);

	/* protocol-specific functions set up to be called by the main engine */
	CURLcode Curl_http_setup_conn(struct Curl_easy *data,
@@ -175,8 +146,6 @@ CURLcode Curl_http_auth_act(struct Curl_easy *data);
	version. This count includes CONNECT response headers. */
	#define MAX_HTTP_RESP_HEADER_SIZE (300*1024)

-	bool Curl_http_exp100_is_selected(struct Curl_easy *data);
-	void Curl_http_exp100_got100(struct Curl_easy *data);

	#endif /* CURL_DISABLE_HTTP */

@@ -184,8 +153,6 @@ void Curl_http_exp100_got100(struct Curl_easy *data);
	* HTTP unique setup
	***************************************************************************/

-	CURLcode Curl_http_size(struct Curl_easy *data);
-
	CURLcode Curl_http_write_resp_hds(struct Curl_easy *data,
	const char *buf, size_t blen,
	size_t *pconsumed);

lib/http_proxy.c+0 -3

@@ -29,9 +29,6 @@
	#if !defined(CURL_DISABLE_HTTP) && !defined(CURL_DISABLE_PROXY)

	#include <curl/curl.h>
-	#ifdef USE_HYPER
-	#include <hyper.h>
-	#endif
	#include "sendf.h"
	#include "http.h"
	#include "url.h"

lib/request.c+3 -9

@@ -162,9 +162,6 @@ void Curl_req_hard_reset(struct SingleRequest req, struct Curl_easy data)
	req->no_body = data->set.opt_no_body;
	req->authneg = FALSE;
	req->shutdown = FALSE;
-	#ifdef USE_HYPER
-	req->bodywritten = FALSE;
-	#endif
	}

	void Curl_req_free(struct SingleRequest req, struct Curl_easy data)
@@ -261,7 +258,7 @@ static CURLcode req_send_buffer_flush(struct Curl_easy *data)
	return result;
	}

-	CURLcode Curl_req_set_upload_done(struct Curl_easy *data)
+	static CURLcode req_set_upload_done(struct Curl_easy *data)
	{
	DEBUGASSERT(!data->req.upload_done);
	data->req.upload_done = TRUE;
@@ -339,7 +336,7 @@ static CURLcode req_flush(struct Curl_easy *data)
	if(!done)
	return CURLE_AGAIN;
	}
-	return Curl_req_set_upload_done(data);
+	return req_set_upload_done(data);
	}
	return CURLE_OK;
	}
@@ -360,8 +357,6 @@ static ssize_t add_from_client(void *reader_ctx,
	return (ssize_t)nread;
	}

-	#ifndef USE_HYPER
-
	static CURLcode req_send_buffer_add(struct Curl_easy *data,
	const char *buf, size_t blen,
	size_t hds_len)
@@ -411,7 +406,6 @@ CURLcode Curl_req_send(struct Curl_easy data, struct dynbuf req)
	}
	return CURLE_OK;
	}
-	#endif /* !USE_HYPER */

	bool Curl_req_sendbuf_empty(struct Curl_easy *data)
	{
@@ -464,7 +458,7 @@ CURLcode Curl_req_abort_sending(struct Curl_easy *data)
	data->req.upload_aborted = TRUE;
	/* no longer KEEP_SEND and KEEP_SEND_PAUSE */
	data->req.keepon &= ~KEEP_SENDBITS;
-	return Curl_req_set_upload_done(data);
+	return req_set_upload_done(data);
	}
	return CURLE_OK;
	}

lib/request.h+0 -6

@@ -152,9 +152,6 @@ struct SingleRequest {
	BIT(sendbuf_init); /* sendbuf is initialized */
	BIT(shutdown); /* request end will shutdown connection */
	BIT(shutdown_err_ignore); /* errors in shutdown will not fail request */
-	#ifdef USE_HYPER
-	BIT(bodywritten);
-	#endif
	};

	/**
@@ -196,7 +193,6 @@ void Curl_req_free(struct SingleRequest req, struct Curl_easy data);
	*/
	void Curl_req_hard_reset(struct SingleRequest req, struct Curl_easy data);

-	#ifndef USE_HYPER
	/**
	* Send request headers. If not all could be sent
	* they will be buffered. Use `Curl_req_flush()` to make sure
@@ -207,8 +203,6 @@ void Curl_req_hard_reset(struct SingleRequest req, struct Curl_easy data);
	*/
	CURLcode Curl_req_send(struct Curl_easy data, struct dynbuf buf);

-	#endif /* !USE_HYPER */
-
	/**
	* TRUE iff the request has sent all request headers and data.
	*/

lib/rtsp.c+2 -2

@@ -24,7 +24,7 @@

	#include "curl_setup.h"

-	#if !defined(CURL_DISABLE_RTSP) && !defined(USE_HYPER)
+	#if !defined(CURL_DISABLE_RTSP)

	#include "urldata.h"
	#include <curl/curl.h>
@@ -1043,4 +1043,4 @@ CURLcode rtsp_parse_transport(struct Curl_easy data, const char transport)
	}


-	#endif /* CURL_DISABLE_RTSP or using Hyper */
+	#endif /* CURL_DISABLE_RTSP */

lib/rtsp.h+0 -3

@@ -23,9 +23,6 @@
	* SPDX-License-Identifier: curl
	*
	***************************************************************************/
-	#ifdef USE_HYPER
-	#define CURL_DISABLE_RTSP 1
-	#endif

	#ifndef CURL_DISABLE_RTSP

lib/sendf.c+0 -19

@@ -316,9 +316,6 @@ static CURLcode cw_download_write(struct Curl_easy *data,
	}
	/* Update stats, write and report progress */
	data->req.bytecount += nwrite;
-	#ifdef USE_HYPER
-	data->req.bodywritten = TRUE;
-	#endif
	result = Curl_pgrsSetDownloadCounter(data, data->req.bytecount);
	if(result)
	return result;
@@ -497,22 +494,6 @@ struct Curl_cwriter Curl_cwriter_get_by_type(struct Curl_easy data,
	return NULL;
	}

-	void Curl_cwriter_remove_by_name(struct Curl_easy *data,
-	const char *name)
-	{
-	struct Curl_cwriter **anchor = &data->req.writer_stack;
-
-	while(*anchor) {
-	if(!strcmp(name, (*anchor)->cwt->name)) {
-	struct Curl_cwriter w = (anchor);
-	*anchor = w->next;
-	Curl_cwriter_free(data, w);
-	continue;
-	}
-	anchor = &((*anchor)->next);
-	}
-	}
-
	bool Curl_cwriter_is_paused(struct Curl_easy *data)
	{
	return Curl_cw_out_is_paused(data);

lib/sendf.h+0 -3

@@ -166,9 +166,6 @@ CURLcode Curl_cwriter_add(struct Curl_easy *data,
	struct Curl_cwriter Curl_cwriter_get_by_type(struct Curl_easy data,
	const struct Curl_cwtype *cwt);

-	void Curl_cwriter_remove_by_name(struct Curl_easy *data,
-	const char *name);
-
	struct Curl_cwriter Curl_cwriter_get_by_name(struct Curl_easy data,
	const char *name);

lib/setopt.c+0 -6

@@ -644,13 +644,7 @@ static CURLcode setopt_long(struct Curl_easy *data, CURLoption option,
	break;

	case CURLOPT_HTTP09_ALLOWED:
-	#ifdef USE_HYPER
-	/* Hyper does not support HTTP/0.9 */
-	if(enabled)
-	return CURLE_BAD_FUNCTION_ARGUMENT;
-	#else
	data->set.http09_allowed = enabled;
-	#endif
	break;
	#endif /* ! CURL_DISABLE_HTTP */

lib/transfer.c+0 -12

@@ -435,15 +435,6 @@ CURLcode Curl_sendrecv(struct Curl_easy data, struct curltime nowp)
	data->state.select_bits = 0;
	}

-	#ifdef USE_HYPER
-	if(data->conn->datastream) {
-	result = data->conn->datastream(data, data->conn, &didwhat,
-	CURL_CSELECT_OUT\|CURL_CSELECT_IN);
-	if(result \|\| data->req.done)
-	goto out;
-	}
-	else {
-	#endif
	/* We go ahead and do a read if we have a readable socket or if the stream
	was rewound (in which case we have data in a buffer) */
	if(k->keepon & KEEP_RECV) {
@@ -458,9 +449,6 @@ CURLcode Curl_sendrecv(struct Curl_easy data, struct curltime nowp)
	if(result)
	goto out;
	}
-	#ifdef USE_HYPER
-	}
-	#endif

	if(!didwhat) {
	/* Transfer wanted to send/recv, but nothing was possible. */

lib/urldata.h+1 -19

@@ -180,13 +180,6 @@ typedef ssize_t (Curl_recv)(struct Curl_easy data, / transfer */
	size_t len, /* max amount to read */
	CURLcode err); / error to return */

-	#ifdef USE_HYPER
-	typedef CURLcode (Curl_datastream)(struct Curl_easy data,
-	struct connectdata *conn,
-	int *didwhat,
-	int select_res);
-	#endif
-
	#include "mime.h"
	#include "imap.h"
	#include "pop3.h"
@@ -200,7 +193,6 @@ typedef CURLcode (Curl_datastream)(struct Curl_easy data,
	#include "mqtt.h"
	#include "ftplistparser.h"
	#include "multihandle.h"
-	#include "c-hyper.h"
	#include "cf-socket.h"

	#ifdef HAVE_GSSAPI
@@ -930,10 +922,7 @@ struct connectdata {
	#ifdef USE_UNIX_SOCKETS
	char *unix_domain_socket;
	#endif
-	#ifdef USE_HYPER
-	/* if set, an alternative data transfer function */
-	Curl_datastream datastream;
-	#endif
+
	/* When this connection is created, store the conditions for the local end
	bind. This is stored before the actual bind and before any connection is
	made and will serve the purpose of being used for comparison reasons so
@@ -1276,10 +1265,6 @@ struct UrlState {
	struct curl_slist cookielist; / list of cookie files set by
	curl_easy_setopt(COOKIEFILE) calls */
	#endif
-	#ifdef USE_HYPER
-	bool hconnect; /* set if a CONNECT request */
-	CURLcode hresult; /* used to pass return codes back from hyper callbacks */
-	#endif

	#ifndef CURL_DISABLE_VERBOSE_STRINGS
	struct curl_trc_feat feat; / opt. trace feature transfer is part of */
@@ -1923,9 +1908,6 @@ struct Curl_easy {
	struct PureInfo info; /* stats, reports and info data */
	struct curl_tlssessioninfo tsi; /* Information about the TLS session, only
	valid after a client has asked for it */
-	#ifdef USE_HYPER
-	struct hyptransfer hyp;
-	#endif
	};

	#define LIBCURL_NAME "libcurl"

lib/version.c+0 -15

@@ -210,9 +210,6 @@ char *curl_version(void)
	#ifdef USE_LIBRTMP
	char rtmp_version[30];
	#endif
-	#ifdef USE_HYPER
-	char hyper_buf[30];
-	#endif
	#ifdef USE_GSASL
	char gsasl_buf[30];
	#endif
@@ -277,10 +274,6 @@ char *curl_version(void)
	Curl_rtmp_version(rtmp_version, sizeof(rtmp_version));
	src[i++] = rtmp_version;
	#endif
-	#ifdef USE_HYPER
-	msnprintf(hyper_buf, sizeof(hyper_buf), "Hyper/%s", hyper_version());
-	src[i++] = hyper_buf;
-	#endif
	#ifdef USE_GSASL
	msnprintf(gsasl_buf, sizeof(gsasl_buf), "libgsasl/%s",
	gsasl_check_version(NULL));
@@ -676,14 +669,6 @@ curl_version_info_data *curl_version_info(CURLversion stamp)
	}
	#endif

-	#ifdef USE_HYPER
-	{
-	static char hyper_buffer[30];
-	msnprintf(hyper_buffer, sizeof(hyper_buffer), "Hyper/%s", hyper_version());
-	version_info.hyper_version = hyper_buffer;
-	}
-	#endif
-
	#ifdef USE_GSASL
	{
	version_info.gsasl_version = gsasl_check_version(NULL);

lib/ws.c+1 -9

@@ -676,7 +676,7 @@ struct wsfield {
	const char *val;
	};

-	CURLcode Curl_ws_request(struct Curl_easy data, REQTYPE req)
+	CURLcode Curl_ws_request(struct Curl_easy data, struct dynbuf req)
	{
	unsigned int i;
	CURLcode result = CURLE_OK;
@@ -729,16 +729,8 @@ CURLcode Curl_ws_request(struct Curl_easy data, REQTYPE req)
	free(randstr);
	for(i = 0; !result && (i < sizeof(heads)/sizeof(heads[0])); i++) {
	if(!Curl_checkheaders(data, STRCONST(heads[i].name))) {
-	#ifdef USE_HYPER
-	char field[128];
-	msnprintf(field, sizeof(field), "%s %s", heads[i].name,
-	heads[i].val);
-	result = Curl_hyper_header(data, req, field);
-	#else
-	(void)data;
	result = Curl_dyn_addf(req, "%s %s\r\n", heads[i].name,
	heads[i].val);
-	#endif
	}
	}
	k->upgr101 = UPGR101_WS;

lib/ws.h+1 -7

@@ -27,12 +27,6 @@

	#if !defined(CURL_DISABLE_WEBSOCKETS) && !defined(CURL_DISABLE_HTTP)

-	#ifdef USE_HYPER
-	#define REQTYPE void
-	#else
-	#define REQTYPE struct dynbuf
-	#endif
-
	/* a client-side WS frame decoder, parsing frame headers and
	* payload, keeping track of current position and stats */
	enum ws_dec_state {
@@ -73,7 +67,7 @@ struct websocket {
	struct curl_ws_frame frame; /* the current WS FRAME received */
	};

-	CURLcode Curl_ws_request(struct Curl_easy data, REQTYPE req);
+	CURLcode Curl_ws_request(struct Curl_easy data, struct dynbuf req);
	CURLcode Curl_ws_accept(struct Curl_easy data, const char mem, size_t len);

	extern const struct Curl_handler Curl_handler_ws;

tests/FILEFORMAT.md+0 -4

@@ -208,9 +208,6 @@ together as a single identifier. Most keywords are only there to provide a way
	for users to skip certain classes of tests, if desired, but a few are treated
	specially by the test harness or build system.

-	When using curl built with Hyper, the keywords must include `HTTP` or `HTTPS`
-	for 'hyper mode' to kick in and make line ending checks work for tests.
-
	When running a unit test and the keywords include `unittest`, the `<tool>`
	section can be left empty to use the standard unit test tool name `unitN` where
	`N` is the test number.
@@ -447,7 +444,6 @@ Features testable here are:
	- `http/2`
	- `http/3`
	- `HTTPS-proxy`
-	- `hyper`
	- `IDN`
	- `IPv6`
	- `Kerberos`

tests/data/DISABLED+0 -32

@@ -54,38 +54,6 @@
	# https://github.com/curl/curl/issues/380
	1801
	#
-	#
-	# Tests that are disabled here for Hyper are SUPPOSED to work but
-	# still need adjustments in tests or code. Tests that cannot be
-	# fixed for hyper should be adjusted for it in the test file.
-	#
-	# hyper support remains EXPERIMENTAL as long as there's a test number
-	# listed below
-	#
-	# Several tests fail due to hyper's lack of trailers support: 266, 1417, 1540,
-	# 1591, 1943. See https://github.com/hyperium/hyper/issues/2699 for details.
-	%if hyper
-	266
-	477
-	500
-	579
-	587
-	# 1021 re-added here due to flakiness
-	1021
-	1060
-	1417
-	1460
-	1533
-	1540
-	1591
-	1598
-	1943
-	2301
-	2302
-	2305
-	# response body seem not to be handled by hyper
-	2307
-	%endif
	2043
	# The CRL test doesn't work with wolfSSL
	%if wolfssl

tests/data/test1072+0 -4

@@ -63,11 +63,7 @@ Accept: /
	Transfer-Encoding: chunked
	Expect: 100-continue

-	%if hyper
-	7A
-	%else
	7a
-	%endif
	This is data we upload with PUT
	it comes from stdin so MUST be sent
	with chunked encoding

tests/data/test1073+0 -4

@@ -57,11 +57,7 @@ Accept: /
	Transfer-Encoding: chunked
	Expect: 100-continue

-	%if hyper
-	7A
-	%else
	7a
-	%endif
	This is data we upload with PUT
	it comes from stdin so MUST be sent
	with chunked encoding

tests/data/test1116+0 -6

@@ -24,10 +24,8 @@ bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb
	cccccccccccccccccccccccccccccccc

	0
-	%if !hyper
	chunky-trailer: header data
	another-header: yes
-	%endif

	</data>
	<datacheck>
@@ -37,10 +35,8 @@ Transfer-Encoding: chunked
	Connection: mooo

	aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbcccccccccccccccccccccccccccccccc
-	%if !hyper
	chunky-trailer: header data
	another-header: yes
-	%endif
	</datacheck>
	<servercmd>
	writedelay: 10
@@ -77,10 +73,8 @@ Server: fakeit/0.9 fakeitbad/1.0
	Transfer-Encoding: chunked
	Connection: mooo

-	%if !hyper
	chunky-trailer: header data
	another-header: yes
-	%endif
	</file>
	</verify>

tests/data/test1144+0 -4

@@ -40,10 +40,6 @@ verify
	#
	# Client-side
	<client>
-	# hyper doesn't support HTTP/0.9
-	<features>
-	!hyper
-	</features>
	<server>
	http
	</server>

tests/data/test1147+0 -4

@@ -40,9 +40,7 @@ One: 1
	Two: 2
	no-colon

-	%if !hyper
	And A Funny One : wohoo
-	%endif
	User-Agent:
	</file>
	<command>
@@ -59,9 +57,7 @@ Host: %HOSTIP:%HTTPPORT
	Accept: /
	One: 1
	Two: 2
-	%if !hyper
	And A Funny One : wohoo
-	%endif

	</protocol>
	</verify>

tests/data/test1164+0 -4

@@ -22,10 +22,6 @@ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
	#
	# Client-side
	<client>
-	# hyper doesn't support HTTP/0.9
-	<features>
-	!hyper
-	</features>
	<server>
	http
	</server>

tests/data/test1266+0 -4

@@ -19,10 +19,6 @@ swsclose
	#
	# Client-side
	<client>
-	# hyper doesn't grok HTTP/0.9
-	<features>
-	!hyper
-	</features>
	<server>
	http
	</server>

tests/data/test1267+0 -4

@@ -19,10 +19,6 @@ swsclose
	#
	# Client-side
	<client>
-	# hyper doesn't grok HTTP/0.9
-	<features>
-	!hyper
-	</features>
	<server>
	http
	</server>

tests/data/test1274+0 -8

@@ -53,22 +53,14 @@ Accept: /
	<file name="%LOGDIR/out%TESTNUMBER">
	HTTP/1.1 200 OK
	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	%if hyper
-	Server: test-server/ fake folded
-	%else
	Server: test-server/
	fake
	folded
-	%endif
	Last-Modified: Tue, 13 Jun 2000 12:10:00 GMT
	ETag: "21025-dc7-39462498"
	Content-Length: 6
-	%if hyper
-	Connection: close
-	%else
	Connection:
	close
-	%endif

	</file>
	</verify>

tests/data/test1287+0 -2

@@ -83,10 +83,8 @@ Accept: /

	</protocol>
	<file name="%LOGDIR/stderr%TESTNUMBER" mode="text">
-	%if !hyper
	* Ignoring Content-Length in CONNECT 200 response
	* Ignoring Transfer-Encoding in CONNECT 200 response
-	%endif
	</file>
	<stripfile>
	s/^.(?=\ Ignoring (?:Content-Length\|Transfer-Encoding) )// or $_ = ''

tests/data/test1294+0 -2

@@ -28,10 +28,8 @@ Funny-head: yesyes
	#
	# Client-side
	<client>
-	# hyper doesn't support the added crazy header
	<features>
	Debug
-	!hyper
	</features>
	<server>
	http

tests/data/test1473+0 -6

@@ -46,11 +46,5 @@ User-Agent: curl/%VERSION
	Accept: /

	</protocol>
-	%if hyper
-	# curl: (1) Hyper: [6] invalid HTTP header parsed
-	<errorcode>
-	1
-	</errorcode>
-	%endif
	</verify>
	</testcase>

tests/data/test1479+1 -7

@@ -53,15 +53,9 @@ User-Agent: curl/%VERSION
	Accept: /

	</protocol>
-
-	# Hyper curl returns unsupported protocol
-	# built-in curl returns weird_server_reply
+	# weird_server_reply
	<errorcode>
-	%if hyper
-	1
-	%else
	8
-	%endif
	</errorcode>
	</verify>
	</testcase>

tests/data/test1480+1 -6

@@ -45,14 +45,9 @@ Accept: /

	</protocol>

-	# Hyper curl returns unsupported protocol
-	# built-in curl returns weird_server_reply
+	# weird_server_reply
	<errorcode>
-	%if hyper
-	1
-	%else
	8
-	%endif
	</errorcode>
	</verify>
	</testcase>

tests/data/test1482+0 -6

@@ -24,10 +24,8 @@ bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb
	cccccccccccccccccccccccccccccccc

	0
-	%if !hyper
	chunky-trailer: header data
	another-header: yes
-	%endif

	</data>
	<datacheck>
@@ -37,10 +35,8 @@ Transfer-Encoding: chunked, chunked
	Connection: mooo

	aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbcccccccccccccccccccccccccccccccc
-	%if !hyper
	chunky-trailer: header data
	another-header: yes
-	%endif
	</datacheck>
	<servercmd>
	writedelay: 10
@@ -77,10 +73,8 @@ Server: fakeit/0.9 fakeitbad/1.0
	Transfer-Encoding: chunked, chunked
	Connection: mooo

-	%if !hyper
	chunky-trailer: header data
	another-header: yes
-	%endif
	</file>
	</verify>

tests/data/test1483+0 -6

@@ -25,10 +25,8 @@ bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb
	cccccccccccccccccccccccccccccccc

	0
-	%if !hyper
	chunky-trailer: header data
	another-header: yes
-	%endif

	</data>
	<datacheck>
@@ -39,10 +37,8 @@ Transfer-Encoding: chunked
	Connection: mooo

	aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbcccccccccccccccccccccccccccccccc
-	%if !hyper
	chunky-trailer: header data
	another-header: yes
-	%endif
	</datacheck>
	<servercmd>
	writedelay: 10
@@ -80,10 +76,8 @@ Transfer-Encoding: chunked
	Transfer-Encoding: chunked
	Connection: mooo

-	%if !hyper
	chunky-trailer: header data
	another-header: yes
-	%endif
	</file>
	</verify>

tests/data/test1591+0 -4

@@ -48,11 +48,7 @@ Transfer-Encoding: chunked
	Trailer: my-super-awesome-trailer, my-other-awesome-trailer
	Expect: 100-continue

-	%if hyper
-	E
-	%else
	e
-	%endif
	Hello Cloud!

	0

tests/data/test178+1 -10

@@ -19,11 +19,8 @@ Funny-head: yesyes
	moooooooooooo
	</data>
	<datacheck>
-	%if hyper
-	%else
	HTTP/1.1 200 OK swsclose
	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	%endif
	</datacheck>
	</reply>

@@ -51,15 +48,9 @@ User-Agent: curl/%VERSION
	Accept: /

	</protocol>
-
-	# Hyper curl returns unsupported protocol
-	# built-in curl returns weird_server_reply
+	# weird_server_reply
	<errorcode>
-	%if hyper
-	1
-	%else
	8
-	%endif
	</errorcode>
	</verify>
	</testcase>

tests/data/test207+0 -5

@@ -58,13 +58,8 @@ Accept: /

	# curl: (18) transfer closed with outstanding read data remaining
	# 18 == CURLE_PARTIAL_FILE
-	# 56 == CURLE_RECV_ERROR
	<errorcode>
-	%if hyper
-	56
-	%else
	18
-	%endif
	</errorcode>
	</verify>
	</testcase>

tests/data/test218+0 -4

@@ -46,11 +46,7 @@ User-Agent: curl/%VERSION
	Accept: /
	Transfer-Encoding: chunked

-	%if hyper
-	1E
-	%else
	1e
-	%endif
	just some tiny teeny contents

	0

tests/data/test2306+0 -8

@@ -54,14 +54,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER http://%HOSTIP:%HTTPPORT/%TESTNUMBER0002
	#
	# Verify data after the test has been "shot"
	<verify>
-	# hyper doesn't like the bad header in the second request
-	<errorcode>
-	%if hyper
-	1
-	%else
-	0
-	%endif
-	</errorcode>
	<protocol>
	GET /%TESTNUMBER HTTP/1.1
	Host: %HOSTIP:%HTTPPORT

tests/data/test2307+0 -1

@@ -31,7 +31,6 @@ upgrade
	<features>
	Debug
	ws
-	!hyper
	</features>
	<server>
	http

?+0 -0

tests/data/test269+0 -3

@@ -26,9 +26,6 @@ muahahaha
	#
	# Client-side
	<client>
-	<features>
-	!hyper
-	</features>
	<server>
	http
	</server>

tests/data/test28+0 -4

@@ -30,11 +30,7 @@ If this is received, the location following worked
	HTTP/1.1 301 This is a weirdo text message swsclose
	Date: Tue, 09 Nov 2010 14:49:00 GMT
	Server: test-server/fake
-	%if hyper
-	Location: /online/1,1795,Welcome,00.html/%TESTNUMBER0002.txt?logout=TRUE
-	%else
	Location: /online/1,1795,Welcome,00.html/%TESTNUMBER0002.txt?logout=TRUE
-	%endif
	Connection: close

	HTTP/1.1 200 Followed here fine swsclose

tests/data/test3025+0 -3

@@ -23,9 +23,6 @@ MooMoo
	<server>
	http
	</server>
-	<features>
-	!hyper
-	</features>
	<name>
	CURLOPT_HTTP200ALIASES
	</name>

tests/data/test306+0 -1

@@ -37,7 +37,6 @@ verify
	<client>
	<features>
	SSL
-	!hyper
	</features>
	<server>
	https

tests/data/test31+0 -56

@@ -9,10 +9,6 @@ cookiejar
	</info>
	# Server-side
	#
-	# The cookies set come in two versions. This is because when curl is built
-	# with Hyper, the API provides the headers already "sanitized" so we cannot
-	# compare with the exact server contents unless it too sends the data
-	# "clean".

	<reply>
	<data>
@@ -23,7 +19,6 @@ Content-Length: 4
	Content-Type: text/html
	Funny-head: yesyes
	Set-Cookie: blankdomain=sure; domain=; path=/
-	%if !hyper
	Set-Cookie: foobar=name; domain=anything.com; path=/ ; secure
	Set-Cookie:ismatch=this ; domain=test31.curl; path=/silly/
	Set-Cookie:ISMATCH=this ; domain=test31.curl; path=/silly/
@@ -73,57 +68,6 @@ Set-Cookie: withspaces= yes within and around ;
	Set-Cookie: withspaces2 =before equals;
	Set-Cookie: prespace= yes before;
	Set-Cookie: securewithspace=after ; secure =
-	%else
-	Set-Cookie: foobar=name; domain=anything.com; path=/ ; secure
-	Set-Cookie: ismatch=this ; domain=test31.curl; path=/silly/
-	Set-Cookie:ISMATCH=this ; domain=test31.curl; path=/silly/
-	Set-Cookie: overwrite=this ; domain=test31.curl; path=/overwrite/
-	Set-Cookie: overwrite=this2 ; domain=test31.curl; path=/overwrite
-	Set-Cookie: sec1value=secure1 ; domain=test31.curl; path=/secure1/ ; secure
-	Set-Cookie: sec2value=secure2 ; domain=test31.curl; path=/secure2/ ; secure=
-	Set-Cookie: sec3value=secure3 ; domain=test31.curl; path=/secure3/ ; secure=
-	Set-Cookie: sec4value=secure4 ; secure=; domain=test31.curl; path=/secure4/ ;
-	Set-Cookie: sec5value=secure5 ; secure; domain=test31.curl; path=/secure5/ ;
-	Set-Cookie: sec6value=secure6 ; secure ; domain=test31.curl; path=/secure6/ ;
-	Set-Cookie: sec7value=secure7 ; secure ; domain=test31.curl; path=/secure7/ ;
-	Set-Cookie: sec8value=secure8 ; secure= ; domain=test31.curl; path=/secure8/ ;
-	Set-Cookie: secure=very1 ; secure=; domain=test31.curl; path=/secure9/;
-	Set-Cookie: httpo1=value1 ; domain=test31.curl; path=/p1/; httponly
-	Set-Cookie: httpo2=value2 ; domain=test31.curl; path=/p2/; httponly=
-	Set-Cookie: httpo3=value3 ; httponly; domain=test31.curl; path=/p3/;
-	Set-Cookie: httpo4=value4 ; httponly=; domain=test31.curl; path=/p4/;
-	Set-Cookie: httponly=myvalue1 ; domain=test31.curl; path=/p4/; httponly
-	Set-Cookie: httpandsec=myvalue2 ; domain=test31.curl; path=/p4/; httponly; secure
-	Set-Cookie: httpandsec2=myvalue3; domain=test31.curl; path=/p4/; httponly=; secure
-	Set-Cookie: httpandsec3=myvalue4 ; domain=test31.curl; path=/p4/; httponly; secure=
-	Set-Cookie: httpandsec4=myvalue5 ; domain=test31.curl; path=/p4/; httponly=; secure=
-	Set-Cookie: httpandsec5=myvalue6 ; domain=test31.curl; path=/p4/; secure; httponly=
-	Set-Cookie: httpandsec6=myvalue7 ; domain=test31.curl; path=/p4/; secure=; httponly=
-	Set-Cookie: httpandsec7=myvalue8 ; domain=test31.curl; path=/p4/; secure; httponly
-	Set-Cookie: httpandsec8=myvalue9; domain=test31.curl; path=/p4/; secure=; httponly
-	Set-Cookie: partmatch=present; domain=test31.curl ; path=/;
-	Set-Cookie: eat=this; domain=moo.foo.moo;
-	Set-Cookie: eat=this-too; domain=.foo.moo;
-	Set-Cookie: nodomainnovalue
-	%if large-time
-	Set-Cookie: nodomain=value; expires=Fri Feb 13 11:56:27 GMT 2525
-	Set-Cookie: novalue; domain=reallysilly
-	Set-Cookie: test=yes; domain=foo.com; expires=Sat Feb 2 11:56:27 GMT 2525
-	Set-Cookie: test2=yes; domain=se; expires=Sat Feb 2 11:56:27 GMT 2525
-	%else
-	Set-Cookie: nodomain=value; expires=Fri Feb 13 11:56:27 GMT 2037
-	Set-Cookie: novalue; domain=reallysilly
-	Set-Cookie: test=yes; domain=foo.com; expires=Sat Feb 2 11:56:27 GMT 2030
-	Set-Cookie: test2=yes; domain=se; expires=Sat Feb 2 11:56:27 GMT 2030
-	%endif
-	Set-Cookie: magic=yessir; path=/silly/; HttpOnly
-	Set-Cookie: blexp=yesyes; domain=test31.curl; domain=test31.curl; expiry=totally bad;
-	Set-Cookie: partialip=nono; domain=.0.0.1;
-	Set-Cookie: withspaces= yes within and around ;
-	Set-Cookie: withspaces2 =before equals;
-	Set-Cookie: prespace= yes before;
-	Set-Cookie: securewithspace=after ; secure =
-	%endif

	boo
	</data>

tests/data/test326+0 -3

@@ -39,9 +39,6 @@ line 1
	#
	# Client-side
	<client>
-	<features>
-	!hyper
-	</features>
	<server>
	http
	</server>

tests/data/test376+1 -5

@@ -40,14 +40,10 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -o %LOGDIR/save-%TESTNUMBER --remove-on-err
	</client>

	#
-	# Verify data after the test has been "shot". hyper doesn't do error 18
+	# Verify data after the test has been "shot"
	<verify>
	<errorcode>
-	%if hyper
-	56
-	%else
	18
-	%endif
	</errorcode>
	<protocol>
	GET /%TESTNUMBER HTTP/1.1

tests/data/test379+1 -5

@@ -43,14 +43,10 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -o %LOGDIR/save --remove-on-error --no-clob
	</client>

	#
-	# Verify data after the test has been "shot". hyper doesn't do error 18
+	# Verify data after the test has been "shot".
	<verify>
	<errorcode>
-	%if hyper
-	56
-	%else
	18
-	%endif
	</errorcode>
	<protocol>
	GET /%TESTNUMBER HTTP/1.1

tests/data/test393+0 -4

@@ -18,11 +18,7 @@ Server: test-server/fake
	Last-Modified: Tue, 13 Jun 2000 12:10:00 GMT
	ETag: "21025-dc7-39462498"
	Accept-Ranges: bytes
-	%if hyper
-	Content-Length: 3689348814741910323
-	%else
	Content-Length: 36893488147419103232
-	%endif
	Connection: close
	Content-Type: text/html
	Funny-head: yesyes

tests/data/test394+0 -4

@@ -44,11 +44,7 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
	# Verify data after the test has been "shot"
	<verify>
	<errorcode>
-	%if hyper
-	1
-	%else
	8
-	%endif
	</errorcode>
	<protocol>
	GET /%TESTNUMBER HTTP/1.1

tests/data/test395+0 -7

@@ -49,12 +49,5 @@ User-Agent: curl/%VERSION
	Accept: /

	</protocol>
-
-	# hyper cannot work with too-large content-length
-	%if hyper
-	<errorcode>
-	1
-	</errorcode>
-	%endif
	</verify>
	</testcase>

tests/data/test398+0 -4

@@ -54,11 +54,7 @@ Accept: /

	</protocol>
	<errorcode>
-	%if hyper
-	1
-	%else
	8
-	%endif
	</errorcode>
	</verify>
	</testcase>

tests/data/test40+0 -4

@@ -26,11 +26,7 @@ body
	</data2>
	<datacheck>
	HTTP/1.1 302 OK swsclose
-	%if !hyper
	Location: ../moo.html/?name=d a niel&testcase=/%TESTNUMBER0002
-	%else
-	Location: ../moo.html/?name=d a niel&testcase=/%TESTNUMBER0002
-	%endif
	Date: Tue, 09 Nov 2010 14:49:00 GMT
	Connection: close

tests/data/test415+0 -8

@@ -19,11 +19,8 @@ Funny-head: yesyes
	moooooooooooo
	</data>
	<datacheck>
-	%if hyper
-	%else
	HTTP/1.1 200 OK swsclose
	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	%endif
	</datacheck>
	</reply>

@@ -52,14 +49,9 @@ Accept: /

	</protocol>

-	# Hyper curl returns unsupported protocol
	# built-in curl returns weird_server_reply
	<errorcode>
-	%if hyper
-	1
-	%else
	8
-	%endif
	</errorcode>
	</verify>
	</testcase>

tests/data/test42+0 -4

@@ -26,11 +26,7 @@ body
	</data2>
	<datacheck>
	HTTP/1.1 302 OK swsclose
-	%if !hyper
	Location: ../m o o.html/%TESTNUMBER0002
-	%else
-	Location: ../m o o.html/%TESTNUMBER0002
-	%endif
	Date: Tue, 09 Nov 2010 14:49:00 GMT
	Connection: close

tests/data/test470+0 -3

@@ -28,9 +28,6 @@ Funny-head: yesyes
	#
	# Client-side
	<client>
-	<features>
-	!hyper
-	</features>
	<server>
	http
	</server>

tests/data/test497+0 -6

@@ -49,14 +49,8 @@ Accept: /

	</protocol>
	# curl: (56) Too large response headers: 307215 > 307200
-	# hyper returns a generic error that libcurl converts to an even more
-	# generic error
	<errorcode>
-	%if hyper
-	1
-	%else
	56
-	%endif
	</errorcode>
	</verify>
	</testcase>

tests/data/test498+0 -6

@@ -43,14 +43,8 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --max-redirs 400 --location
	# Verify data after the test has been "shot"
	<verify>
	# curl: (56) Too large response headers: 6144086 > 6144000
-	# hyper returns a generic error that libcurl converts to an even more
-	# generic error
	<errorcode>
-	%if hyper
-	1
-	%else
	56
-	%endif
	</errorcode>
	</verify>
	</testcase>

tests/data/test510+0 -4

@@ -56,11 +56,7 @@ one
	two
	5
	three
-	%if hyper
-	1D
-	%else
	1d
-	%endif
	and a final longer crap: four
	0

tests/data/test56+0 -4

@@ -52,11 +52,7 @@ Accept: /
	Transfer-Encoding: chunked
	Content-Type: application/x-www-form-urlencoded

-	%if hyper
-	C
-	%else
	c
-	%endif
	we post this
	0

tests/data/test565+0 -4

@@ -100,11 +100,7 @@ one
	two
	5
	three
-	%if hyper
-	1D
-	%else
	1d
-	%endif
	and a final longer crap: four
	0

tests/data/test60+0 -2

@@ -43,9 +43,7 @@ Host: %HOSTIP:%HTTPPORT
	User-Agent: curl/%VERSION
	Accept: /
	Transfer-Encoding: chunked
-	%if !hyper
	Content-Length: 1
-	%endif
	Expect: 100-continue

	13

tests/data/test645+0 -24

@@ -76,11 +76,7 @@ Transfer-Encoding: chunked
	Content-Type: multipart/form-data; boundary=----------------------------
	Expect: 100-continue

-	%if hyper
-	7C
-	%else
	7c
-	%endif
	------------------------------
	Content-Disposition: form-data; name="sendfile"; filename="postit2.c"

@@ -96,11 +92,7 @@ y
	1


-	%if hyper
-	6B
-	%else
	6b
-	%endif

	------------------------------
	Content-Disposition: form-data; name="callbackdata"
@@ -119,11 +111,7 @@ y
	1


-	%if hyper
-	1B2
-	%else
	1b2
-	%endif

	------------------------------
	Content-Disposition: form-data; name="filename"
@@ -149,11 +137,7 @@ Transfer-Encoding: chunked
	Content-Type: multipart/form-data; boundary=----------------------------
	Expect: 100-continue

-	%if hyper
-	8A
-	%else
	8a
-	%endif
	------------------------------
	Content-Disposition: form-data; name="sendfile alternative"; filename="file name 2"

@@ -169,11 +153,7 @@ y
	1


-	%if hyper
-	6B
-	%else
	6b
-	%endif

	------------------------------
	Content-Disposition: form-data; name="callbackdata"
@@ -192,11 +172,7 @@ y
	1


-	%if hyper
-	1B2
-	%else
	1b2
-	%endif

	------------------------------
	Content-Disposition: form-data; name="filename"

tests/data/test650+0 -24

@@ -104,11 +104,7 @@ Content-Disposition: attachment; filename="test%TESTNUMBER.filedata"
	Content-Type: text/whatever


-	%if hyper
-	AB
-	%else
	ab
-	%endif
	This is data from a file.

	------------------------------
@@ -116,11 +112,7 @@ Content-Disposition: attachment; filename="test%TESTNUMBER.filedata"
	Content-Type: text/whatever


-	%if hyper
-	BB
-	%else
	bb
-	%endif
	This is data from a file.

	--------------------------------
@@ -129,11 +121,7 @@ This is data from a file.
	Content-Disposition: form-data; name="filecontents"


-	%if hyper
-	11B
-	%else
	11b
-	%endif
	This is data from a file.

	------------------------------
@@ -188,11 +176,7 @@ Content-Disposition: attachment; filename="test%TESTNUMBER.filedata"
	Content-Type: text/whatever


-	%if hyper
-	AB
-	%else
	ab
-	%endif
	This is data from a file.

	------------------------------
@@ -200,11 +184,7 @@ Content-Disposition: attachment; filename="test%TESTNUMBER.filedata"
	Content-Type: text/whatever


-	%if hyper
-	BB
-	%else
	bb
-	%endif
	This is data from a file.

	--------------------------------
@@ -213,11 +193,7 @@ This is data from a file.
	Content-Disposition: form-data; name="filecontents"


-	%if hyper
-	11B
-	%else
	11b
-	%endif
	This is data from a file.

	------------------------------

tests/data/test654+0 -4

@@ -84,11 +84,7 @@ Transfer-Encoding: chunked
	Content-Type: multipart/form-data; boundary=----------------------------
	Expect: 100-continue

-	%if hyper
-	1C1
-	%else
	1c1
-	%endif
	------------------------------
	Content-Disposition: form-data; name="greeting"
	Content-Type: application/X-Greeting

tests/data/test66+0 -3

@@ -15,9 +15,6 @@ no headers swsclose

	# Client-side
	<client>
-	<features>
-	!hyper
-	</features>
	<server>
	http
	</server>

tests/data/test667+0 -4

@@ -77,11 +77,7 @@ Content-Transfer-Encoding: base64

	4
	ZHVt
-	%if hyper
-	3A
-	%else
	3a
-	%endif
	bXk=
	--------------------------------

tests/data/test668+0 -8

@@ -72,11 +72,7 @@ Transfer-Encoding: chunked
	Content-Type: multipart/form-data; boundary=----------------------------
	Expect: 100-continue

-	%if hyper
-	CD
-	%else
	cd
-	%endif
	------------------------------
	Content-Disposition: form-data; name="field1"

@@ -94,11 +90,7 @@ Content-Disposition: form-data; name="field3"; filename="file%TESTNUMBER.txt"
	Content-Type: text/plain


-	%if hyper
-	4F
-	%else
	4f
-	%endif
	This is data from a file

	--------------------------------

tests/http/scorecard.py+2 -3

@@ -450,15 +450,14 @@ class ScoreCard:
	p['name'] = 'h2'
	if not self.env.have_h2_curl():
	raise ScoreCardError('curl does not support HTTP/2')
-	for lib in ['nghttp2', 'hyper']:
+	for lib in ['nghttp2']:
	if self.env.curl_uses_lib(lib):
	p['implementation'] = lib
	break
	elif self.protocol == 'h1' or self.protocol == 'http/1.1':
	proto = 'http/1.1'
	p['name'] = proto
-	p['implementation'] = 'hyper' if self.env.curl_uses_lib('hyper')\
-	else 'native'
+	p['implementation'] = 'native'
	else:
	raise ScoreCardError(f"unknown protocol: {self.protocol}")

tests/runner.pm+1 -2

@@ -356,8 +356,7 @@ sub prepro {
	# The processor does CRLF replacements in the <data*> sections if
	# necessary since those parts might be read by separate servers.
	if($s =~ /^ <data(.)\>/) {
-	if($1 =~ /crlf="yes"/ \|\|
-	($feature{"hyper"} && ($keywords{"HTTP"} \|\| $keywords{"HTTPS"}))) {
+	if($1 =~ /crlf="yes"/) {
	$data_crlf = 1;
	}
	}

tests/runtests.pl+6 -24

@@ -591,11 +591,8 @@ sub checksystemfeatures {
	$feature{"c-ares"} = 1;
	$resolver="c-ares";
	}
-	if ($libcurl =~ /Hyper/i) {
-	$feature{"hyper"} = 1;
-	}
	if ($libcurl =~ /nghttp2/i) {
-	# nghttp2 supports h2c, hyper does not
+	# nghttp2 supports h2c
	$feature{"h2c"} = 1;
	}
	if ($libcurl =~ /AppleIDN/) {
@@ -1286,9 +1283,7 @@ sub singletest_check {
	chomp($validstdout[-1]);
	}

-	if($hash{'crlf'} \|\|
-	($feature{"hyper"} && ($keywords{"HTTP"}
-	\|\| $keywords{"HTTPS"}))) {
+	if($hash{'crlf'}) {
	subnewlines(0, \$_) for @validstdout;
	}

@@ -1326,12 +1321,6 @@ sub singletest_check {

	# get the mode attribute
	my $filemode=$hash{'mode'};
-	if($filemode && ($filemode eq "text") && $feature{"hyper"}) {
-	# text mode check in hyper-mode. Sometimes necessary if the stderr
-	# data looks like HTTP and thus has gotten CRLF newlines
-	# mistakenly
-	normalize_text(\@validstderr);
-	}
	if($filemode && ($filemode eq "text")) {
	normalize_text(\@validstderr);
	normalize_text(\@actual);
@@ -1434,9 +1423,7 @@ sub singletest_check {
	# of the datacheck
	chomp($replycheckpart[-1]);
	}
-	if($replycheckpartattr{'crlf'} \|\|
-	($feature{"hyper"} && ($keywords{"HTTP"}
-	\|\| $keywords{"HTTPS"}))) {
+	if($replycheckpartattr{'crlf'}) {
	subnewlines(0, \$_) for @replycheckpart;
	}
	push(@reply, @replycheckpart);
@@ -1457,9 +1444,7 @@ sub singletest_check {
	if($filemode && ($filemode eq "text")) {
	normalize_text(\@reply);
	}
-	if($replyattr{'crlf'} \|\|
-	($feature{"hyper"} && ($keywords{"HTTP"}
-	\|\| $keywords{"HTTPS"}))) {
+	if($replyattr{'crlf'}) {
	subnewlines(0, \$_) for @reply;
	}
	}
@@ -1552,8 +1537,7 @@ sub singletest_check {
	}
	}

-	if($hash{'crlf'} \|\|
-	($feature{"hyper"} && ($keywords{"HTTP"} \|\| $keywords{"HTTPS"}))) {
+	if($hash{'crlf'}) {
	subnewlines(0, \$_) for @proxyprot;
	}

@@ -1611,9 +1595,7 @@ sub singletest_check {
	normalize_text(\@outfile);
	normalize_text(\@generated);
	}
-	if($hash{'crlf'} \|\|
-	($feature{"hyper"} && ($keywords{"HTTP"}
-	\|\| $keywords{"HTTPS"}))) {
+	if($hash{'crlf'}) {
	subnewlines(0, \$_) for @outfile;
	}

tests/testutil.pm+0 -7

@@ -150,13 +150,6 @@ sub subnewlines {
	return;
	}

-	# When curl is built with Hyper, it gets all response headers delivered as
-	# name/value pairs and curl "invents" the newlines when it saves the
-	# headers. Therefore, curl will always save headers with CRLF newlines
-	# when built to use Hyper. By making sure we deliver all tests using CRLF
-	# as well, all test comparisons will survive without knowing about this
-	# little quirk.
-
	if(($$thing =~ /^HTTP\/(1.1\|1.0\|2\|3) [1-5][^\x0d]*\z/) \|\|
	($$thing =~ /^(GET\|POST\|PUT\|DELETE) \S+ HTTP\/\d+(\.\d+)?/) \|\|
	(($$thing =~ /^[a-z0-9_-]+: [^\x0d]*\z/i) &&

tests/valgrind.supp+0 -9

@@ -1,12 +1,3 @@
-	{
-	zstd_decompression-1.3.3-on-Ubuntu-18.04_with_hyper
-	Memcheck:Cond
-	fun:ZSTD_decompressStream
-	fun:zstd_unencode_write
-	fun:Curl_unencode_write
-	fun:hyper_body_chunk
-	}
-
	{
	zstd_decompression-1.3.3-on-Ubuntu-18.04
	Memcheck:Cond