diff options
| author | Bartek Iwańczuk <biwanczuk@gmail.com> | 2024-06-19 15:09:17 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-06-19 16:09:17 +0200 |
| commit | b94707af7df757db13f24b7b70dbd7956d1e1e1c (patch) | |
| tree | 5e2ce944f66f4fda8b0982b68e7e422c2960753a /ext/fetch | |
| parent | f4eead61ebd0af203784134c0a8b6339874531b5 (diff) | |
Revert "chore: upgrade to reqwest 0.12.4 and rustls 0.22 (#24056)" (#24262)
This reverts commit fb31eaa9ca59f6daaee0210d5cd206185c7041b9.
Reverting because users reported spurious errors when downloading
dependencies - https://github.com/denoland/deno/issues/24260.
Closes https://github.com/denoland/deno/issues/24260
Diffstat (limited to 'ext/fetch')
| -rw-r--r-- | ext/fetch/Cargo.toml | 2 | ||||
| -rw-r--r-- | ext/fetch/fs_fetch_handler.rs | 2 | ||||
| -rw-r--r-- | ext/fetch/lib.rs | 13 |
3 files changed, 10 insertions, 7 deletions
diff --git a/ext/fetch/Cargo.toml b/ext/fetch/Cargo.toml index 0fb9e0ed6..8d8c2205e 100644 --- a/ext/fetch/Cargo.toml +++ b/ext/fetch/Cargo.toml @@ -20,7 +20,7 @@ deno_core.workspace = true deno_permissions.workspace = true deno_tls.workspace = true dyn-clone = "1" -http.workspace = true +http_v02.workspace = true reqwest.workspace = true serde.workspace = true serde_json.workspace = true diff --git a/ext/fetch/fs_fetch_handler.rs b/ext/fetch/fs_fetch_handler.rs index 29bad5992..8f83cef88 100644 --- a/ext/fetch/fs_fetch_handler.rs +++ b/ext/fetch/fs_fetch_handler.rs @@ -31,7 +31,7 @@ impl FetchHandler for FsFetchHandler { let file = tokio::fs::File::open(path).map_err(|_| ()).await?; let stream = ReaderStream::new(file); let body = reqwest::Body::wrap_stream(stream); - let response = http::Response::builder() + let response = http_v02::Response::builder() .status(StatusCode::OK) .body(body) .map_err(|_| ())? diff --git a/ext/fetch/lib.rs b/ext/fetch/lib.rs index 75ceb86d9..066f1685b 100644 --- a/ext/fetch/lib.rs +++ b/ext/fetch/lib.rs @@ -47,8 +47,8 @@ use data_url::DataUrl; use deno_tls::TlsKey; use deno_tls::TlsKeys; use deno_tls::TlsKeysHolder; -use http::header::CONTENT_LENGTH; -use http::Uri; +use http_v02::header::CONTENT_LENGTH; +use http_v02::Uri; use reqwest::header::HeaderMap; use reqwest::header::HeaderName; use reqwest::header::HeaderValue; @@ -449,9 +449,12 @@ where .decode_to_vec() .map_err(|e| type_error(format!("{e:?}")))?; - let response = http::Response::builder() - .status(http::StatusCode::OK) - .header(http::header::CONTENT_TYPE, data_url.mime_type().to_string()) + let response = http_v02::Response::builder() + .status(http_v02::StatusCode::OK) + .header( + http_v02::header::CONTENT_TYPE, + data_url.mime_type().to_string(), + ) .body(reqwest::Body::from(body))?; let fut = async move { Ok(Ok(Response::from(response))) }; |