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/lib.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/lib.rs')
| -rw-r--r-- | ext/http/lib.rs | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/ext/http/lib.rs b/ext/http/lib.rs index c33c1d15e..5a8788f92 100644 --- a/ext/http/lib.rs +++ b/ext/http/lib.rs @@ -50,6 +50,7 @@ use hyper::Body; use hyper::HeaderMap; use hyper::Request; use hyper::Response; +use hyper_util_tokioio::TokioIo; use serde::Serialize; use std::borrow::Cow; use std::cell::RefCell; @@ -76,6 +77,7 @@ use crate::reader_stream::ShutdownHandle; pub mod compressible; mod http_next; +mod hyper_util_tokioio; mod network_buffered_stream; mod reader_stream; mod request_body; @@ -1061,8 +1063,9 @@ impl CanDowncastUpgrade for hyper1::upgrade::Upgraded { fn downcast<T: AsyncRead + AsyncWrite + Unpin + 'static>( self, ) -> Result<(T, Bytes), Self> { - let hyper1::upgrade::Parts { io, read_buf, .. } = self.downcast()?; - Ok((io, read_buf)) + let hyper1::upgrade::Parts { io, read_buf, .. } = + self.downcast::<TokioIo<T>>()?; + Ok((io.into_inner(), read_buf)) } } |