From fd5764a7f4e7896204b214428d8680da044d284f Mon Sep 17 00:00:00 2001 From: ldm0 Date: Mon, 19 Oct 2026 18:56:08 +0800 Subject: [PATCH] fix(fetch): preserve browser transport semantics across main updates Adapt shared request bodies, redirect handling and per-transfer response progress to the updated fetch APIs. Keep decoding correct with the new curl build, including encoded-byte accounting, cache timing and dictionary readability. Vendor curl-sys at the existing curl-rust revision to retain tested browser TLS EOF handling without downgrading main. Keep native body teardown test consumers with the updated helper and isolate the full compressed timing matrix by scenario. --- Cargo.lock | 2 +- Cargo.toml | 3 + moli-fetch/src/blocking/mod.rs | 2 +- moli-fetch/src/cancellation.rs | 57 +- moli-fetch/src/compression_dictionary/mod.rs | 14 - moli-fetch/src/content_coding.rs | 14 +- .../decoding.rs => content_decoding.rs} | 79 +- moli-fetch/src/lib.rs | 8 +- moli-fetch/src/runtime.rs | 106 +- .../src/runtime/response_timing_tests.rs | 2 +- .../src/tests/cache_request_directives.rs | 16 +- moli-fetch/src/tests/upload.rs | 19 +- .../src/network/backend/memory_cache.rs | 4 +- .../src/network/request_client.rs | 10 +- .../raw_cache_revalidation/directives.rs | 2 +- moli-renderer-v8/src/network_host.rs | 21 +- .../src/network_host/async_fetch.rs | 6 +- .../src/network_host/body_source.rs | 12 +- .../src/network_host/fetch_surface.rs | 2 - .../src/network_host/request/init.rs | 7 +- .../src/network_host/request/input.rs | 6 +- .../tests/extracted/realms_and_teardown.rs | 10 +- .../script_vm/tests/fetch_resource_timing.rs | 66 +- .../service/fetch_settlement.rs | 2 +- .../src/worker/global_scope/fetch.rs | 4 +- .../compressed-request-resource-timing.js | 58 +- vendor/curl-sys-0.4.91/Cargo.toml | 68 + vendor/curl-sys-0.4.91/LICENSE | 19 + vendor/curl-sys-0.4.91/MOLI.md | 15 + vendor/curl-sys-0.4.91/build.rs | 760 +++ vendor/curl-sys-0.4.91/curl/COPYING | 22 + vendor/curl-sys-0.4.91/curl/README | 50 + vendor/curl-sys-0.4.91/curl/RELEASE-NOTES | 628 ++ .../curl-sys-0.4.91/curl/include/Makefile.am | 28 + vendor/curl-sys-0.4.91/curl/include/README.md | 20 + .../curl/include/curl/Makefile.am | 43 + .../curl-sys-0.4.91/curl/include/curl/curl.h | 3374 ++++++++++ .../curl/include/curl/curlver.h | 77 + .../curl-sys-0.4.91/curl/include/curl/easy.h | 123 + .../curl/include/curl/header.h | 74 + .../curl/include/curl/mprintf.h | 85 + .../curl-sys-0.4.91/curl/include/curl/multi.h | 561 ++ .../curl/include/curl/options.h | 70 + .../curl/include/curl/stdcheaders.h | 35 + .../curl/include/curl/system.h | 399 ++ .../curl/include/curl/typecheck-gcc.h | 964 +++ .../curl/include/curl/urlapi.h | 156 + .../curl/include/curl/websockets.h | 98 + vendor/curl-sys-0.4.91/curl/lib/.gitignore | 10 + .../curl-sys-0.4.91/curl/lib/CMakeLists.txt | 355 ++ vendor/curl-sys-0.4.91/curl/lib/Makefile.am | 193 + vendor/curl-sys-0.4.91/curl/lib/Makefile.inc | 442 ++ .../curl-sys-0.4.91/curl/lib/Makefile.soname | 43 + vendor/curl-sys-0.4.91/curl/lib/altsvc.c | 726 +++ vendor/curl-sys-0.4.91/curl/lib/altsvc.h | 78 + vendor/curl-sys-0.4.91/curl/lib/amigaos.c | 239 + vendor/curl-sys-0.4.91/curl/lib/amigaos.h | 41 + vendor/curl-sys-0.4.91/curl/lib/api.c | 449 ++ vendor/curl-sys-0.4.91/curl/lib/api.h | 212 + vendor/curl-sys-0.4.91/curl/lib/arpa_telnet.h | 116 + vendor/curl-sys-0.4.91/curl/lib/bufq.c | 619 ++ vendor/curl-sys-0.4.91/curl/lib/bufq.h | 257 + vendor/curl-sys-0.4.91/curl/lib/bufref.c | 138 + vendor/curl-sys-0.4.91/curl/lib/bufref.h | 51 + vendor/curl-sys-0.4.91/curl/lib/cf-h1-proxy.c | 965 +++ vendor/curl-sys-0.4.91/curl/lib/cf-h1-proxy.h | 43 + vendor/curl-sys-0.4.91/curl/lib/cf-h2-proxy.c | 1517 +++++ vendor/curl-sys-0.4.91/curl/lib/cf-h2-proxy.h | 40 + vendor/curl-sys-0.4.91/curl/lib/cf-haproxy.c | 241 + vendor/curl-sys-0.4.91/curl/lib/cf-haproxy.h | 39 + .../curl/lib/cf-https-connect.c | 825 +++ .../curl/lib/cf-https-connect.h | 44 + vendor/curl-sys-0.4.91/curl/lib/cf-ip-happy.c | 1039 +++ vendor/curl-sys-0.4.91/curl/lib/cf-ip-happy.h | 73 + vendor/curl-sys-0.4.91/curl/lib/cf-recvbuf.c | 157 + vendor/curl-sys-0.4.91/curl/lib/cf-recvbuf.h | 40 + vendor/curl-sys-0.4.91/curl/lib/cf-setup.c | 479 ++ vendor/curl-sys-0.4.91/curl/lib/cf-setup.h | 46 + vendor/curl-sys-0.4.91/curl/lib/cf-socket.c | 2513 ++++++++ vendor/curl-sys-0.4.91/curl/lib/cf-socket.h | 154 + vendor/curl-sys-0.4.91/curl/lib/cfilters.c | 1053 ++++ vendor/curl-sys-0.4.91/curl/lib/cfilters.h | 692 ++ vendor/curl-sys-0.4.91/curl/lib/config-mac.h | 83 + .../curl-sys-0.4.91/curl/lib/config-os400.h | 292 + .../curl-sys-0.4.91/curl/lib/config-win32.h | 123 + vendor/curl-sys-0.4.91/curl/lib/conncache.c | 1095 ++++ vendor/curl-sys-0.4.91/curl/lib/conncache.h | 174 + vendor/curl-sys-0.4.91/curl/lib/connect.c | 415 ++ vendor/curl-sys-0.4.91/curl/lib/connect.h | 117 + .../curl/lib/content_encoding.c | 877 +++ .../curl/lib/content_encoding.h | 35 + vendor/curl-sys-0.4.91/curl/lib/cookie.c | 1695 +++++ vendor/curl-sys-0.4.91/curl/lib/cookie.h | 149 + vendor/curl-sys-0.4.91/curl/lib/creds.c | 192 + vendor/curl-sys-0.4.91/curl/lib/creds.h | 92 + vendor/curl-sys-0.4.91/curl/lib/cshutdn.c | 620 ++ vendor/curl-sys-0.4.91/curl/lib/cshutdn.h | 130 + .../curl-sys-0.4.91/curl/lib/curl_addrinfo.c | 647 ++ .../curl-sys-0.4.91/curl/lib/curl_addrinfo.h | 115 + .../curl/lib/curl_config-cmake.h.in | 793 +++ vendor/curl-sys-0.4.91/curl/lib/curl_ctype.h | 50 + .../curl-sys-0.4.91/curl/lib/curl_ed25519.c | 175 + .../curl-sys-0.4.91/curl/lib/curl_ed25519.h | 44 + vendor/curl-sys-0.4.91/curl/lib/curl_endian.c | 83 + vendor/curl-sys-0.4.91/curl/lib/curl_endian.h | 36 + .../curl-sys-0.4.91/curl/lib/curl_fnmatch.c | 418 ++ .../curl-sys-0.4.91/curl/lib/curl_fnmatch.h | 45 + vendor/curl-sys-0.4.91/curl/lib/curl_fopen.c | 165 + vendor/curl-sys-0.4.91/curl/lib/curl_fopen.h | 31 + .../curl-sys-0.4.91/curl/lib/curl_get_line.c | 69 + .../curl-sys-0.4.91/curl/lib/curl_get_line.h | 31 + .../curl/lib/curl_gethostname.c | 96 + .../curl/lib/curl_gethostname.h | 33 + vendor/curl-sys-0.4.91/curl/lib/curl_gssapi.c | 705 +++ vendor/curl-sys-0.4.91/curl/lib/curl_gssapi.h | 96 + vendor/curl-sys-0.4.91/curl/lib/curl_hmac.h | 72 + vendor/curl-sys-0.4.91/curl/lib/curl_ldap.h | 30 + vendor/curl-sys-0.4.91/curl/lib/curl_md4.h | 37 + vendor/curl-sys-0.4.91/curl/lib/curl_md5.h | 67 + .../curl-sys-0.4.91/curl/lib/curl_memrchr.c | 53 + .../curl-sys-0.4.91/curl/lib/curl_memrchr.h | 40 + .../curl-sys-0.4.91/curl/lib/curl_ntlm_core.c | 667 ++ .../curl-sys-0.4.91/curl/lib/curl_ntlm_core.h | 73 + vendor/curl-sys-0.4.91/curl/lib/curl_printf.h | 37 + vendor/curl-sys-0.4.91/curl/lib/curl_range.c | 91 + vendor/curl-sys-0.4.91/curl/lib/curl_range.h | 31 + vendor/curl-sys-0.4.91/curl/lib/curl_sasl.c | 908 +++ vendor/curl-sys-0.4.91/curl/lib/curl_sasl.h | 160 + vendor/curl-sys-0.4.91/curl/lib/curl_setup.h | 1634 +++++ vendor/curl-sys-0.4.91/curl/lib/curl_sha256.h | 46 + .../curl/lib/curl_sha512_256.c | 847 +++ .../curl/lib/curl_sha512_256.h | 43 + vendor/curl-sys-0.4.91/curl/lib/curl_share.c | 495 ++ vendor/curl-sys-0.4.91/curl/lib/curl_share.h | 100 + vendor/curl-sys-0.4.91/curl/lib/curl_sspi.c | 209 + vendor/curl-sys-0.4.91/curl/lib/curl_sspi.h | 103 + .../curl-sys-0.4.91/curl/lib/curl_threads.c | 235 + .../curl-sys-0.4.91/curl/lib/curl_threads.h | 83 + vendor/curl-sys-0.4.91/curl/lib/curl_trc.c | 781 +++ vendor/curl-sys-0.4.91/curl/lib/curl_trc.h | 347 + .../curl-sys-0.4.91/curl/lib/curlx/base64.c | 292 + .../curl-sys-0.4.91/curl/lib/curlx/base64.h | 40 + .../curl-sys-0.4.91/curl/lib/curlx/basename.c | 72 + .../curl-sys-0.4.91/curl/lib/curlx/basename.h | 39 + .../curl-sys-0.4.91/curl/lib/curlx/dynbuf.c | 292 + .../curl-sys-0.4.91/curl/lib/curlx/dynbuf.h | 83 + .../curl/lib/curlx/inet_ntop.c | 199 + .../curl/lib/curlx/inet_ntop.h | 30 + .../curl/lib/curlx/inet_pton.c | 214 + .../curl/lib/curlx/inet_pton.h | 30 + .../curl/lib/curlx/multibyte.c | 78 + .../curl/lib/curlx/multibyte.h | 73 + .../curl-sys-0.4.91/curl/lib/curlx/nonblock.c | 92 + .../curl-sys-0.4.91/curl/lib/curlx/nonblock.h | 30 + .../curl-sys-0.4.91/curl/lib/curlx/snprintf.c | 49 + .../curl-sys-0.4.91/curl/lib/curlx/snprintf.h | 45 + .../curl-sys-0.4.91/curl/lib/curlx/strcopy.c | 50 + .../curl-sys-0.4.91/curl/lib/curlx/strcopy.h | 32 + .../curl-sys-0.4.91/curl/lib/curlx/strdup.c | 123 + .../curl-sys-0.4.91/curl/lib/curlx/strdup.h | 33 + .../curl-sys-0.4.91/curl/lib/curlx/strerr.c | 329 + .../curl-sys-0.4.91/curl/lib/curlx/strerr.h | 29 + .../curl-sys-0.4.91/curl/lib/curlx/strparse.c | 322 + .../curl-sys-0.4.91/curl/lib/curlx/strparse.h | 113 + .../curl-sys-0.4.91/curl/lib/curlx/timediff.c | 85 + .../curl-sys-0.4.91/curl/lib/curlx/timediff.h | 51 + .../curl-sys-0.4.91/curl/lib/curlx/timeval.c | 276 + .../curl-sys-0.4.91/curl/lib/curlx/timeval.h | 77 + .../curl/lib/curlx/version_win32.c | 238 + .../curl/lib/curlx/version_win32.h | 60 + vendor/curl-sys-0.4.91/curl/lib/curlx/wait.c | 90 + vendor/curl-sys-0.4.91/curl/lib/curlx/wait.h | 30 + .../curl-sys-0.4.91/curl/lib/curlx/warnless.c | 242 + .../curl-sys-0.4.91/curl/lib/curlx/warnless.h | 74 + .../curl/lib/curlx/win32-fopen.c | 571 ++ .../curl/lib/curlx/win32-fopen.h | 96 + .../curl-sys-0.4.91/curl/lib/curlx/winapi.c | 126 + .../curl-sys-0.4.91/curl/lib/curlx/winapi.h | 34 + vendor/curl-sys-0.4.91/curl/lib/cw-out.c | 514 ++ vendor/curl-sys-0.4.91/curl/lib/cw-out.h | 42 + vendor/curl-sys-0.4.91/curl/lib/cw-pause.c | 222 + vendor/curl-sys-0.4.91/curl/lib/cw-pause.h | 36 + vendor/curl-sys-0.4.91/curl/lib/dict.c | 325 + vendor/curl-sys-0.4.91/curl/lib/dict.h | 30 + vendor/curl-sys-0.4.91/curl/lib/dllmain.c | 64 + vendor/curl-sys-0.4.91/curl/lib/dynhds.c | 401 ++ vendor/curl-sys-0.4.91/curl/lib/dynhds.h | 141 + vendor/curl-sys-0.4.91/curl/lib/easy.c | 1487 +++++ vendor/curl-sys-0.4.91/curl/lib/easy_lock.h | 101 + vendor/curl-sys-0.4.91/curl/lib/easygetopt.c | 97 + vendor/curl-sys-0.4.91/curl/lib/easyif.h | 40 + vendor/curl-sys-0.4.91/curl/lib/easyoptions.c | 394 ++ vendor/curl-sys-0.4.91/curl/lib/easyoptions.h | 35 + vendor/curl-sys-0.4.91/curl/lib/escape.c | 377 ++ vendor/curl-sys-0.4.91/curl/lib/escape.h | 45 + .../curl-sys-0.4.91/curl/lib/fake_addrinfo.c | 202 + .../curl-sys-0.4.91/curl/lib/fake_addrinfo.h | 53 + vendor/curl-sys-0.4.91/curl/lib/file.c | 716 +++ vendor/curl-sys-0.4.91/curl/lib/file.h | 30 + vendor/curl-sys-0.4.91/curl/lib/fileinfo.c | 44 + vendor/curl-sys-0.4.91/curl/lib/fileinfo.h | 40 + vendor/curl-sys-0.4.91/curl/lib/formdata.c | 873 +++ vendor/curl-sys-0.4.91/curl/lib/formdata.h | 55 + vendor/curl-sys-0.4.91/curl/lib/ftp-int.h | 155 + vendor/curl-sys-0.4.91/curl/lib/ftp.c | 4518 +++++++++++++ vendor/curl-sys-0.4.91/curl/lib/ftp.h | 45 + .../curl-sys-0.4.91/curl/lib/ftplistparser.c | 1106 ++++ .../curl-sys-0.4.91/curl/lib/ftplistparser.h | 82 + vendor/curl-sys-0.4.91/curl/lib/functypes.h | 108 + vendor/curl-sys-0.4.91/curl/lib/getenv.c | 70 + vendor/curl-sys-0.4.91/curl/lib/getinfo.c | 709 +++ vendor/curl-sys-0.4.91/curl/lib/getinfo.h | 29 + vendor/curl-sys-0.4.91/curl/lib/gopher.c | 242 + vendor/curl-sys-0.4.91/curl/lib/gopher.h | 31 + vendor/curl-sys-0.4.91/curl/lib/hash.c | 510 ++ vendor/curl-sys-0.4.91/curl/lib/hash.h | 95 + vendor/curl-sys-0.4.91/curl/lib/headers.c | 512 ++ vendor/curl-sys-0.4.91/curl/lib/headers.h | 65 + vendor/curl-sys-0.4.91/curl/lib/hmac.c | 170 + vendor/curl-sys-0.4.91/curl/lib/hsts.c | 647 ++ vendor/curl-sys-0.4.91/curl/lib/hsts.h | 76 + vendor/curl-sys-0.4.91/curl/lib/http.c | 5142 +++++++++++++++ vendor/curl-sys-0.4.91/curl/lib/http.h | 273 + vendor/curl-sys-0.4.91/curl/lib/http1.c | 347 + vendor/curl-sys-0.4.91/curl/lib/http1.h | 63 + vendor/curl-sys-0.4.91/curl/lib/http2.c | 3016 +++++++++ vendor/curl-sys-0.4.91/curl/lib/http2.h | 76 + .../curl-sys-0.4.91/curl/lib/http_aws_sigv4.c | 1233 ++++ .../curl-sys-0.4.91/curl/lib/http_aws_sigv4.h | 34 + vendor/curl-sys-0.4.91/curl/lib/http_chunks.c | 693 ++ vendor/curl-sys-0.4.91/curl/lib/http_chunks.h | 149 + vendor/curl-sys-0.4.91/curl/lib/http_digest.c | 189 + vendor/curl-sys-0.4.91/curl/lib/http_digest.h | 44 + .../curl-sys-0.4.91/curl/lib/http_httpsig.c | 689 ++ .../curl-sys-0.4.91/curl/lib/http_httpsig.h | 35 + .../curl-sys-0.4.91/curl/lib/http_negotiate.c | 266 + .../curl-sys-0.4.91/curl/lib/http_negotiate.h | 40 + vendor/curl-sys-0.4.91/curl/lib/http_ntlm.c | 253 + vendor/curl-sys-0.4.91/curl/lib/http_ntlm.h | 39 + vendor/curl-sys-0.4.91/curl/lib/http_proxy.c | 769 +++ vendor/curl-sys-0.4.91/curl/lib/http_proxy.h | 82 + vendor/curl-sys-0.4.91/curl/lib/idn.c | 388 ++ vendor/curl-sys-0.4.91/curl/lib/idn.h | 45 + vendor/curl-sys-0.4.91/curl/lib/if2ip.c | 262 + vendor/curl-sys-0.4.91/curl/lib/if2ip.h | 91 + vendor/curl-sys-0.4.91/curl/lib/imap.c | 2327 +++++++ vendor/curl-sys-0.4.91/curl/lib/imap.h | 39 + vendor/curl-sys-0.4.91/curl/lib/ldap.c | 1010 +++ vendor/curl-sys-0.4.91/curl/lib/libcurl.def | 101 + vendor/curl-sys-0.4.91/curl/lib/libcurl.rc | 65 + .../curl-sys-0.4.91/curl/lib/libcurl.vers.in | 5 + vendor/curl-sys-0.4.91/curl/lib/llist.c | 273 + vendor/curl-sys-0.4.91/curl/lib/llist.h | 80 + vendor/curl-sys-0.4.91/curl/lib/macos.c | 50 + vendor/curl-sys-0.4.91/curl/lib/macos.h | 34 + vendor/curl-sys-0.4.91/curl/lib/md4.c | 485 ++ vendor/curl-sys-0.4.91/curl/lib/md5.c | 621 ++ vendor/curl-sys-0.4.91/curl/lib/memdebug.c | 579 ++ vendor/curl-sys-0.4.91/curl/lib/mime.c | 2332 +++++++ vendor/curl-sys-0.4.91/curl/lib/mime.h | 173 + vendor/curl-sys-0.4.91/curl/lib/mprintf.c | 1518 +++++ vendor/curl-sys-0.4.91/curl/lib/mqtt.c | 1073 ++++ vendor/curl-sys-0.4.91/curl/lib/mqtt.h | 33 + vendor/curl-sys-0.4.91/curl/lib/multi.c | 4272 +++++++++++++ vendor/curl-sys-0.4.91/curl/lib/multi_ev.c | 651 ++ vendor/curl-sys-0.4.91/curl/lib/multi_ev.h | 80 + vendor/curl-sys-0.4.91/curl/lib/multi_ntfy.c | 209 + vendor/curl-sys-0.4.91/curl/lib/multi_ntfy.h | 61 + vendor/curl-sys-0.4.91/curl/lib/multihandle.h | 201 + vendor/curl-sys-0.4.91/curl/lib/multiif.h | 179 + vendor/curl-sys-0.4.91/curl/lib/netrc.c | 698 ++ vendor/curl-sys-0.4.91/curl/lib/netrc.h | 68 + vendor/curl-sys-0.4.91/curl/lib/openldap.c | 1387 ++++ .../curl-sys-0.4.91/curl/lib/optiontable.pl | 162 + vendor/curl-sys-0.4.91/curl/lib/parsedate.c | 746 +++ vendor/curl-sys-0.4.91/curl/lib/parsedate.h | 35 + vendor/curl-sys-0.4.91/curl/lib/peer.c | 752 +++ vendor/curl-sys-0.4.91/curl/lib/peer.h | 108 + vendor/curl-sys-0.4.91/curl/lib/pingpong.c | 419 ++ vendor/curl-sys-0.4.91/curl/lib/pingpong.h | 162 + vendor/curl-sys-0.4.91/curl/lib/pop3.c | 1716 +++++ vendor/curl-sys-0.4.91/curl/lib/pop3.h | 30 + vendor/curl-sys-0.4.91/curl/lib/progress.c | 771 +++ vendor/curl-sys-0.4.91/curl/lib/progress.h | 93 + vendor/curl-sys-0.4.91/curl/lib/protocol.c | 629 ++ vendor/curl-sys-0.4.91/curl/lib/protocol.h | 290 + vendor/curl-sys-0.4.91/curl/lib/proxy.c | 679 ++ vendor/curl-sys-0.4.91/curl/lib/proxy.h | 59 + vendor/curl-sys-0.4.91/curl/lib/psl.c | 104 + vendor/curl-sys-0.4.91/curl/lib/psl.h | 51 + vendor/curl-sys-0.4.91/curl/lib/ptrarray.c | 98 + vendor/curl-sys-0.4.91/curl/lib/ptrarray.h | 50 + vendor/curl-sys-0.4.91/curl/lib/rand.c | 230 + vendor/curl-sys-0.4.91/curl/lib/rand.h | 54 + vendor/curl-sys-0.4.91/curl/lib/ratelimit.c | 306 + vendor/curl-sys-0.4.91/curl/lib/ratelimit.h | 109 + vendor/curl-sys-0.4.91/curl/lib/request.c | 502 ++ vendor/curl-sys-0.4.91/curl/lib/request.h | 256 + vendor/curl-sys-0.4.91/curl/lib/rtsp.c | 1059 ++++ vendor/curl-sys-0.4.91/curl/lib/rtsp.h | 47 + vendor/curl-sys-0.4.91/curl/lib/select.c | 737 +++ vendor/curl-sys-0.4.91/curl/lib/select.h | 232 + vendor/curl-sys-0.4.91/curl/lib/sendf.c | 1494 +++++ vendor/curl-sys-0.4.91/curl/lib/sendf.h | 417 ++ vendor/curl-sys-0.4.91/curl/lib/setopt.c | 2951 +++++++++ vendor/curl-sys-0.4.91/curl/lib/setopt.h | 41 + vendor/curl-sys-0.4.91/curl/lib/setup-os400.h | 147 + vendor/curl-sys-0.4.91/curl/lib/setup-vms.h | 396 ++ vendor/curl-sys-0.4.91/curl/lib/setup-win32.h | 110 + vendor/curl-sys-0.4.91/curl/lib/sha256.c | 512 ++ vendor/curl-sys-0.4.91/curl/lib/sigpipe.h | 102 + vendor/curl-sys-0.4.91/curl/lib/slist.c | 139 + vendor/curl-sys-0.4.91/curl/lib/slist.h | 41 + vendor/curl-sys-0.4.91/curl/lib/smtp.c | 2015 ++++++ vendor/curl-sys-0.4.91/curl/lib/smtp.h | 30 + vendor/curl-sys-0.4.91/curl/lib/sockaddr.h | 61 + vendor/curl-sys-0.4.91/curl/lib/socketpair.c | 379 ++ vendor/curl-sys-0.4.91/curl/lib/socketpair.h | 43 + vendor/curl-sys-0.4.91/curl/lib/socks.c | 1392 ++++ vendor/curl-sys-0.4.91/curl/lib/socks.h | 69 + .../curl-sys-0.4.91/curl/lib/socks_gssapi.c | 601 ++ vendor/curl-sys-0.4.91/curl/lib/socks_sspi.c | 536 ++ vendor/curl-sys-0.4.91/curl/lib/splay.c | 392 ++ vendor/curl-sys-0.4.91/curl/lib/splay.h | 76 + vendor/curl-sys-0.4.91/curl/lib/strcase.c | 132 + vendor/curl-sys-0.4.91/curl/lib/strcase.h | 57 + vendor/curl-sys-0.4.91/curl/lib/strequal.c | 95 + vendor/curl-sys-0.4.91/curl/lib/strerror.c | 680 ++ vendor/curl-sys-0.4.91/curl/lib/strerror.h | 32 + vendor/curl-sys-0.4.91/curl/lib/telnet.c | 1576 +++++ vendor/curl-sys-0.4.91/curl/lib/telnet.h | 30 + vendor/curl-sys-0.4.91/curl/lib/tftp.c | 1367 ++++ vendor/curl-sys-0.4.91/curl/lib/tftp.h | 33 + vendor/curl-sys-0.4.91/curl/lib/thrdpool.c | 502 ++ vendor/curl-sys-0.4.91/curl/lib/thrdpool.h | 106 + vendor/curl-sys-0.4.91/curl/lib/thrdqueue.c | 433 ++ vendor/curl-sys-0.4.91/curl/lib/thrdqueue.h | 134 + vendor/curl-sys-0.4.91/curl/lib/transfer.c | 908 +++ vendor/curl-sys-0.4.91/curl/lib/transfer.h | 154 + vendor/curl-sys-0.4.91/curl/lib/u32_ptrset.c | 279 + vendor/curl-sys-0.4.91/curl/lib/u32_ptrset.h | 70 + vendor/curl-sys-0.4.91/curl/lib/u8_strset.c | 311 + vendor/curl-sys-0.4.91/curl/lib/u8_strset.h | 84 + vendor/curl-sys-0.4.91/curl/lib/uint-bset.c | 233 + vendor/curl-sys-0.4.91/curl/lib/uint-bset.h | 109 + vendor/curl-sys-0.4.91/curl/lib/uint-spbset.c | 305 + vendor/curl-sys-0.4.91/curl/lib/uint-spbset.h | 91 + vendor/curl-sys-0.4.91/curl/lib/uint-table.c | 199 + vendor/curl-sys-0.4.91/curl/lib/uint-table.h | 89 + vendor/curl-sys-0.4.91/curl/lib/url.c | 2636 ++++++++ vendor/curl-sys-0.4.91/curl/lib/url.h | 98 + vendor/curl-sys-0.4.91/curl/lib/urlapi-int.h | 70 + vendor/curl-sys-0.4.91/curl/lib/urlapi.c | 2248 +++++++ vendor/curl-sys-0.4.91/curl/lib/urldata.h | 1245 ++++ .../curl/lib/vauth/cleartext.c | 112 + vendor/curl-sys-0.4.91/curl/lib/vauth/cram.c | 87 + .../curl-sys-0.4.91/curl/lib/vauth/digest.c | 1061 ++++ .../curl-sys-0.4.91/curl/lib/vauth/digest.h | 41 + .../curl/lib/vauth/digest_sspi.c | 635 ++ vendor/curl-sys-0.4.91/curl/lib/vauth/gsasl.c | 121 + .../curl/lib/vauth/krb5_gssapi.c | 326 + .../curl/lib/vauth/krb5_sspi.c | 456 ++ vendor/curl-sys-0.4.91/curl/lib/vauth/ntlm.c | 860 +++ .../curl/lib/vauth/ntlm_sspi.c | 353 ++ .../curl-sys-0.4.91/curl/lib/vauth/oauth2.c | 100 + .../curl/lib/vauth/spnego_gssapi.c | 376 ++ .../curl/lib/vauth/spnego_sspi.c | 368 ++ vendor/curl-sys-0.4.91/curl/lib/vauth/vauth.c | 252 + vendor/curl-sys-0.4.91/curl/lib/vauth/vauth.h | 338 + .../curl-sys-0.4.91/curl/lib/vdns/asyn-ares.c | 788 +++ .../curl-sys-0.4.91/curl/lib/vdns/asyn-base.c | 276 + .../curl/lib/vdns/asyn-thrdd.c | 945 +++ vendor/curl-sys-0.4.91/curl/lib/vdns/asyn.h | 271 + vendor/curl-sys-0.4.91/curl/lib/vdns/cf-dns.c | 691 ++ vendor/curl-sys-0.4.91/curl/lib/vdns/cf-dns.h | 71 + .../curl-sys-0.4.91/curl/lib/vdns/dnscache.c | 1040 +++ .../curl-sys-0.4.91/curl/lib/vdns/dnscache.h | 154 + vendor/curl-sys-0.4.91/curl/lib/vdns/doh.c | 1274 ++++ vendor/curl-sys-0.4.91/curl/lib/vdns/doh.h | 168 + vendor/curl-sys-0.4.91/curl/lib/vdns/hostip.c | 1183 ++++ vendor/curl-sys-0.4.91/curl/lib/vdns/hostip.h | 204 + .../curl-sys-0.4.91/curl/lib/vdns/hostip4.c | 283 + .../curl-sys-0.4.91/curl/lib/vdns/hostip6.c | 120 + .../curl-sys-0.4.91/curl/lib/vdns/httpsrr.c | 324 + .../curl-sys-0.4.91/curl/lib/vdns/httpsrr.h | 101 + vendor/curl-sys-0.4.91/curl/lib/version.c | 676 ++ .../curl-sys-0.4.91/curl/lib/vquic/capsule.c | 307 + .../curl-sys-0.4.91/curl/lib/vquic/capsule.h | 70 + .../curl/lib/vquic/cf-capsule.c | 306 + .../curl/lib/vquic/cf-capsule.h | 40 + .../curl/lib/vquic/cf-ngtcp2-cmn.c | 2128 +++++++ .../curl/lib/vquic/cf-ngtcp2-cmn.h | 258 + .../curl/lib/vquic/cf-ngtcp2-proxy.c | 1317 ++++ .../curl/lib/vquic/cf-ngtcp2-proxy.h | 52 + .../curl/lib/vquic/cf-ngtcp2.c | 1147 ++++ .../curl/lib/vquic/cf-ngtcp2.h | 64 + .../curl/lib/vquic/cf-quiche.c | 1714 +++++ .../curl/lib/vquic/cf-quiche.h | 51 + .../curl/lib/vquic/vquic-tls.c | 239 + .../curl/lib/vquic/vquic-tls.h | 125 + vendor/curl-sys-0.4.91/curl/lib/vquic/vquic.c | 1345 ++++ vendor/curl-sys-0.4.91/curl/lib/vquic/vquic.h | 91 + .../curl/lib/vquic/vquic_int.h | 130 + vendor/curl-sys-0.4.91/curl/lib/vssh/libssh.c | 3181 ++++++++++ .../curl-sys-0.4.91/curl/lib/vssh/libssh2.c | 3969 ++++++++++++ vendor/curl-sys-0.4.91/curl/lib/vssh/ssh.h | 262 + vendor/curl-sys-0.4.91/curl/lib/vssh/vssh.c | 455 ++ vendor/curl-sys-0.4.91/curl/lib/vssh/vssh.h | 48 + vendor/curl-sys-0.4.91/curl/lib/vtls/apple.c | 316 + vendor/curl-sys-0.4.91/curl/lib/vtls/apple.h | 54 + .../curl/lib/vtls/cipher_suite.c | 702 +++ .../curl/lib/vtls/cipher_suite.h | 44 + vendor/curl-sys-0.4.91/curl/lib/vtls/gtls.c | 2253 +++++++ vendor/curl-sys-0.4.91/curl/lib/vtls/gtls.h | 115 + .../curl-sys-0.4.91/curl/lib/vtls/hostcheck.c | 130 + .../curl-sys-0.4.91/curl/lib/vtls/hostcheck.h | 36 + vendor/curl-sys-0.4.91/curl/lib/vtls/keylog.c | 162 + vendor/curl-sys-0.4.91/curl/lib/vtls/keylog.h | 75 + .../curl-sys-0.4.91/curl/lib/vtls/mbedtls.c | 1723 +++++ .../curl-sys-0.4.91/curl/lib/vtls/mbedtls.h | 34 + .../curl-sys-0.4.91/curl/lib/vtls/openssl.c | 5597 +++++++++++++++++ .../curl-sys-0.4.91/curl/lib/vtls/openssl.h | 208 + vendor/curl-sys-0.4.91/curl/lib/vtls/rustls.c | 1490 +++++ vendor/curl-sys-0.4.91/curl/lib/vtls/rustls.h | 33 + .../curl-sys-0.4.91/curl/lib/vtls/schannel.c | 2928 +++++++++ .../curl-sys-0.4.91/curl/lib/vtls/schannel.h | 45 + .../curl/lib/vtls/schannel_int.h | 172 + .../curl/lib/vtls/schannel_verify.c | 834 +++ vendor/curl-sys-0.4.91/curl/lib/vtls/vtls.c | 1834 ++++++ vendor/curl-sys-0.4.91/curl/lib/vtls/vtls.h | 244 + .../curl/lib/vtls/vtls_config.c | 474 ++ .../curl/lib/vtls/vtls_config.h | 131 + .../curl-sys-0.4.91/curl/lib/vtls/vtls_int.h | 223 + .../curl/lib/vtls/vtls_scache.c | 1362 ++++ .../curl/lib/vtls/vtls_scache.h | 221 + .../curl/lib/vtls/vtls_spack.c | 336 + .../curl/lib/vtls/vtls_spack.h | 43 + .../curl-sys-0.4.91/curl/lib/vtls/wolfssl.c | 2324 +++++++ .../curl-sys-0.4.91/curl/lib/vtls/wolfssl.h | 99 + .../curl-sys-0.4.91/curl/lib/vtls/x509asn1.c | 1279 ++++ .../curl-sys-0.4.91/curl/lib/vtls/x509asn1.h | 119 + vendor/curl-sys-0.4.91/curl/lib/ws.c | 2076 ++++++ vendor/curl-sys-0.4.91/curl/lib/ws.h | 44 + vendor/curl-sys-0.4.91/curl/libcurl.pc.in | 46 + vendor/curl-sys-0.4.91/lib.rs | 1247 ++++ 445 files changed, 189095 insertions(+), 183 deletions(-) rename moli-fetch/src/{compression_dictionary/decoding.rs => content_decoding.rs} (84%) create mode 100644 vendor/curl-sys-0.4.91/Cargo.toml create mode 100644 vendor/curl-sys-0.4.91/LICENSE create mode 100644 vendor/curl-sys-0.4.91/MOLI.md create mode 100644 vendor/curl-sys-0.4.91/build.rs create mode 100644 vendor/curl-sys-0.4.91/curl/COPYING create mode 100644 vendor/curl-sys-0.4.91/curl/README create mode 100644 vendor/curl-sys-0.4.91/curl/RELEASE-NOTES create mode 100644 vendor/curl-sys-0.4.91/curl/include/Makefile.am create mode 100644 vendor/curl-sys-0.4.91/curl/include/README.md create mode 100644 vendor/curl-sys-0.4.91/curl/include/curl/Makefile.am create mode 100644 vendor/curl-sys-0.4.91/curl/include/curl/curl.h create mode 100644 vendor/curl-sys-0.4.91/curl/include/curl/curlver.h create mode 100644 vendor/curl-sys-0.4.91/curl/include/curl/easy.h create mode 100644 vendor/curl-sys-0.4.91/curl/include/curl/header.h create mode 100644 vendor/curl-sys-0.4.91/curl/include/curl/mprintf.h create mode 100644 vendor/curl-sys-0.4.91/curl/include/curl/multi.h create mode 100644 vendor/curl-sys-0.4.91/curl/include/curl/options.h create mode 100644 vendor/curl-sys-0.4.91/curl/include/curl/stdcheaders.h create mode 100644 vendor/curl-sys-0.4.91/curl/include/curl/system.h create mode 100644 vendor/curl-sys-0.4.91/curl/include/curl/typecheck-gcc.h create mode 100644 vendor/curl-sys-0.4.91/curl/include/curl/urlapi.h create mode 100644 vendor/curl-sys-0.4.91/curl/include/curl/websockets.h create mode 100644 vendor/curl-sys-0.4.91/curl/lib/.gitignore create mode 100644 vendor/curl-sys-0.4.91/curl/lib/CMakeLists.txt create mode 100644 vendor/curl-sys-0.4.91/curl/lib/Makefile.am create mode 100644 vendor/curl-sys-0.4.91/curl/lib/Makefile.inc create mode 100644 vendor/curl-sys-0.4.91/curl/lib/Makefile.soname create mode 100644 vendor/curl-sys-0.4.91/curl/lib/altsvc.c create mode 100644 vendor/curl-sys-0.4.91/curl/lib/altsvc.h create mode 100644 vendor/curl-sys-0.4.91/curl/lib/amigaos.c create mode 100644 vendor/curl-sys-0.4.91/curl/lib/amigaos.h create mode 100644 vendor/curl-sys-0.4.91/curl/lib/api.c create mode 100644 vendor/curl-sys-0.4.91/curl/lib/api.h create mode 100644 vendor/curl-sys-0.4.91/curl/lib/arpa_telnet.h create mode 100644 vendor/curl-sys-0.4.91/curl/lib/bufq.c create mode 100644 vendor/curl-sys-0.4.91/curl/lib/bufq.h create mode 100644 vendor/curl-sys-0.4.91/curl/lib/bufref.c create mode 100644 vendor/curl-sys-0.4.91/curl/lib/bufref.h create mode 100644 vendor/curl-sys-0.4.91/curl/lib/cf-h1-proxy.c create mode 100644 vendor/curl-sys-0.4.91/curl/lib/cf-h1-proxy.h create mode 100644 vendor/curl-sys-0.4.91/curl/lib/cf-h2-proxy.c create mode 100644 vendor/curl-sys-0.4.91/curl/lib/cf-h2-proxy.h create mode 100644 vendor/curl-sys-0.4.91/curl/lib/cf-haproxy.c create mode 100644 vendor/curl-sys-0.4.91/curl/lib/cf-haproxy.h create mode 100644 vendor/curl-sys-0.4.91/curl/lib/cf-https-connect.c create mode 100644 vendor/curl-sys-0.4.91/curl/lib/cf-https-connect.h create mode 100644 vendor/curl-sys-0.4.91/curl/lib/cf-ip-happy.c create mode 100644 vendor/curl-sys-0.4.91/curl/lib/cf-ip-happy.h create mode 100644 vendor/curl-sys-0.4.91/curl/lib/cf-recvbuf.c create mode 100644 vendor/curl-sys-0.4.91/curl/lib/cf-recvbuf.h create mode 100644 vendor/curl-sys-0.4.91/curl/lib/cf-setup.c create mode 100644 vendor/curl-sys-0.4.91/curl/lib/cf-setup.h create mode 100644 vendor/curl-sys-0.4.91/curl/lib/cf-socket.c create mode 100644 vendor/curl-sys-0.4.91/curl/lib/cf-socket.h create mode 100644 vendor/curl-sys-0.4.91/curl/lib/cfilters.c create mode 100644 vendor/curl-sys-0.4.91/curl/lib/cfilters.h create mode 100644 vendor/curl-sys-0.4.91/curl/lib/config-mac.h create mode 100644 vendor/curl-sys-0.4.91/curl/lib/config-os400.h create mode 100644 vendor/curl-sys-0.4.91/curl/lib/config-win32.h create mode 100644 vendor/curl-sys-0.4.91/curl/lib/conncache.c create mode 100644 vendor/curl-sys-0.4.91/curl/lib/conncache.h create mode 100644 vendor/curl-sys-0.4.91/curl/lib/connect.c create mode 100644 vendor/curl-sys-0.4.91/curl/lib/connect.h create mode 100644 vendor/curl-sys-0.4.91/curl/lib/content_encoding.c create mode 100644 vendor/curl-sys-0.4.91/curl/lib/content_encoding.h create mode 100644 vendor/curl-sys-0.4.91/curl/lib/cookie.c create mode 100644 vendor/curl-sys-0.4.91/curl/lib/cookie.h create mode 100644 vendor/curl-sys-0.4.91/curl/lib/creds.c create mode 100644 vendor/curl-sys-0.4.91/curl/lib/creds.h create mode 100644 vendor/curl-sys-0.4.91/curl/lib/cshutdn.c create mode 100644 vendor/curl-sys-0.4.91/curl/lib/cshutdn.h create mode 100644 vendor/curl-sys-0.4.91/curl/lib/curl_addrinfo.c create mode 100644 vendor/curl-sys-0.4.91/curl/lib/curl_addrinfo.h create mode 100644 vendor/curl-sys-0.4.91/curl/lib/curl_config-cmake.h.in create mode 100644 vendor/curl-sys-0.4.91/curl/lib/curl_ctype.h create mode 100644 vendor/curl-sys-0.4.91/curl/lib/curl_ed25519.c create mode 100644 vendor/curl-sys-0.4.91/curl/lib/curl_ed25519.h create mode 100644 vendor/curl-sys-0.4.91/curl/lib/curl_endian.c create mode 100644 vendor/curl-sys-0.4.91/curl/lib/curl_endian.h create mode 100644 vendor/curl-sys-0.4.91/curl/lib/curl_fnmatch.c create mode 100644 vendor/curl-sys-0.4.91/curl/lib/curl_fnmatch.h create mode 100644 vendor/curl-sys-0.4.91/curl/lib/curl_fopen.c create mode 100644 vendor/curl-sys-0.4.91/curl/lib/curl_fopen.h create mode 100644 vendor/curl-sys-0.4.91/curl/lib/curl_get_line.c create mode 100644 vendor/curl-sys-0.4.91/curl/lib/curl_get_line.h create mode 100644 vendor/curl-sys-0.4.91/curl/lib/curl_gethostname.c create mode 100644 vendor/curl-sys-0.4.91/curl/lib/curl_gethostname.h create mode 100644 vendor/curl-sys-0.4.91/curl/lib/curl_gssapi.c create mode 100644 vendor/curl-sys-0.4.91/curl/lib/curl_gssapi.h create mode 100644 vendor/curl-sys-0.4.91/curl/lib/curl_hmac.h create mode 100644 vendor/curl-sys-0.4.91/curl/lib/curl_ldap.h create mode 100644 vendor/curl-sys-0.4.91/curl/lib/curl_md4.h create mode 100644 vendor/curl-sys-0.4.91/curl/lib/curl_md5.h create mode 100644 vendor/curl-sys-0.4.91/curl/lib/curl_memrchr.c create mode 100644 vendor/curl-sys-0.4.91/curl/lib/curl_memrchr.h create mode 100644 vendor/curl-sys-0.4.91/curl/lib/curl_ntlm_core.c create mode 100644 vendor/curl-sys-0.4.91/curl/lib/curl_ntlm_core.h create mode 100644 vendor/curl-sys-0.4.91/curl/lib/curl_printf.h create mode 100644 vendor/curl-sys-0.4.91/curl/lib/curl_range.c create mode 100644 vendor/curl-sys-0.4.91/curl/lib/curl_range.h create mode 100644 vendor/curl-sys-0.4.91/curl/lib/curl_sasl.c create mode 100644 vendor/curl-sys-0.4.91/curl/lib/curl_sasl.h create mode 100644 vendor/curl-sys-0.4.91/curl/lib/curl_setup.h create mode 100644 vendor/curl-sys-0.4.91/curl/lib/curl_sha256.h create mode 100644 vendor/curl-sys-0.4.91/curl/lib/curl_sha512_256.c create mode 100644 vendor/curl-sys-0.4.91/curl/lib/curl_sha512_256.h create mode 100644 vendor/curl-sys-0.4.91/curl/lib/curl_share.c create mode 100644 vendor/curl-sys-0.4.91/curl/lib/curl_share.h create mode 100644 vendor/curl-sys-0.4.91/curl/lib/curl_sspi.c create mode 100644 vendor/curl-sys-0.4.91/curl/lib/curl_sspi.h create mode 100644 vendor/curl-sys-0.4.91/curl/lib/curl_threads.c create mode 100644 vendor/curl-sys-0.4.91/curl/lib/curl_threads.h create mode 100644 vendor/curl-sys-0.4.91/curl/lib/curl_trc.c create mode 100644 vendor/curl-sys-0.4.91/curl/lib/curl_trc.h create mode 100644 vendor/curl-sys-0.4.91/curl/lib/curlx/base64.c create mode 100644 vendor/curl-sys-0.4.91/curl/lib/curlx/base64.h create mode 100644 vendor/curl-sys-0.4.91/curl/lib/curlx/basename.c create mode 100644 vendor/curl-sys-0.4.91/curl/lib/curlx/basename.h create mode 100644 vendor/curl-sys-0.4.91/curl/lib/curlx/dynbuf.c create mode 100644 vendor/curl-sys-0.4.91/curl/lib/curlx/dynbuf.h create mode 100644 vendor/curl-sys-0.4.91/curl/lib/curlx/inet_ntop.c create mode 100644 vendor/curl-sys-0.4.91/curl/lib/curlx/inet_ntop.h create mode 100644 vendor/curl-sys-0.4.91/curl/lib/curlx/inet_pton.c create mode 100644 vendor/curl-sys-0.4.91/curl/lib/curlx/inet_pton.h create mode 100644 vendor/curl-sys-0.4.91/curl/lib/curlx/multibyte.c create mode 100644 vendor/curl-sys-0.4.91/curl/lib/curlx/multibyte.h create mode 100644 vendor/curl-sys-0.4.91/curl/lib/curlx/nonblock.c create mode 100644 vendor/curl-sys-0.4.91/curl/lib/curlx/nonblock.h create mode 100644 vendor/curl-sys-0.4.91/curl/lib/curlx/snprintf.c create mode 100644 vendor/curl-sys-0.4.91/curl/lib/curlx/snprintf.h create mode 100644 vendor/curl-sys-0.4.91/curl/lib/curlx/strcopy.c create mode 100644 vendor/curl-sys-0.4.91/curl/lib/curlx/strcopy.h create mode 100644 vendor/curl-sys-0.4.91/curl/lib/curlx/strdup.c create mode 100644 vendor/curl-sys-0.4.91/curl/lib/curlx/strdup.h create mode 100644 vendor/curl-sys-0.4.91/curl/lib/curlx/strerr.c create mode 100644 vendor/curl-sys-0.4.91/curl/lib/curlx/strerr.h create mode 100644 vendor/curl-sys-0.4.91/curl/lib/curlx/strparse.c create mode 100644 vendor/curl-sys-0.4.91/curl/lib/curlx/strparse.h create mode 100644 vendor/curl-sys-0.4.91/curl/lib/curlx/timediff.c create mode 100644 vendor/curl-sys-0.4.91/curl/lib/curlx/timediff.h create mode 100644 vendor/curl-sys-0.4.91/curl/lib/curlx/timeval.c create mode 100644 vendor/curl-sys-0.4.91/curl/lib/curlx/timeval.h create mode 100644 vendor/curl-sys-0.4.91/curl/lib/curlx/version_win32.c create mode 100644 vendor/curl-sys-0.4.91/curl/lib/curlx/version_win32.h create mode 100644 vendor/curl-sys-0.4.91/curl/lib/curlx/wait.c create mode 100644 vendor/curl-sys-0.4.91/curl/lib/curlx/wait.h create mode 100644 vendor/curl-sys-0.4.91/curl/lib/curlx/warnless.c create mode 100644 vendor/curl-sys-0.4.91/curl/lib/curlx/warnless.h create mode 100644 vendor/curl-sys-0.4.91/curl/lib/curlx/win32-fopen.c create mode 100644 vendor/curl-sys-0.4.91/curl/lib/curlx/win32-fopen.h create mode 100644 vendor/curl-sys-0.4.91/curl/lib/curlx/winapi.c create mode 100644 vendor/curl-sys-0.4.91/curl/lib/curlx/winapi.h create mode 100644 vendor/curl-sys-0.4.91/curl/lib/cw-out.c create mode 100644 vendor/curl-sys-0.4.91/curl/lib/cw-out.h create mode 100644 vendor/curl-sys-0.4.91/curl/lib/cw-pause.c create mode 100644 vendor/curl-sys-0.4.91/curl/lib/cw-pause.h create mode 100644 vendor/curl-sys-0.4.91/curl/lib/dict.c create mode 100644 vendor/curl-sys-0.4.91/curl/lib/dict.h create mode 100644 vendor/curl-sys-0.4.91/curl/lib/dllmain.c create mode 100644 vendor/curl-sys-0.4.91/curl/lib/dynhds.c create mode 100644 vendor/curl-sys-0.4.91/curl/lib/dynhds.h create mode 100644 vendor/curl-sys-0.4.91/curl/lib/easy.c create mode 100644 vendor/curl-sys-0.4.91/curl/lib/easy_lock.h create mode 100644 vendor/curl-sys-0.4.91/curl/lib/easygetopt.c create mode 100644 vendor/curl-sys-0.4.91/curl/lib/easyif.h create mode 100644 vendor/curl-sys-0.4.91/curl/lib/easyoptions.c create mode 100644 vendor/curl-sys-0.4.91/curl/lib/easyoptions.h create mode 100644 vendor/curl-sys-0.4.91/curl/lib/escape.c create mode 100644 vendor/curl-sys-0.4.91/curl/lib/escape.h create mode 100644 vendor/curl-sys-0.4.91/curl/lib/fake_addrinfo.c create mode 100644 vendor/curl-sys-0.4.91/curl/lib/fake_addrinfo.h create mode 100644 vendor/curl-sys-0.4.91/curl/lib/file.c create mode 100644 vendor/curl-sys-0.4.91/curl/lib/file.h create mode 100644 vendor/curl-sys-0.4.91/curl/lib/fileinfo.c create mode 100644 vendor/curl-sys-0.4.91/curl/lib/fileinfo.h create mode 100644 vendor/curl-sys-0.4.91/curl/lib/formdata.c create mode 100644 vendor/curl-sys-0.4.91/curl/lib/formdata.h create mode 100644 vendor/curl-sys-0.4.91/curl/lib/ftp-int.h create mode 100644 vendor/curl-sys-0.4.91/curl/lib/ftp.c create mode 100644 vendor/curl-sys-0.4.91/curl/lib/ftp.h create mode 100644 vendor/curl-sys-0.4.91/curl/lib/ftplistparser.c create mode 100644 vendor/curl-sys-0.4.91/curl/lib/ftplistparser.h create mode 100644 vendor/curl-sys-0.4.91/curl/lib/functypes.h create mode 100644 vendor/curl-sys-0.4.91/curl/lib/getenv.c create mode 100644 vendor/curl-sys-0.4.91/curl/lib/getinfo.c create mode 100644 vendor/curl-sys-0.4.91/curl/lib/getinfo.h create mode 100644 vendor/curl-sys-0.4.91/curl/lib/gopher.c create mode 100644 vendor/curl-sys-0.4.91/curl/lib/gopher.h create mode 100644 vendor/curl-sys-0.4.91/curl/lib/hash.c create mode 100644 vendor/curl-sys-0.4.91/curl/lib/hash.h create mode 100644 vendor/curl-sys-0.4.91/curl/lib/headers.c create mode 100644 vendor/curl-sys-0.4.91/curl/lib/headers.h create mode 100644 vendor/curl-sys-0.4.91/curl/lib/hmac.c create mode 100644 vendor/curl-sys-0.4.91/curl/lib/hsts.c create mode 100644 vendor/curl-sys-0.4.91/curl/lib/hsts.h create mode 100644 vendor/curl-sys-0.4.91/curl/lib/http.c create mode 100644 vendor/curl-sys-0.4.91/curl/lib/http.h create mode 100644 vendor/curl-sys-0.4.91/curl/lib/http1.c create mode 100644 vendor/curl-sys-0.4.91/curl/lib/http1.h create mode 100644 vendor/curl-sys-0.4.91/curl/lib/http2.c create mode 100644 vendor/curl-sys-0.4.91/curl/lib/http2.h create mode 100644 vendor/curl-sys-0.4.91/curl/lib/http_aws_sigv4.c create mode 100644 vendor/curl-sys-0.4.91/curl/lib/http_aws_sigv4.h create mode 100644 vendor/curl-sys-0.4.91/curl/lib/http_chunks.c create mode 100644 vendor/curl-sys-0.4.91/curl/lib/http_chunks.h create mode 100644 vendor/curl-sys-0.4.91/curl/lib/http_digest.c create mode 100644 vendor/curl-sys-0.4.91/curl/lib/http_digest.h create mode 100644 vendor/curl-sys-0.4.91/curl/lib/http_httpsig.c create mode 100644 vendor/curl-sys-0.4.91/curl/lib/http_httpsig.h create mode 100644 vendor/curl-sys-0.4.91/curl/lib/http_negotiate.c create mode 100644 vendor/curl-sys-0.4.91/curl/lib/http_negotiate.h create mode 100644 vendor/curl-sys-0.4.91/curl/lib/http_ntlm.c create mode 100644 vendor/curl-sys-0.4.91/curl/lib/http_ntlm.h create mode 100644 vendor/curl-sys-0.4.91/curl/lib/http_proxy.c create mode 100644 vendor/curl-sys-0.4.91/curl/lib/http_proxy.h create mode 100644 vendor/curl-sys-0.4.91/curl/lib/idn.c create mode 100644 vendor/curl-sys-0.4.91/curl/lib/idn.h create mode 100644 vendor/curl-sys-0.4.91/curl/lib/if2ip.c create mode 100644 vendor/curl-sys-0.4.91/curl/lib/if2ip.h create mode 100644 vendor/curl-sys-0.4.91/curl/lib/imap.c create mode 100644 vendor/curl-sys-0.4.91/curl/lib/imap.h create mode 100644 vendor/curl-sys-0.4.91/curl/lib/ldap.c create mode 100644 vendor/curl-sys-0.4.91/curl/lib/libcurl.def create mode 100644 vendor/curl-sys-0.4.91/curl/lib/libcurl.rc create mode 100644 vendor/curl-sys-0.4.91/curl/lib/libcurl.vers.in create mode 100644 vendor/curl-sys-0.4.91/curl/lib/llist.c create mode 100644 vendor/curl-sys-0.4.91/curl/lib/llist.h create mode 100644 vendor/curl-sys-0.4.91/curl/lib/macos.c create mode 100644 vendor/curl-sys-0.4.91/curl/lib/macos.h create mode 100644 vendor/curl-sys-0.4.91/curl/lib/md4.c create mode 100644 vendor/curl-sys-0.4.91/curl/lib/md5.c create mode 100644 vendor/curl-sys-0.4.91/curl/lib/memdebug.c create mode 100644 vendor/curl-sys-0.4.91/curl/lib/mime.c create mode 100644 vendor/curl-sys-0.4.91/curl/lib/mime.h create mode 100644 vendor/curl-sys-0.4.91/curl/lib/mprintf.c create mode 100644 vendor/curl-sys-0.4.91/curl/lib/mqtt.c create mode 100644 vendor/curl-sys-0.4.91/curl/lib/mqtt.h create mode 100644 vendor/curl-sys-0.4.91/curl/lib/multi.c create mode 100644 vendor/curl-sys-0.4.91/curl/lib/multi_ev.c create mode 100644 vendor/curl-sys-0.4.91/curl/lib/multi_ev.h create mode 100644 vendor/curl-sys-0.4.91/curl/lib/multi_ntfy.c create mode 100644 vendor/curl-sys-0.4.91/curl/lib/multi_ntfy.h create mode 100644 vendor/curl-sys-0.4.91/curl/lib/multihandle.h create mode 100644 vendor/curl-sys-0.4.91/curl/lib/multiif.h create mode 100644 vendor/curl-sys-0.4.91/curl/lib/netrc.c create mode 100644 vendor/curl-sys-0.4.91/curl/lib/netrc.h create mode 100644 vendor/curl-sys-0.4.91/curl/lib/openldap.c create mode 100755 vendor/curl-sys-0.4.91/curl/lib/optiontable.pl create mode 100644 vendor/curl-sys-0.4.91/curl/lib/parsedate.c create mode 100644 vendor/curl-sys-0.4.91/curl/lib/parsedate.h create mode 100644 vendor/curl-sys-0.4.91/curl/lib/peer.c create mode 100644 vendor/curl-sys-0.4.91/curl/lib/peer.h create mode 100644 vendor/curl-sys-0.4.91/curl/lib/pingpong.c create mode 100644 vendor/curl-sys-0.4.91/curl/lib/pingpong.h create mode 100644 vendor/curl-sys-0.4.91/curl/lib/pop3.c create mode 100644 vendor/curl-sys-0.4.91/curl/lib/pop3.h create mode 100644 vendor/curl-sys-0.4.91/curl/lib/progress.c create mode 100644 vendor/curl-sys-0.4.91/curl/lib/progress.h create mode 100644 vendor/curl-sys-0.4.91/curl/lib/protocol.c create mode 100644 vendor/curl-sys-0.4.91/curl/lib/protocol.h create mode 100644 vendor/curl-sys-0.4.91/curl/lib/proxy.c create mode 100644 vendor/curl-sys-0.4.91/curl/lib/proxy.h create mode 100644 vendor/curl-sys-0.4.91/curl/lib/psl.c create mode 100644 vendor/curl-sys-0.4.91/curl/lib/psl.h create mode 100644 vendor/curl-sys-0.4.91/curl/lib/ptrarray.c create mode 100644 vendor/curl-sys-0.4.91/curl/lib/ptrarray.h create mode 100644 vendor/curl-sys-0.4.91/curl/lib/rand.c create mode 100644 vendor/curl-sys-0.4.91/curl/lib/rand.h create mode 100644 vendor/curl-sys-0.4.91/curl/lib/ratelimit.c create mode 100644 vendor/curl-sys-0.4.91/curl/lib/ratelimit.h create mode 100644 vendor/curl-sys-0.4.91/curl/lib/request.c create mode 100644 vendor/curl-sys-0.4.91/curl/lib/request.h create mode 100644 vendor/curl-sys-0.4.91/curl/lib/rtsp.c create mode 100644 vendor/curl-sys-0.4.91/curl/lib/rtsp.h create mode 100644 vendor/curl-sys-0.4.91/curl/lib/select.c create mode 100644 vendor/curl-sys-0.4.91/curl/lib/select.h create mode 100644 vendor/curl-sys-0.4.91/curl/lib/sendf.c create mode 100644 vendor/curl-sys-0.4.91/curl/lib/sendf.h create mode 100644 vendor/curl-sys-0.4.91/curl/lib/setopt.c create mode 100644 vendor/curl-sys-0.4.91/curl/lib/setopt.h create mode 100644 vendor/curl-sys-0.4.91/curl/lib/setup-os400.h create mode 100644 vendor/curl-sys-0.4.91/curl/lib/setup-vms.h create mode 100644 vendor/curl-sys-0.4.91/curl/lib/setup-win32.h create mode 100644 vendor/curl-sys-0.4.91/curl/lib/sha256.c create mode 100644 vendor/curl-sys-0.4.91/curl/lib/sigpipe.h create mode 100644 vendor/curl-sys-0.4.91/curl/lib/slist.c create mode 100644 vendor/curl-sys-0.4.91/curl/lib/slist.h create mode 100644 vendor/curl-sys-0.4.91/curl/lib/smtp.c create mode 100644 vendor/curl-sys-0.4.91/curl/lib/smtp.h create mode 100644 vendor/curl-sys-0.4.91/curl/lib/sockaddr.h create mode 100644 vendor/curl-sys-0.4.91/curl/lib/socketpair.c create mode 100644 vendor/curl-sys-0.4.91/curl/lib/socketpair.h create mode 100644 vendor/curl-sys-0.4.91/curl/lib/socks.c create mode 100644 vendor/curl-sys-0.4.91/curl/lib/socks.h create mode 100644 vendor/curl-sys-0.4.91/curl/lib/socks_gssapi.c create mode 100644 vendor/curl-sys-0.4.91/curl/lib/socks_sspi.c create mode 100644 vendor/curl-sys-0.4.91/curl/lib/splay.c create mode 100644 vendor/curl-sys-0.4.91/curl/lib/splay.h create mode 100644 vendor/curl-sys-0.4.91/curl/lib/strcase.c create mode 100644 vendor/curl-sys-0.4.91/curl/lib/strcase.h create mode 100644 vendor/curl-sys-0.4.91/curl/lib/strequal.c create mode 100644 vendor/curl-sys-0.4.91/curl/lib/strerror.c create mode 100644 vendor/curl-sys-0.4.91/curl/lib/strerror.h create mode 100644 vendor/curl-sys-0.4.91/curl/lib/telnet.c create mode 100644 vendor/curl-sys-0.4.91/curl/lib/telnet.h create mode 100644 vendor/curl-sys-0.4.91/curl/lib/tftp.c create mode 100644 vendor/curl-sys-0.4.91/curl/lib/tftp.h create mode 100644 vendor/curl-sys-0.4.91/curl/lib/thrdpool.c create mode 100644 vendor/curl-sys-0.4.91/curl/lib/thrdpool.h create mode 100644 vendor/curl-sys-0.4.91/curl/lib/thrdqueue.c create mode 100644 vendor/curl-sys-0.4.91/curl/lib/thrdqueue.h create mode 100644 vendor/curl-sys-0.4.91/curl/lib/transfer.c create mode 100644 vendor/curl-sys-0.4.91/curl/lib/transfer.h create mode 100644 vendor/curl-sys-0.4.91/curl/lib/u32_ptrset.c create mode 100644 vendor/curl-sys-0.4.91/curl/lib/u32_ptrset.h create mode 100644 vendor/curl-sys-0.4.91/curl/lib/u8_strset.c create mode 100644 vendor/curl-sys-0.4.91/curl/lib/u8_strset.h create mode 100644 vendor/curl-sys-0.4.91/curl/lib/uint-bset.c create mode 100644 vendor/curl-sys-0.4.91/curl/lib/uint-bset.h create mode 100644 vendor/curl-sys-0.4.91/curl/lib/uint-spbset.c create mode 100644 vendor/curl-sys-0.4.91/curl/lib/uint-spbset.h create mode 100644 vendor/curl-sys-0.4.91/curl/lib/uint-table.c create mode 100644 vendor/curl-sys-0.4.91/curl/lib/uint-table.h create mode 100644 vendor/curl-sys-0.4.91/curl/lib/url.c create mode 100644 vendor/curl-sys-0.4.91/curl/lib/url.h create mode 100644 vendor/curl-sys-0.4.91/curl/lib/urlapi-int.h create mode 100644 vendor/curl-sys-0.4.91/curl/lib/urlapi.c create mode 100644 vendor/curl-sys-0.4.91/curl/lib/urldata.h create mode 100644 vendor/curl-sys-0.4.91/curl/lib/vauth/cleartext.c create mode 100644 vendor/curl-sys-0.4.91/curl/lib/vauth/cram.c create mode 100644 vendor/curl-sys-0.4.91/curl/lib/vauth/digest.c create mode 100644 vendor/curl-sys-0.4.91/curl/lib/vauth/digest.h create mode 100644 vendor/curl-sys-0.4.91/curl/lib/vauth/digest_sspi.c create mode 100644 vendor/curl-sys-0.4.91/curl/lib/vauth/gsasl.c create mode 100644 vendor/curl-sys-0.4.91/curl/lib/vauth/krb5_gssapi.c create mode 100644 vendor/curl-sys-0.4.91/curl/lib/vauth/krb5_sspi.c create mode 100644 vendor/curl-sys-0.4.91/curl/lib/vauth/ntlm.c create mode 100644 vendor/curl-sys-0.4.91/curl/lib/vauth/ntlm_sspi.c create mode 100644 vendor/curl-sys-0.4.91/curl/lib/vauth/oauth2.c create mode 100644 vendor/curl-sys-0.4.91/curl/lib/vauth/spnego_gssapi.c create mode 100644 vendor/curl-sys-0.4.91/curl/lib/vauth/spnego_sspi.c create mode 100644 vendor/curl-sys-0.4.91/curl/lib/vauth/vauth.c create mode 100644 vendor/curl-sys-0.4.91/curl/lib/vauth/vauth.h create mode 100644 vendor/curl-sys-0.4.91/curl/lib/vdns/asyn-ares.c create mode 100644 vendor/curl-sys-0.4.91/curl/lib/vdns/asyn-base.c create mode 100644 vendor/curl-sys-0.4.91/curl/lib/vdns/asyn-thrdd.c create mode 100644 vendor/curl-sys-0.4.91/curl/lib/vdns/asyn.h create mode 100644 vendor/curl-sys-0.4.91/curl/lib/vdns/cf-dns.c create mode 100644 vendor/curl-sys-0.4.91/curl/lib/vdns/cf-dns.h create mode 100644 vendor/curl-sys-0.4.91/curl/lib/vdns/dnscache.c create mode 100644 vendor/curl-sys-0.4.91/curl/lib/vdns/dnscache.h create mode 100644 vendor/curl-sys-0.4.91/curl/lib/vdns/doh.c create mode 100644 vendor/curl-sys-0.4.91/curl/lib/vdns/doh.h create mode 100644 vendor/curl-sys-0.4.91/curl/lib/vdns/hostip.c create mode 100644 vendor/curl-sys-0.4.91/curl/lib/vdns/hostip.h create mode 100644 vendor/curl-sys-0.4.91/curl/lib/vdns/hostip4.c create mode 100644 vendor/curl-sys-0.4.91/curl/lib/vdns/hostip6.c create mode 100644 vendor/curl-sys-0.4.91/curl/lib/vdns/httpsrr.c create mode 100644 vendor/curl-sys-0.4.91/curl/lib/vdns/httpsrr.h create mode 100644 vendor/curl-sys-0.4.91/curl/lib/version.c create mode 100644 vendor/curl-sys-0.4.91/curl/lib/vquic/capsule.c create mode 100644 vendor/curl-sys-0.4.91/curl/lib/vquic/capsule.h create mode 100644 vendor/curl-sys-0.4.91/curl/lib/vquic/cf-capsule.c create mode 100644 vendor/curl-sys-0.4.91/curl/lib/vquic/cf-capsule.h create mode 100644 vendor/curl-sys-0.4.91/curl/lib/vquic/cf-ngtcp2-cmn.c create mode 100644 vendor/curl-sys-0.4.91/curl/lib/vquic/cf-ngtcp2-cmn.h create mode 100644 vendor/curl-sys-0.4.91/curl/lib/vquic/cf-ngtcp2-proxy.c create mode 100644 vendor/curl-sys-0.4.91/curl/lib/vquic/cf-ngtcp2-proxy.h create mode 100644 vendor/curl-sys-0.4.91/curl/lib/vquic/cf-ngtcp2.c create mode 100644 vendor/curl-sys-0.4.91/curl/lib/vquic/cf-ngtcp2.h create mode 100644 vendor/curl-sys-0.4.91/curl/lib/vquic/cf-quiche.c create mode 100644 vendor/curl-sys-0.4.91/curl/lib/vquic/cf-quiche.h create mode 100644 vendor/curl-sys-0.4.91/curl/lib/vquic/vquic-tls.c create mode 100644 vendor/curl-sys-0.4.91/curl/lib/vquic/vquic-tls.h create mode 100644 vendor/curl-sys-0.4.91/curl/lib/vquic/vquic.c create mode 100644 vendor/curl-sys-0.4.91/curl/lib/vquic/vquic.h create mode 100644 vendor/curl-sys-0.4.91/curl/lib/vquic/vquic_int.h create mode 100644 vendor/curl-sys-0.4.91/curl/lib/vssh/libssh.c create mode 100644 vendor/curl-sys-0.4.91/curl/lib/vssh/libssh2.c create mode 100644 vendor/curl-sys-0.4.91/curl/lib/vssh/ssh.h create mode 100644 vendor/curl-sys-0.4.91/curl/lib/vssh/vssh.c create mode 100644 vendor/curl-sys-0.4.91/curl/lib/vssh/vssh.h create mode 100644 vendor/curl-sys-0.4.91/curl/lib/vtls/apple.c create mode 100644 vendor/curl-sys-0.4.91/curl/lib/vtls/apple.h create mode 100644 vendor/curl-sys-0.4.91/curl/lib/vtls/cipher_suite.c create mode 100644 vendor/curl-sys-0.4.91/curl/lib/vtls/cipher_suite.h create mode 100644 vendor/curl-sys-0.4.91/curl/lib/vtls/gtls.c create mode 100644 vendor/curl-sys-0.4.91/curl/lib/vtls/gtls.h create mode 100644 vendor/curl-sys-0.4.91/curl/lib/vtls/hostcheck.c create mode 100644 vendor/curl-sys-0.4.91/curl/lib/vtls/hostcheck.h create mode 100644 vendor/curl-sys-0.4.91/curl/lib/vtls/keylog.c create mode 100644 vendor/curl-sys-0.4.91/curl/lib/vtls/keylog.h create mode 100644 vendor/curl-sys-0.4.91/curl/lib/vtls/mbedtls.c create mode 100644 vendor/curl-sys-0.4.91/curl/lib/vtls/mbedtls.h create mode 100644 vendor/curl-sys-0.4.91/curl/lib/vtls/openssl.c create mode 100644 vendor/curl-sys-0.4.91/curl/lib/vtls/openssl.h create mode 100644 vendor/curl-sys-0.4.91/curl/lib/vtls/rustls.c create mode 100644 vendor/curl-sys-0.4.91/curl/lib/vtls/rustls.h create mode 100644 vendor/curl-sys-0.4.91/curl/lib/vtls/schannel.c create mode 100644 vendor/curl-sys-0.4.91/curl/lib/vtls/schannel.h create mode 100644 vendor/curl-sys-0.4.91/curl/lib/vtls/schannel_int.h create mode 100644 vendor/curl-sys-0.4.91/curl/lib/vtls/schannel_verify.c create mode 100644 vendor/curl-sys-0.4.91/curl/lib/vtls/vtls.c create mode 100644 vendor/curl-sys-0.4.91/curl/lib/vtls/vtls.h create mode 100644 vendor/curl-sys-0.4.91/curl/lib/vtls/vtls_config.c create mode 100644 vendor/curl-sys-0.4.91/curl/lib/vtls/vtls_config.h create mode 100644 vendor/curl-sys-0.4.91/curl/lib/vtls/vtls_int.h create mode 100644 vendor/curl-sys-0.4.91/curl/lib/vtls/vtls_scache.c create mode 100644 vendor/curl-sys-0.4.91/curl/lib/vtls/vtls_scache.h create mode 100644 vendor/curl-sys-0.4.91/curl/lib/vtls/vtls_spack.c create mode 100644 vendor/curl-sys-0.4.91/curl/lib/vtls/vtls_spack.h create mode 100644 vendor/curl-sys-0.4.91/curl/lib/vtls/wolfssl.c create mode 100644 vendor/curl-sys-0.4.91/curl/lib/vtls/wolfssl.h create mode 100644 vendor/curl-sys-0.4.91/curl/lib/vtls/x509asn1.c create mode 100644 vendor/curl-sys-0.4.91/curl/lib/vtls/x509asn1.h create mode 100644 vendor/curl-sys-0.4.91/curl/lib/ws.c create mode 100644 vendor/curl-sys-0.4.91/curl/lib/ws.h create mode 100644 vendor/curl-sys-0.4.91/curl/libcurl.pc.in create mode 100644 vendor/curl-sys-0.4.91/lib.rs diff --git a/Cargo.lock b/Cargo.lock index 4ad1bb1b4a0..ad30863fb8a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2953,9 +2953,9 @@ name = "moli-fetch" version = "0.1.0" dependencies = [ "anyhow", - "bytes", "base64 0.22.1", "brotlic-sys", + "bytes", "cidr", "crossbeam-channel", "curl", diff --git a/Cargo.toml b/Cargo.toml index 337af2f065d..3edd83cea93 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -154,3 +154,6 @@ codegen-units = 1 [profile.test] debug = 1 + +[patch."https://github.com/lexmount/curl-rust"] +curl-sys = { path = "vendor/curl-sys-0.4.91" } diff --git a/moli-fetch/src/blocking/mod.rs b/moli-fetch/src/blocking/mod.rs index 599e322786c..833eccdf67a 100644 --- a/moli-fetch/src/blocking/mod.rs +++ b/moli-fetch/src/blocking/mod.rs @@ -677,7 +677,7 @@ pub(crate) fn configure_easy( .context("failed to disable curl redirect following")?; easy.accept_encoding("") .context("failed to enable curl response decompression")?; - easy.http_content_decoding(request.compression_dictionary.is_none()) + easy.http_content_decoding(!crate::content_decoding::ContentDecoding::required(request)) .context("failed to configure response content decoding")?; easy.get_mut() .begin_dictionary_response(request, request_url); diff --git a/moli-fetch/src/cancellation.rs b/moli-fetch/src/cancellation.rs index 7a6bded926e..a87cbc2a274 100644 --- a/moli-fetch/src/cancellation.rs +++ b/moli-fetch/src/cancellation.rs @@ -28,7 +28,10 @@ struct ResponseProgressState { /// Native counts of encoded receipt and decoded representation, excluding framing. #[derive(Clone, Copy, Debug, Default, Eq, PartialEq)] -pub struct FetchResponseBodySizes { pub encoded: u64, pub decoded: u64 } +pub struct FetchResponseBodySizes { + pub encoded: u64, + pub decoded: u64, +} impl ResponseProgress { pub(crate) fn mark_request_started(&self) { @@ -79,7 +82,17 @@ impl ResponseProgress { pub(crate) fn record_encoded_response_body_size(&self, bytes: u64) { let mut timing = self.inner.timing.lock(); - timing.body_sizes.get_or_insert_with(Default::default).encoded = bytes; + timing + .body_sizes + .get_or_insert_with(Default::default) + .encoded = bytes; + timing.body_bytes_received |= bytes > 0; + } + + pub(crate) fn record_encoded_response_body_chunk(&self, bytes: usize) { + let mut timing = self.inner.timing.lock(); + let sizes = timing.body_sizes.get_or_insert_with(Default::default); + sizes.encoded = sizes.encoded.saturating_add(bytes as u64); timing.body_bytes_received |= bytes > 0; } @@ -97,7 +110,10 @@ impl ResponseProgress { .get_or_insert_with(Instant::now); } - pub(crate) fn mark_cached_response_available(&self, sizes: FetchResponseBodySizes) -> CachedResponseBodyTiming { + pub(crate) fn mark_cached_response_available( + &self, + sizes: FetchResponseBodySizes, + ) -> CachedResponseBodyTiming { self.mark_response_started(); self.inner.timing.lock().body_sizes = Some(sizes); self.commit_state(); @@ -130,7 +146,9 @@ pub struct FetchResponseTiming { } impl FetchResponseTiming { - pub fn body_sizes(self) -> Option { self.body_sizes } + pub fn body_sizes(self) -> Option { + self.body_sizes + } pub fn body_bytes_received(self) -> bool { self.body_bytes_received } @@ -293,8 +311,12 @@ impl FetchCancelHandle { } #[cfg(test)] - fn mark_cached_response_available(&self, sizes: FetchResponseBodySizes) -> CachedResponseBodyTiming { - self.response_progress().mark_cached_response_available(sizes) + fn mark_cached_response_available( + &self, + sizes: FetchResponseBodySizes, + ) -> CachedResponseBodyTiming { + self.response_progress() + .mark_cached_response_available(sizes) } #[cfg(test)] @@ -309,7 +331,7 @@ impl FetchCancelHandle { #[cfg(test)] mod tests { - use super::FetchCancelHandle; + use super::{FetchCancelHandle, FetchResponseBodySizes}; use std::time::Instant; #[test] @@ -674,7 +696,10 @@ mod tests { for reset_before_body_end in [false, true] { let parent = FetchCancelHandle::new(); let response = parent.child_for_subrequest(); - let recorder = response.mark_cached_response_available(FetchResponseBodySizes { encoded: 23, decoded: 3 }); + let recorder = response.mark_cached_response_available(FetchResponseBodySizes { + encoded: 23, + decoded: 3, + }); parent.adopt_response_progress(&response); assert!(parent.response_completion_is_committed()); assert!(parent.response_timing().response_started_at().is_some()); @@ -746,7 +771,13 @@ mod body_size_generation_tests { old.mark_response_started(); old.record_encoded_response_body_size(23); old.record_decoded_response_body_size(3); - assert_eq!(handle.response_timing().body_sizes(), Some(FetchResponseBodySizes {encoded:23,decoded:3})); + assert_eq!( + handle.response_timing().body_sizes(), + Some(FetchResponseBodySizes { + encoded: 23, + decoded: 3 + }) + ); let current = handle.begin_response_progress(); current.mark_response_started(); current.record_encoded_response_body_size(7); @@ -754,7 +785,13 @@ mod body_size_generation_tests { old.record_encoded_response_body_size(99); old.record_decoded_response_body_size(88); old.commit(); - assert_eq!(handle.response_timing().body_sizes(), Some(FetchResponseBodySizes {encoded:7,decoded:5})); + assert_eq!( + handle.response_timing().body_sizes(), + Some(FetchResponseBodySizes { + encoded: 7, + decoded: 5 + }) + ); assert!(!handle.response_completion_is_committed()); current.commit(); assert!(handle.response_completion_is_committed()); diff --git a/moli-fetch/src/compression_dictionary/mod.rs b/moli-fetch/src/compression_dictionary/mod.rs index 40944cce5f7..7ee4b0ceaef 100644 --- a/moli-fetch/src/compression_dictionary/mod.rs +++ b/moli-fetch/src/compression_dictionary/mod.rs @@ -2,7 +2,6 @@ //! requests which may use them. Bytes enter the store only after a readable //! response completes; a header alone cannot register a dictionary. -mod decoding; mod fields; use std::{borrow::Cow, collections::VecDeque, fmt, io::Read, sync::Arc}; @@ -17,7 +16,6 @@ use url::Url; use crate::{FetchConfig, Request, RequestMode}; -pub(crate) use decoding::DictionaryDecoding; pub(crate) use fields::RegistrationOptions; const MAX_DICTIONARY_BYTES: usize = 64 * 1024 * 1024; @@ -392,18 +390,6 @@ impl DictionaryResponse { } } - pub(crate) fn headers(&self) -> &[(String, Vec)] { - &self.headers - } - - pub(crate) fn headers_finalized(&self) -> bool { - self.headers_finalized - } - - pub(crate) fn bodyless(&self) -> bool { - self.request.head || matches!(self.status, 204 | 205 | 304) - } - pub(crate) fn from_cached( store: SharedDictionaryStore, request: &Request, diff --git a/moli-fetch/src/content_coding.rs b/moli-fetch/src/content_coding.rs index 6b778848289..adf78bcdff8 100644 --- a/moli-fetch/src/content_coding.rs +++ b/moli-fetch/src/content_coding.rs @@ -1,17 +1,9 @@ use moli_header_field::{HeaderFieldTokenMode, HeaderFieldTokenizer}; fn supported_content_codings() -> impl Iterator { - let version = curl::Version::get(); - [ - ("deflate", version.feature_libz()), - ("gzip", version.feature_libz()), - ("br", version.feature_brotli()), - ("zstd", version.feature_zstd()), - ("dcb", version.feature_brotli()), - ("dcz", version.feature_zstd()), - ] - .into_iter() - .filter_map(|(coding, supported)| supported.then_some(coding)) + // The bounded native decoder supplies the same coding set even when the + // linked libcurl lacks Zstandard or external-dictionary support. + ["deflate", "gzip", "br", "zstd", "dcb", "dcz"].into_iter() } /// Choose the browser's header before cache lookup and transport setup so diff --git a/moli-fetch/src/compression_dictionary/decoding.rs b/moli-fetch/src/content_decoding.rs similarity index 84% rename from moli-fetch/src/compression_dictionary/decoding.rs rename to moli-fetch/src/content_decoding.rs index 31ef71ba8d1..f3cfc4ba122 100644 --- a/moli-fetch/src/compression_dictionary/decoding.rs +++ b/moli-fetch/src/content_decoding.rs @@ -1,7 +1,6 @@ -//! The native HTTP backend does not expose an external-dictionary option. -//! Requests carrying a dictionary therefore decode their content-coding stack -//! here, using the same native Brotli/zlib/Zstandard libraries. Other requests -//! retain libcurl's content decoders and transfer accounting. +//! Bounded content decoding shared by ordinary and dictionary responses. +//! Native zlib, Brotli and Zstandard decoders are used when libcurl cannot +//! decode the complete negotiated coding set or an external dictionary is needed. use std::{ ffi::c_void, @@ -12,34 +11,72 @@ use std::{ use anyhow::{Result, anyhow, bail, ensure}; use flate2::{Decompress, FlushDecompress, Status}; -use super::Dictionary; +use crate::{Request, compression_dictionary::Dictionary}; const OUTPUT_SIZE: usize = 16 * 1024; type Output<'a> = dyn FnMut(&[u8]) -> Result<()> + 'a; -pub(crate) struct DictionaryDecoding { - dictionary: Arc, +pub(crate) struct ContentDecoding { + dictionary: Option>, stages: Option>, + head: bool, + status: u16, + headers: Vec<(String, Vec)>, + headers_finalized: bool, } -impl DictionaryDecoding { - pub(crate) fn new(dictionary: Arc) -> Self { +impl ContentDecoding { + pub(crate) fn required(request: &Request) -> bool { + request.compression_dictionary.is_some() || !curl::Version::get().feature_zstd() + } + + pub(crate) fn new(request: &Request) -> Self { Self { - dictionary, + dictionary: request.compression_dictionary.clone(), stages: None, + head: request.method == "HEAD", + status: 0, + headers: Vec::new(), + headers_finalized: false, } } - pub(crate) fn reset(&mut self) { - self.stages = None; + pub(crate) fn header(&mut self, data: &[u8]) -> Result<()> { + if let Some(line) = crate::response::parse_http_response_status_line(data) { + self.status = line.status; + self.headers.clear(); + self.stages = None; + self.headers_finalized = false; + return Ok(()); + } + if self.headers_finalized { + return Ok(()); + } + if let Some(header) = crate::headers::parse_http_response_header_line(data) { + self.headers.push(header); + return Ok(()); + } + if self.status >= 200 && data.iter().all(|byte| matches!(byte, b'\r' | b'\n')) { + self.headers_finalized = true; + } + Ok(()) } - pub(crate) fn initialize(&mut self, headers: &[(String, Vec)]) -> Result<()> { + pub(crate) fn needs_readable_dictionary_response(&self) -> bool { + self.dictionary.is_some() && self.headers_finalized && !self.bodyless() + } + + fn bodyless(&self) -> bool { + self.head || matches!(self.status, 204 | 205 | 304) + } + + fn initialize(&mut self) -> Result<()> { if self.stages.is_some() { return Ok(()); } let mut names = Vec::new(); - for (_, value) in headers + for (_, value) in self + .headers .iter() .filter(|(name, _)| name.eq_ignore_ascii_case("content-encoding")) { @@ -61,7 +98,9 @@ impl DictionaryDecoding { "zstd" => Stage::Zstd(Zstd::new(None)?), "dcb" | "dcz" => Stage::Dictionary { brotli: name == "dcb", - dictionary: Arc::clone(&self.dictionary), + dictionary: self.dictionary.clone().ok_or_else(|| { + anyhow!("dictionary content encoding without a selected dictionary") + })?, prefix: Vec::new(), decoder: None, }, @@ -75,9 +114,10 @@ impl DictionaryDecoding { pub(crate) fn push(&mut self, input: &[u8], output: &mut Output<'_>) -> Result<()> { ensure!( - self.stages.is_some(), + self.headers_finalized, "compressed response body arrived before headers" ); + self.initialize()?; feed( self.stages.as_mut().expect("initialized decoding stack"), input, @@ -85,11 +125,12 @@ impl DictionaryDecoding { ) } - pub(crate) fn finish(&mut self, headers: &[(String, Vec)], bodyless: bool) -> Result<()> { - if bodyless { + pub(crate) fn finish(&mut self) -> Result<()> { + // An empty encoded body never invokes a decoder, including for an + // unknown coding. A decoder that received bytes must finish cleanly. + if self.bodyless() || self.stages.is_none() { return Ok(()); } - self.initialize(headers)?; for stage in self.stages.as_ref().expect("initialized decoding stack") { ensure!(stage.finished(), "truncated compressed response"); } diff --git a/moli-fetch/src/lib.rs b/moli-fetch/src/lib.rs index 3bb368a272f..88602274959 100644 --- a/moli-fetch/src/lib.rs +++ b/moli-fetch/src/lib.rs @@ -12,6 +12,7 @@ mod client_hints; mod compression_dictionary; mod config; mod content_coding; +mod content_decoding; mod cors; mod dns; mod error; @@ -82,9 +83,10 @@ pub use referrer_policy::{ pub use request::{ BrowserNavigationRequestKind, BrowserRequestMetadata, CookieHeaderPolicy, FetchPriorityHint, Request, RequestAuth, RequestAuthScheme, RequestAuthTarget, RequestCacheMode, - RequestCredentialsMode, RequestHeaderOverride, RequestMode, RequestPriorityHints, RequestRedirectCheck, - RequestRedirectHandling, RequestRedirectMode, RequestResourceType, ResourceLoadPriority, - ScriptFetchRequestMetadata, ScriptFetchSchedulerPriority, SubresourceRequestMetadata, + RequestCredentialsMode, RequestHeaderOverride, RequestMode, RequestPriorityHints, + RequestRedirectCheck, RequestRedirectHandling, RequestRedirectMode, RequestResourceType, + ResourceLoadPriority, ScriptFetchRequestMetadata, ScriptFetchSchedulerPriority, + SubresourceRequestMetadata, }; pub use request_policy::{is_bad_port, should_request_be_blocked_due_to_bad_port}; pub use response::{ diff --git a/moli-fetch/src/runtime.rs b/moli-fetch/src/runtime.rs index 380e489bfd9..72654b4b5d9 100644 --- a/moli-fetch/src/runtime.rs +++ b/moli-fetch/src/runtime.rs @@ -910,7 +910,7 @@ impl RuntimeOwner { if request_cache_policy_for_url(&self.config, &job.request, &job.current_url).only_if_cached { let head = cache_only_miss_start(&job.request, &job.current_url).into_head(); - job.cancel_handle.mark_response_terminal(); + job.response_progress.commit(); return Ok(JobOutcome::Complete( job.response_tx, Box::new(CompletedBufferedResponse::Raw( @@ -1474,15 +1474,11 @@ impl RuntimeOwner { mut completion: RuntimeCurlCompletion, ) { if let Some(easy) = completion.easy.as_mut() { - if let Some(error) = easy.get_mut().dictionary_error.take() { + if let Some(error) = easy.get_mut().content_decoding_error.take() { completion.result = Err(anyhow!(error)); } else if completion.result.is_ok() && !self.shutdown_requested.load(Ordering::SeqCst) - && !easy - .get_ref() - .response_timing - .as_ref() - .is_some_and(FetchCancelHandle::is_cancelled) + && !completion.context.is_cancelled() { completion.result = easy.get_mut().finish_dictionary_response(); } @@ -2771,6 +2767,14 @@ enum ActiveTransferContext { } impl ActiveTransferContext { + fn is_cancelled(&self) -> bool { + match self { + Self::Buffered(context) => context.job.cancel_handle.is_cancelled(), + Self::Streaming(context) => context.job.cancel_handle.is_cancelled(), + Self::StreamingRaw(context) => context.job.cancel_handle.is_cancelled(), + } + } + fn into_buffered(self) -> Option { match self { Self::Buffered(context) => Some(*context), @@ -2825,8 +2829,8 @@ pub(crate) struct FetchTransferHandler { upload_observer: Option, proxy_connect_response_recorder: ProxyConnectResponseRecorder, dictionary_response: Option, - dictionary_decoding: Option, - dictionary_error: Option, + content_decoding: Option, + content_decoding_error: Option, } enum FetchResponseCollector { @@ -2873,8 +2877,8 @@ impl FetchTransferHandler { upload_observer: None, proxy_connect_response_recorder: ProxyConnectResponseRecorder::default(), dictionary_response: None, - dictionary_decoding: None, - dictionary_error: None, + content_decoding: None, + content_decoding_error: None, } } @@ -2941,20 +2945,18 @@ impl FetchTransferHandler { url.clone(), ) }); - self.dictionary_decoding = request.compression_dictionary.as_ref().map(|dictionary| { - crate::compression_dictionary::DictionaryDecoding::new(Arc::clone(dictionary)) - }); - self.dictionary_error = None; + self.content_decoding = crate::content_decoding::ContentDecoding::required(request) + .then(|| crate::content_decoding::ContentDecoding::new(request)); + self.content_decoding_error = None; } fn finish_dictionary_response(&mut self) -> Result<()> { - let Some(response) = self.dictionary_response.as_mut() else { - return Ok(()); - }; - if let Some(decoding) = self.dictionary_decoding.as_mut() { - decoding.finish(response.headers(), response.bodyless())?; + if let Some(decoding) = self.content_decoding.as_mut() { + decoding.finish()?; + } + if let Some(response) = self.dictionary_response.as_mut() { + response.finish(); } - response.finish(); Ok(()) } @@ -2989,8 +2991,10 @@ impl Handler for FetchTransferHandler { } fn write(&mut self, data: &[u8]) -> std::result::Result { - if !data.is_empty() { self.mark_response_body_received(); } - if self.dictionary_decoding.is_none() { + if !data.is_empty() { + self.mark_response_body_received(); + } + if self.content_decoding.is_none() { if let Some(timing) = self.response_progress() { timing.record_decoded_response_body_size(data.len()); } @@ -3008,12 +3012,17 @@ impl Handler for FetchTransferHandler { } return result; } - if self.dictionary_error.is_some() { + let timing = self.response_progress().cloned(); + // A decoding failure can abort write before curl reports progress. + // Count the wire bytes at this boundary when we own content decoding. + if let Some(timing) = &timing { + timing.record_encoded_response_body_chunk(data.len()); + } + if self.content_decoding_error.is_some() { return Ok(0); } let policy = &mut self.dictionary_response; let response = &mut self.response; - let timing = self.response_progress().cloned(); let mut output = |bytes: &[u8]| -> Result<()> { if let Some(timing) = &timing { timing.record_decoded_response_body_size(bytes.len()); @@ -3034,14 +3043,14 @@ impl Handler for FetchTransferHandler { Ok(()) }; let result = self - .dictionary_decoding + .content_decoding .as_mut() - .expect("dictionary decoding selected") + .expect("native content decoding selected") .push(data, &mut output); match result { Ok(()) => Ok(data.len()), Err(error) => { - self.dictionary_error = Some(error.to_string()); + self.content_decoding_error = Some(error.to_string()); Ok(0) } } @@ -3050,25 +3059,23 @@ impl Handler for FetchTransferHandler { fn header(&mut self, data: &[u8]) -> bool { if crate::response::parse_http_response_status_line(data) .is_some_and(|line| line.status >= 200) - && let Some(decoding) = self.dictionary_decoding.as_mut() { - decoding.reset(); - self.dictionary_error = None; + self.content_decoding_error = None; } if let Some(response) = self.dictionary_response.as_mut() { response.header(data); } - if data.iter().all(|byte| matches!(byte, b'\r' | b'\n')) - && let Some(response) = self.dictionary_response.as_ref() - && response.headers_finalized() - && !response.bodyless() - && let Some(decoding) = self.dictionary_decoding.as_mut() - { - if !response.readable() { - self.dictionary_error = + if let Some(decoding) = self.content_decoding.as_mut() { + if let Err(error) = decoding.header(data) { + self.content_decoding_error = Some(error.to_string()); + } else if decoding.needs_readable_dictionary_response() + && self + .dictionary_response + .as_ref() + .is_none_or(|response| !response.readable()) + { + self.content_decoding_error = Some("dictionary response failed its CORS readability check".to_owned()); - } else if let Err(error) = decoding.initialize(response.headers()) { - self.dictionary_error = Some(error.to_string()); } } if crate::response::parse_http_response_status_line(data) @@ -3091,7 +3098,10 @@ impl Handler for FetchTransferHandler { if dlnow > 0.0 { self.mark_response_body_received(); } - if dlnow > 0.0 && let Some(timing) = self.response_progress() { + if self.content_decoding.is_none() + && dlnow > 0.0 + && let Some(timing) = self.response_progress() + { timing.record_encoded_response_body_size(dlnow as u64); } let keep_going = match &mut self.response { @@ -3277,7 +3287,9 @@ fn complete_cached_streaming_html_job( capture, job.cancel_handle.clone(), ); - let response_timing = job.response_progress.mark_cached_response_available(body_sizes); + let response_timing = job + .response_progress + .mark_cached_response_available(body_sizes); if let Some(started_tx) = job.started_tx { let _ = started_tx.send(Ok(StreamingHtmlResponseStart { @@ -3425,7 +3437,9 @@ fn complete_cached_streaming_raw_job( capture, job.cancel_handle.clone(), ); - let response_timing = job.response_progress.mark_cached_response_available(body_sizes); + let response_timing = job + .response_progress + .mark_cached_response_available(body_sizes); if let Some(started_tx) = job.started_tx { let _ = started_tx.send(Ok(StreamingHtmlResponseStart { @@ -3906,7 +3920,7 @@ fn complete_cache_only_html_miss(mut job: StreamingRuntimeJob) { (job.started_tx.take(), job.body_tx.take()) }; drop(body_tx); - job.cancel_handle.mark_response_terminal(); + job.response_progress.commit(); if let Some(started_tx) = started_tx { let _ = started_tx.send(Ok(start)); } @@ -3924,7 +3938,7 @@ fn complete_cache_only_raw_miss(mut job: StreamingRawRuntimeJob) { (job.started_tx.take(), job.body_tx.take()) }; drop(body_tx); - job.cancel_handle.mark_response_terminal(); + job.response_progress.commit(); if let Some(started_tx) = started_tx { let _ = started_tx.send(Ok(start)); } diff --git a/moli-fetch/src/runtime/response_timing_tests.rs b/moli-fetch/src/runtime/response_timing_tests.rs index 98f6f3fe047..8621d15c14b 100644 --- a/moli-fetch/src/runtime/response_timing_tests.rs +++ b/moli-fetch/src/runtime/response_timing_tests.rs @@ -392,7 +392,7 @@ fn transfer_progress_preserves_cancellation_and_body_observations_on_reuse() { for _ in 0..2 { cancel.begin_response_progress(); handler.buffered_mut().unwrap().begin_request(None); - handler.begin_transfer(None, false); + handler.begin_transfer(None, false, None); assert!(handler.progress(4.0, 0.0, 0.0, 0.0)); assert!(!cancel.response_timing().body_bytes_received()); assert!(handler.progress(4.0, 1.0, 0.0, 0.0)); diff --git a/moli-fetch/src/tests/cache_request_directives.rs b/moli-fetch/src/tests/cache_request_directives.rs index 2690ba4a1d2..4a75c2bdce9 100644 --- a/moli-fetch/src/tests/cache_request_directives.rs +++ b/moli-fetch/src/tests/cache_request_directives.rs @@ -14,8 +14,12 @@ async fn cache_only_requests_preserve_cancellation_before_local_completion() -> for follow_redirects in [true, false] { let cancel = FetchCancelHandle::new(); cancel.cancel(); - let request = - controlled(&server.url(), "only-if-cached")?.with_follow_redirects(follow_redirects); + let request = controlled(&server.url(), "only-if-cached")?; + let request = if follow_redirects { + request + } else { + request.with_single_hop() + }; let error = client .fetch_with_cancel(request, cancel) .await @@ -51,7 +55,11 @@ async fn cache_only_misses_never_contact_origin_on_raw_text_html_or_buffered_pat response.head() } 1 | 2 => { - let request = request.with_follow_redirects(path == 1); + let request = if path == 1 { + request + } else { + request.with_single_hop() + }; let observed = client .fetch_with_cancel_and_network_metadata(request, cancel.clone()) .await?; @@ -240,7 +248,7 @@ async fn disk_cache_only_redirects_stop_at_uncached_hops_without_network() -> Re let mut config = FetchConfig::default(); config.set_http_cache_dir(Some(cache_dir.display().to_string())); let client = FetchClient::new(&config, new_shared_browser_cookie_store()); - let prime = Request::get(&server.url())?.with_follow_redirects(false); + let prime = Request::get(&server.url())?.with_single_hop(); assert_eq!(client.fetch_raw(prime).await?.status, 302); let request = controlled(&server.url(), "only-if-cached")?; let head = if html { diff --git a/moli-fetch/src/tests/upload.rs b/moli-fetch/src/tests/upload.rs index 8694c32f12f..19024f06602 100644 --- a/moli-fetch/src/tests/upload.rs +++ b/moli-fetch/src/tests/upload.rs @@ -3,15 +3,15 @@ use crate::{UploadEvent, UploadObserver}; async fn upload_response( client: &FetchClient, - mut request: Request, + request: Request, transport: &str, cancel: FetchCancelHandle, ) -> Result { match transport { - "buffered" => { - request.follow_redirects = false; - Ok(client.fetch_with_cancel(request, cancel).await?.status) - } + "buffered" => Ok(client + .fetch_with_cancel(request.with_single_hop(), cancel) + .await? + .status), "html" => { let mut response = client.fetch_html_stream(request).await?; while response.next_chunk().await.is_some() {} @@ -59,8 +59,9 @@ async fn upload_observer_finishes_before_response_and_distinguishes_empty_from_a let observer = UploadObserver::new(total, move |event| { let _ = event_tx.send(event); }); - let request = Request::new_bytes("POST", &url, body.clone(), Vec::new())? - .with_upload_observer(observer); + let request = + Request::new_bytes("POST", &url, body.clone().map(Into::into), Vec::new())? + .with_upload_observer(observer); let client = FetchClient::new(&FetchConfig::default(), new_shared_browser_cookie_store()); let fetch = upload_response(&client, request, transport, FetchCancelHandle::new()); @@ -120,7 +121,7 @@ async fn upload_observer_does_not_infer_completion_from_an_early_response() -> R let request = Request::new_bytes( "POST", &url, - Some(body), + Some(body.into()), vec![("Expect".into(), "100-continue".into())], )? .with_upload_observer(observer); @@ -173,7 +174,7 @@ async fn upload_observer_reports_partial_bytes_and_stops_after_cancellation() -> let request = Request::new_bytes( "POST", &url, - Some(vec![b'x'; total as usize]), + Some(vec![b'x'; total as usize].into()), vec![("Expect".into(), String::new())], )? .with_upload_observer(observer); diff --git a/moli-renderer-v8/src/network/backend/memory_cache.rs b/moli-renderer-v8/src/network/backend/memory_cache.rs index c331a20eb4c..89d48824c06 100644 --- a/moli-renderer-v8/src/network/backend/memory_cache.rs +++ b/moli-renderer-v8/src/network/backend/memory_cache.rs @@ -911,7 +911,7 @@ fn raw_subresource_request_is_memory_cacheable( // A CORS-managed hop carries the logical request's earlier URLs. It // can cache this hop without treating the prefix as a followed // transport redirect; its origin/credential taint is part of the key. - && (request.redirect_chain().is_empty() || !request.follow_redirects) + && (request.redirect_chain().is_empty() || !request.transport_follows_redirects()) && raw_subresource_memory_cacheable_resource_type(request) && request.method.eq_ignore_ascii_case("GET") && request.body.is_none() @@ -1179,7 +1179,7 @@ mod tests { .with_request_origin((&initiator).into()) .with_initiator_url(&initiator); let per_hop = automatic.clone().with_single_hop(); - let key = raw_subresource_memory_cache_key(&per_hop, per_hop.headers()) + let key = raw_subresource_memory_cache_key(&per_hop, &per_hop.request_headers) .expect("cacheable first CORS hop"); let mut cache = SharedMemoryResourceCache::with_limits(usize::MAX, usize::MAX); cache.insert_raw_subresource( diff --git a/moli-renderer-v8/src/network/request_client.rs b/moli-renderer-v8/src/network/request_client.rs index 394b5e69d93..87dbd1eb2fc 100644 --- a/moli-renderer-v8/src/network/request_client.rs +++ b/moli-renderer-v8/src/network/request_client.rs @@ -1048,8 +1048,8 @@ impl ResourceRequestClient { ) -> Result { // These buffered transport modes have no distinct header boundary. if request.auth_requires_buffered_transport() - || (!request.follow_redirects - && request.redirect_mode != moli_fetch::RequestRedirectMode::Error) + || (!request.transport_follows_redirects() + && request.redirect_mode() != moli_fetch::RequestRedirectMode::Error) { return self .fetch_text_stream_with_cancel_after_policy(request, cancel_handle) @@ -1252,7 +1252,7 @@ impl ResourceRequestClient { )); } if response.status == 304 - && (!response.redirected || !request.follow_redirects) + && (!response.redirected || !request.transport_follows_redirects()) && response.final_url == request.url && let Some(cached) = cached { @@ -1340,7 +1340,7 @@ impl ResourceRequestClient { let (body_tx, body_rx) = tokio::sync::mpsc::unbounded_channel(); let (completion_tx, completion_rx) = tokio::sync::oneshot::channel(); let resource_runtime = self.resource_runtime.clone(); - let outward_cancel = FetchCancelHandle::new(); + let outward_cancel = response.cancellation_handle().child_for_subrequest(); response.share_response_progress(&outward_cancel); tokio::spawn(async move { let mut body = Vec::new(); @@ -1378,7 +1378,7 @@ impl ResourceRequestClient { if completion.as_ref().is_some_and(Result::is_ok) { let mut materialized = RawResponse::from_head_and_body(response.head(), body) .with_body_sizes(response.response_timing().body_sizes()); - if !request.follow_redirects { + if !request.transport_follows_redirects() { // The outer CORS loop owns the logical redirect history. // Retain only this hop's representation, then let each // consumer attach its own already-validated URL list. diff --git a/moli-renderer-v8/src/network/request_client/tests/raw_cache_revalidation/directives.rs b/moli-renderer-v8/src/network/request_client/tests/raw_cache_revalidation/directives.rs index 3494571700c..f9236ca0de7 100644 --- a/moli-renderer-v8/src/network/request_client/tests/raw_cache_revalidation/directives.rs +++ b/moli-renderer-v8/src/network/request_client/tests/raw_cache_revalidation/directives.rs @@ -231,7 +231,7 @@ async fn raw_memory_cache_only_redirects_stop_at_uncached_targets() -> Result<() // Prime the complete redirect representation independently. The browser // redirect loop may drop an unread body before its cache tee completes. assert_eq!( - fetch(&client, request().with_follow_redirects(false), false) + fetch(&client, request().with_single_hop(), false) .await? .0 .status, diff --git a/moli-renderer-v8/src/network_host.rs b/moli-renderer-v8/src/network_host.rs index 3b6abfa90e2..cfa30acae15 100644 --- a/moli-renderer-v8/src/network_host.rs +++ b/moli-renderer-v8/src/network_host.rs @@ -79,7 +79,7 @@ pub(crate) use self::body_source::{ }; #[cfg(test)] pub(crate) use self::body_source::{ - consume_native_body_text_for_teardown_test, pending_network_body_source_buffered_len_for_test, + consume_native_body_for_teardown_test, pending_network_body_source_buffered_len_for_test, }; pub(crate) use self::browser_response::{ LocalUrlError, local_url_response, local_url_response_result, @@ -211,17 +211,18 @@ pub(crate) use self::xhr::{ PreparedXhrSendBody, XHR_ABORTED_SLOT, XHR_ACTIVE_INTERNAL_ID_SLOT, XHR_ASYNC_SLOT, XHR_METHOD_SLOT, XHR_OPEN_GENERATION_SLOT, XHR_SEND_FLAG_SLOT, XHR_TIMEOUT_SLOT, XHR_TIMEOUT_START_MS_SLOT, XHR_TIMEOUT_TIMER_SLOT, XHR_URL_SLOT, XHR_WITH_CREDENTIALS_SLOT, - apply_xhr_document_abort, apply_xhr_failure, apply_xhr_response, apply_xhr_response_body_source, - apply_xhr_response_body_source_with_status_text, apply_xhr_streaming_failure, apply_xhr_streaming_response_body_source, - apply_xhr_streaming_response_chunk, apply_xhr_streaming_response_head, apply_xhr_timeout, apply_xhr_upload_event, - begin_xhr_send, capture_xhr_upload_listener_flag, convert_xhr_send_body_from_args, dispatch_xhr_loadstart, - finish_xhr_abort, install_progress_event_template_bindings, + apply_xhr_document_abort, apply_xhr_failure, apply_xhr_response, + apply_xhr_response_body_source, apply_xhr_response_body_source_with_status_text, + apply_xhr_streaming_failure, apply_xhr_streaming_response_body_source, + apply_xhr_streaming_response_chunk, apply_xhr_streaming_response_head, apply_xhr_timeout, + apply_xhr_upload_event, begin_xhr_send, capture_xhr_upload_listener_flag, convert_xhr_send_body_from_args, + dispatch_xhr_loadstart, finish_xhr_abort, install_progress_event_template_bindings, install_window_xml_http_request_template_bindings, install_xml_http_request_bindings, install_xml_http_request_event_target_bindings, progress_event_constructor_callback, - set_xhr_state_number, throw_synchronous_xhr_failure, xhr_author_request_headers, - xhr_constructor_callback, xhr_ensure_send_allowed, - xhr_response_text_decoder, - xhr_state_bool_property, xhr_state_number_property, xhr_state_string_property, + set_xhr_state_number, throw_synchronous_xhr_failure, + xhr_author_request_headers, xhr_constructor_callback, xhr_ensure_send_allowed, + xhr_response_text_decoder, xhr_state_bool_property, xhr_state_number_property, + xhr_state_string_property, }; pub(in crate::network_host) const NETWORK_BODY_SLOT: &str = "__lmBody"; pub(in crate::network_host) const NETWORK_BODY_BYTES_SLOT: &str = "__lmBodyBytes"; diff --git a/moli-renderer-v8/src/network_host/async_fetch.rs b/moli-renderer-v8/src/network_host/async_fetch.rs index 32be1791290..8e0cc24701a 100644 --- a/moli-renderer-v8/src/network_host/async_fetch.rs +++ b/moli-renderer-v8/src/network_host/async_fetch.rs @@ -714,7 +714,8 @@ pub(crate) fn spawn_async_subresource_fetch( | BrowserRequestMetadata::Xhr, ) ) && request.transport_follows_redirects(); - let can_collect_image_body = parkable_image_manager.is_some() && request.transport_follows_redirects(); + let can_collect_image_body = + parkable_image_manager.is_some() && request.transport_follows_redirects(); if moli_trace::cdp_runtime_trace_enabled() { tracing::info!( target: "moli_cdp_nav_timing", @@ -998,7 +999,6 @@ async fn fetch_response_head_once( .map(|response| response.head()); } - let cancel_handle = cancel_handle.unwrap_or_default(); let response = loader .fetch_raw_stream_with_cancel(request, cancel_handle) .await @@ -1185,9 +1185,11 @@ mod tests { redirect_chain: Vec::new(), from_cache: false, cache_state: Default::default(), + preload_state: Default::default(), negotiated_http_version: None, }, false, + None, ); match mode { RequestRedirectMode::Follow => { diff --git a/moli-renderer-v8/src/network_host/body_source.rs b/moli-renderer-v8/src/network_host/body_source.rs index 8c97b11d577..8d0d3285fc2 100644 --- a/moli-renderer-v8/src/network_host/body_source.rs +++ b/moli-renderer-v8/src/network_host/body_source.rs @@ -1482,12 +1482,18 @@ pub(in crate::network_host) fn consume_network_body_value_from_object<'s>( } #[cfg(test)] -pub(crate) fn consume_native_body_text_for_teardown_test<'s>( +pub(crate) fn consume_native_body_for_teardown_test<'s>( scope: &mut v8::PinScope<'s, '_>, response: v8::Local<'s, v8::Object>, + method: &str, ) -> v8::Local<'s, v8::Promise> { - let result = - consume_network_body_value_from_object(scope, response, NetworkBodyConsumptionKind::Text); + let kind = match method { + "text" => NetworkBodyConsumptionKind::Text, + "json" => NetworkBodyConsumptionKind::Json, + "arrayBuffer" => NetworkBodyConsumptionKind::ArrayBuffer, + _ => panic!("unsupported native body teardown fixture: {method}"), + }; + let result = consume_network_body_value_from_object(scope, response, kind); if let NetworkBodyConsumption::Pending(promise) = result { return promise; } diff --git a/moli-renderer-v8/src/network_host/fetch_surface.rs b/moli-renderer-v8/src/network_host/fetch_surface.rs index 351a179c078..584bab6f414 100644 --- a/moli-renderer-v8/src/network_host/fetch_surface.rs +++ b/moli-renderer-v8/src/network_host/fetch_surface.rs @@ -4,8 +4,6 @@ use super::headers::{ }; use super::response::{ParsedResponseInit, install_response_body_methods}; use super::*; -use crate::context_bootstrap::readable_stream_disturbed; -pub(in crate::network_host) use crate::util::constructor_prototype; use crate::util::{ callback_data_index_value, callback_data_item, get_private_value, set_private_value, throw_range_error, v8_string, diff --git a/moli-renderer-v8/src/network_host/request/init.rs b/moli-renderer-v8/src/network_host/request/init.rs index 490fac921ee..41779e0ac87 100644 --- a/moli-renderer-v8/src/network_host/request/init.rs +++ b/moli-renderer-v8/src/network_host/request/init.rs @@ -296,9 +296,12 @@ pub(crate) fn parse_fetch_init<'s>( Some(PreparedBodySource::Bytes(bytes)) => (Some(bytes), None), Some(PreparedBodySource::Blob(blob)) => { let blob = v8::Local::new(scope, blob); - (blob::blob_bytes_from_object(scope, blob), None) + ( + blob::blob_bytes_from_object(scope, blob).map(bytes::Bytes::from), + None, + ) } - Some(PreparedBodySource::Stream(stream)) => (Some(Vec::new()), Some(stream)), + Some(PreparedBodySource::Stream(stream)) => (Some(bytes::Bytes::new()), Some(stream)), None => (None, None), }; diff --git a/moli-renderer-v8/src/network_host/request/input.rs b/moli-renderer-v8/src/network_host/request/input.rs index f8f6552fb8d..16546fad4c8 100644 --- a/moli-renderer-v8/src/network_host/request/input.rs +++ b/moli-renderer-v8/src/network_host/request/input.rs @@ -292,9 +292,9 @@ fn request_input_snapshot_from_private_slots<'s>( let body = if body_unusable || for_constructor { None } else { - try_network_body_bytes_from_object(scope, object).map_err(|_| { - webidl::WebIdlError::custom_message("Failed to materialize request body") - })?.map(bytes::Bytes::from) + try_network_body_bytes_from_object(scope, object) + .map_err(|_| webidl::WebIdlError::custom_message("Failed to materialize request body"))? + .map(bytes::Bytes::from) }; // A Request copies its internal list, without consulting a script-defined // headers getter or the Headers object's public iterator. diff --git a/moli-renderer-v8/src/script_vm/tests/extracted/realms_and_teardown.rs b/moli-renderer-v8/src/script_vm/tests/extracted/realms_and_teardown.rs index e15a4412bb4..37348468df9 100644 --- a/moli-renderer-v8/src/script_vm/tests/extracted/realms_and_teardown.rs +++ b/moli-renderer-v8/src/script_vm/tests/extracted/realms_and_teardown.rs @@ -125,7 +125,13 @@ fn read_native_body_for_teardown_test<'s>( // retired. Public Body methods instead require the receiver's live fetch // task source, whose lifetime is covered by the body_completion tests. let response = v8::Local::::try_from(args.get(0)).unwrap(); - let promise = crate::network_host::consume_native_body_text_for_teardown_test(scope, response); + let method = if args.get(1).is_undefined() { + "text".to_owned() + } else { + args.get(1).to_rust_string_lossy(scope) + }; + let promise = + crate::network_host::consume_native_body_for_teardown_test(scope, response, &method); rv.set(promise.into()); } @@ -348,7 +354,7 @@ fn assert_body_result_is_collectible_in_retained_realm( ) { let (mut vm, body_source_id) = new_vm_with_pending_response_for_teardown_test(); vm.eval(&format!( - "globalThis.bodyPromise = response.{method}();\n\ + "globalThis.bodyPromise = readNativeBodyForTeardown(response, '{method}');\n\ bodyPromise.catch(() => {{}});\n\ globalThis.keepRealmAlive = () => document.URL;" )) diff --git a/moli-renderer-v8/src/script_vm/tests/fetch_resource_timing.rs b/moli-renderer-v8/src/script_vm/tests/fetch_resource_timing.rs index bd3a697694a..9a21812fc3c 100644 --- a/moli-renderer-v8/src/script_vm/tests/fetch_resource_timing.rs +++ b/moli-renderer-v8/src/script_vm/tests/fetch_resource_timing.rs @@ -60,7 +60,7 @@ async fn handle_timing_request( if url.path() == "/compressed-worker.js" { let body = r#"self.onmessage = async event => { const probe = (0, eval)('(' + event.data.source + ')'); - postMessage(await probe(event.data.origins, event.data.label)); + postMessage(await probe(event.data.origins, event.data.label, event.data.filter)); close(); };"#; let head = format!( @@ -398,14 +398,23 @@ fn xhr_resource_timing_reads_internal_headers_before_cors_exposure() { } async fn run_resource_timing_fixture(fixture: &str, expected_total: usize) { + run_resource_timing_fixture_scenario(fixture, expected_total, None).await; +} + +async fn run_resource_timing_fixture_scenario( + fixture: &str, + expected_total: usize, + scenario: Option<&serde_json::Value>, +) -> serde_json::Value { let first = timing_server().await; let second = timing_server().await; let loader = ResourceRequestClient::new(&moli_fetch::FetchConfig::default()).unwrap(); let mut page = new_storage_page_task_executor_test_vm_with_loader(&format!("{}/", first.origin), &loader); page.eval(&format!( - "globalThis.__fetchOrigins = {}; globalThis.__fetchTimingResult = null;", + "globalThis.__fetchOrigins = {}; globalThis.__fetchTimingResult = null;globalThis.__compressedTimingScenario = {};", serde_json::to_string(&[&first.origin, &second.origin]).unwrap(), + serde_json::to_string(&scenario).unwrap(), )) .unwrap(); page.eval(&format!( @@ -425,13 +434,58 @@ async fn run_resource_timing_fixture(fixture: &str, expected_total: usize) { .unwrap_or_else(|error| panic!("fetch timing probe returned {result:?}: {error}")); assert_eq!(result["total"], expected_total); assert_eq!(result["failures"], serde_json::json!([])); + result } #[tokio::test(flavor = "current_thread")] async fn compressed_resource_timing_sizes_survive_window_child_worker_and_memory_cache() { - run_resource_timing_fixture( - include_str!("../../../tests/fixtures/compressed-request-resource-timing.js"), + let mut names = std::collections::BTreeSet::new(); + for realm in ["window", "child", "worker"] { + let apis = if realm == "worker" { + ["fetch", "xhr", "sync-xhr"].as_slice() + } else { + ["fetch", "xhr"].as_slice() + }; + for api in apis { + let modes = if *api == "fetch" { + [ + "same", + "cors", + "cors-tao", + "denied", + "opaque", + "opaque-tao", + "cache", + ] + .as_slice() + } else { + ["same", "cors", "cors-tao", "denied", "cache"].as_slice() + }; + for mode in modes { + let scenario = serde_json::json!({"realm": realm, "api": api, "mode": mode}); + let total = if *mode == "cache" { 8 } else { 15 }; + let result = run_resource_timing_fixture_scenario( + include_str!("../../../tests/fixtures/compressed-request-resource-timing.js"), + total, + Some(&scenario), + ) + .await; + let checks = result["names"].as_array().unwrap(); + assert_eq!(checks.len(), total, "{scenario}"); + for check in checks { + let name = check.as_str().unwrap(); + assert!( + name.starts_with(&format!("{realm}: {api}/")), + "{scenario}: {name}" + ); + assert!(names.insert(name.to_owned()), "duplicate check: {name}"); + } + } + } + } + assert_eq!( + names.len(), 566, - ) - .await; + "all Window, child, worker, coding, API and cache cases must run" + ); } diff --git a/moli-renderer-v8/src/service_worker_runtime/service/fetch_settlement.rs b/moli-renderer-v8/src/service_worker_runtime/service/fetch_settlement.rs index 4f23ba7fab8..340a30ff61d 100644 --- a/moli-renderer-v8/src/service_worker_runtime/service/fetch_settlement.rs +++ b/moli-renderer-v8/src/service_worker_runtime/service/fetch_settlement.rs @@ -401,7 +401,7 @@ impl ServiceWorkerRuntimeService { &started.response_head.response_type, started.response_head.cors_exposed_header_names.as_deref(), started.response_head.status, - job.request.redirect_mode, + job.request.redirect_mode(), ), skip_fetch_security_validation: true, internal_id: job.internal_id, diff --git a/moli-renderer-v8/src/worker/global_scope/fetch.rs b/moli-renderer-v8/src/worker/global_scope/fetch.rs index 4c4f975bba4..2960401aa4e 100644 --- a/moli-renderer-v8/src/worker/global_scope/fetch.rs +++ b/moli-renderer-v8/src/worker/global_scope/fetch.rs @@ -286,7 +286,9 @@ pub(in crate::worker) fn spawn_worker_fetch_network( if let Some(check) = redirect_check { request = request.with_redirect_check(check); } - if request.auth_requires_buffered_transport() || !request.transport_follows_redirects() { + if request.auth_requires_buffered_transport() + || !request.transport_follows_redirects() + { match fetch_browser_subresource_with_preflight_headers_and_network_metadata( loader.clone(), request, diff --git a/moli-renderer-v8/tests/fixtures/compressed-request-resource-timing.js b/moli-renderer-v8/tests/fixtures/compressed-request-resource-timing.js index 8a8eed1c764..cd42b4e129d 100644 --- a/moli-renderer-v8/tests/fixtures/compressed-request-resource-timing.js +++ b/moli-renderer-v8/tests/fixtures/compressed-request-resource-timing.js @@ -1,5 +1,5 @@ (async () => { - const probe = async (origins, label) => { + const probe = async (origins, label, filter) => { const rows = []; globalThis.__compressedTimingProgress = rows; const checks = async (name, run) => { @@ -49,6 +49,7 @@ ]; let next = 0; for (const api of apis) for (const mode of ['same', 'cors', 'cors-tao', 'denied', ...(api === 'fetch' ? ['opaque', 'opaque-tao'] : [])]) for (const spec of specs) { + if (filter && (filter.api !== api || filter.mode !== mode)) continue; await checks(`${api}/${mode}/${spec.kind}/${spec.chunked ? 'chunked' : 'length'}/${spec.method || 'GET'}`, async () => { const url = new URL('/compressed', origins[mode === 'same' ? 0 : 1]); url.searchParams.set('key', `${label}-${++next}`); @@ -75,6 +76,7 @@ }); } for (const api of apis) for (const {kind, encoded} of [{kind: 'gzip', encoded: 23}, {kind: 'zstd', encoded: 12}]) { + if (filter && (filter.api !== api || filter.mode !== 'cache')) continue; const base = `${origins[0]}/compressed?kind=${kind}&cache=1&key=${label}-${api}-cache`; for (let phase = 0; phase < 4; ++phase) await checks(`${api}/${kind}/cache/${phase}`, async () => { const url = base + '#phase-' + phase; @@ -86,28 +88,36 @@ assert(performance.getEntriesByName(url, 'resource').length === 1, 'Duplicate cached timing'); }); } - return {total: rows.length, failures: rows.filter(row => !row.passed)}; + return {total: rows.length, failures: rows.filter(row => !row.passed), names: rows.map(row => row.name)}; }; - const results = [await probe(__fetchOrigins, 'window')]; - const iframe = document.createElement('iframe'); - const child = new Promise((resolve, reject) => { - const timer = setTimeout(() => reject(Error('Child timing probe did not finish')), 30000); - const receive = event => { - if (event.source !== iframe.contentWindow || event.data?.kind !== 'compressed-timing') return; - clearTimeout(timer); removeEventListener('message', receive); resolve(event.data.result); - }; - addEventListener('message', receive); - }); - iframe.srcdoc = '