diff options
author | Matt Mastracci <matthew@mastracci.com> | 2023-07-31 07:34:53 -0600 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-07-31 07:34:53 -0600 |
commit | 990ecc99d8248a66f1915b11e734e51ba104dcb3 (patch) | |
tree | 0539e6efbd26b493b58a4e14b3cdade04fb52835 /ext/http/http_next.rs | |
parent | 43877f120905e9502472452d6d88ae4663cd9d94 (diff) |
feat(ext/http): Upgrade to hyper1.0-rc4 (#19987)
Includes a lightly-modified version of hyper-util's `TokioIo` utility.
Hyper changes:
v1.0.0-rc.4 (2023-07-10)
Bug Fixes
http1:
http1 server graceful shutdown fix (#3261)
([f4b51300](https://github.com/hyperium/hyper/commit/f4b513009d81083081d1c60c1981847bbb17dd5d))
send error on Incoming body when connection errors (#3256)
([52f19259](https://github.com/hyperium/hyper/commit/52f192593fb9ebcf6d3894e0c85cbf710da4decd),
closes https://github.com/hyperium/hyper/issues/3253)
properly end chunked bodies when it was known to be empty (#3254)
([fec64cf0](https://github.com/hyperium/hyper/commit/fec64cf0abdc678e30ca5f1b310c5118b2e01999),
closes https://github.com/hyperium/hyper/issues/3252)
Features
client: Make clients able to use non-Send executor (#3184)
([d977f209](https://github.com/hyperium/hyper/commit/d977f209bc6068d8f878b22803fc42d90c887fcc),
closes https://github.com/hyperium/hyper/issues/3017)
rt:
replace IO traits with hyper::rt ones (#3230)
([f9f65b7a](https://github.com/hyperium/hyper/commit/f9f65b7aa67fa3ec0267fe015945973726285bc2),
closes https://github.com/hyperium/hyper/issues/3110)
add downcast on Sleep trait (#3125)
([d92d3917](https://github.com/hyperium/hyper/commit/d92d3917d950e4c61c37c2170f3ce273d2a0f7d1),
closes https://github.com/hyperium/hyper/issues/3027)
service: change Service::call to take &self (#3223)
([d894439e](https://github.com/hyperium/hyper/commit/d894439e009aa75103f6382a7ba98fb17da72f02),
closes https://github.com/hyperium/hyper/issues/3040)
Breaking Changes
Any IO transport type provided must not implement hyper::rt::{Read,
Write} instead of tokio::io traits. You can grab a helper type from
hyper-util to wrap Tokio types, or implement the traits yourself, if
it's a custom type.
([f9f65b7a](https://github.com/hyperium/hyper/commit/f9f65b7aa67fa3ec0267fe015945973726285bc2))
client::conn::http2 types now use another generic for an Executor. Code
that names Connection needs to include the additional generic parameter.
([d977f209](https://github.com/hyperium/hyper/commit/d977f209bc6068d8f878b22803fc42d90c887fcc))
The Service::call function no longer takes a mutable reference to self.
The FnMut trait bound on the service::util::service_fn function and the
trait bound on the impl for the ServiceFn struct were changed from FnMut
to Fn.
Diffstat (limited to 'ext/http/http_next.rs')
-rw-r--r-- | ext/http/http_next.rs | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/ext/http/http_next.rs b/ext/http/http_next.rs index cd63bc899..7cf088e30 100644 --- a/ext/http/http_next.rs +++ b/ext/http/http_next.rs @@ -1,6 +1,7 @@ // Copyright 2018-2023 the Deno authors. All rights reserved. MIT license. use crate::compressible::is_content_compressible; use crate::extract_network_stream; +use crate::hyper_util_tokioio::TokioIo; use crate::network_buffered_stream::NetworkStreamPrefixCheck; use crate::request_body::HttpRequestBody; use crate::request_properties::HttpConnectionProperties; @@ -139,7 +140,7 @@ pub fn op_http_upgrade_raw( let mut http = slab_get(slab_id); *http.response() = response; http.complete(); - let mut upgraded = upgrade.await?; + let mut upgraded = TokioIo::new(upgrade.await?); upgraded.write_all(&bytes).await?; break upgraded; } @@ -709,7 +710,7 @@ fn serve_http11_unconditional( let conn = http1::Builder::new() .keep_alive(true) .writev(*USE_WRITEV) - .serve_connection(io, svc); + .serve_connection(TokioIo::new(io), svc); conn.with_upgrades().map_err(AnyError::from) } @@ -718,7 +719,8 @@ fn serve_http2_unconditional( io: impl HttpServeStream, svc: impl HttpService<Incoming, ResBody = ResponseBytes> + 'static, ) -> impl Future<Output = Result<(), AnyError>> + 'static { - let conn = http2::Builder::new(LocalExecutor).serve_connection(io, svc); + let conn = + http2::Builder::new(LocalExecutor).serve_connection(TokioIo::new(io), svc); conn.map_err(AnyError::from) } |