diff options
| author | Bartek Iwańczuk <biwanczuk@gmail.com> | 2024-06-13 21:41:26 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-06-13 22:41:26 +0200 |
| commit | fb31eaa9ca59f6daaee0210d5cd206185c7041b9 (patch) | |
| tree | 0c4ebc81ed7b44b683f31281accc47d451d09718 /ext/fetch | |
| parent | 518e4d3b3a93838e0f2dbcc4d3b79f8f395db563 (diff) | |
chore: upgrade to reqwest 0.12.4 and rustls 0.22 (#24056)
This commit updates Deno to use `reqwest` at 0.12.4
and `rustls` at 0.22. Other related crates were updated
as well to match versions accepted by `reqwest` and `rustls`.
Note: we are not using the latest available `rustls` yet,
but this upgrade was non-trivial already, so a bump to
0.23 for `rustls` will be done in a separate commit.
Closes #23370
---------
Signed-off-by: Ryan Dahl <ry@tinyclouds.org>
Signed-off-by: Bartek Iwańczuk <biwanczuk@gmail.com>
Co-authored-by: Ryan Dahl <ry@tinyclouds.org>
Co-authored-by: Divy Srivastava <dj.srivastava23@gmail.com>
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, 7 insertions, 10 deletions
diff --git a/ext/fetch/Cargo.toml b/ext/fetch/Cargo.toml index 12a6b5cc9..d9899cf18 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_v02.workspace = true +http.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 8f83cef88..29bad5992 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_v02::Response::builder() + let response = http::Response::builder() .status(StatusCode::OK) .body(body) .map_err(|_| ())? diff --git a/ext/fetch/lib.rs b/ext/fetch/lib.rs index 066f1685b..75ceb86d9 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_v02::header::CONTENT_LENGTH; -use http_v02::Uri; +use http::header::CONTENT_LENGTH; +use http::Uri; use reqwest::header::HeaderMap; use reqwest::header::HeaderName; use reqwest::header::HeaderValue; @@ -449,12 +449,9 @@ where .decode_to_vec() .map_err(|e| type_error(format!("{e:?}")))?; - let response = http_v02::Response::builder() - .status(http_v02::StatusCode::OK) - .header( - http_v02::header::CONTENT_TYPE, - data_url.mime_type().to_string(), - ) + let response = http::Response::builder() + .status(http::StatusCode::OK) + .header(http::header::CONTENT_TYPE, data_url.mime_type().to_string()) .body(reqwest::Body::from(body))?; let fut = async move { Ok(Ok(Response::from(response))) }; |