Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions src/async_impl/h3_client/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ use std::future::{self, Future};
use std::pin::Pin;
use std::task::{Context, Poll};
use std::time::Duration;
use sync_wrapper::SyncWrapper;

#[derive(Clone)]
pub(crate) struct H3Client {
Expand Down Expand Up @@ -77,24 +78,24 @@ impl H3Client {
Ok(s) => s,
Err(e) => {
return H3ResponseFuture {
inner: Box::pin(future::ready(Err(e))),
inner: SyncWrapper::new(Box::pin(future::ready(Err(e)))),
}
}
};
H3ResponseFuture {
inner: Box::pin(self.clone().send_request(pool_key, req)),
inner: SyncWrapper::new(Box::pin(self.clone().send_request(pool_key, req))),
}
}
}

pub(crate) struct H3ResponseFuture {
inner: Pin<Box<dyn Future<Output = Result<Response<ResponseBody>, Error>> + Send>>,
inner: SyncWrapper<Pin<Box<dyn Future<Output = Result<Response<ResponseBody>, Error>> + Send>>>,
}

impl Future for H3ResponseFuture {
type Output = Result<Response<ResponseBody>, Error>;

fn poll(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Self::Output> {
self.inner.as_mut().poll(cx)
self.inner.get_mut().as_mut().poll(cx)
}
}
11 changes: 7 additions & 4 deletions tests/http3.rs
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ use http::header::CONTENT_LENGTH;
use std::error::Error;
use support::server;

fn assert_send_sync<T: Send + Sync>(_: &T) {}

#[tokio::test]
async fn http3_request_full() {
use http_body_util::BodyExt;
Expand All @@ -19,17 +21,18 @@ async fn http3_request_full() {
});

let url = format!("https://{}/content-length", server.addr());
let res = reqwest::Client::builder()
let res_fut = reqwest::Client::builder()
.http3_prior_knowledge()
.danger_accept_invalid_certs(true)
.build()
.expect("client builder")
.post(url)
.version(http::Version::HTTP_3)
.body("hello")
.send()
.await
.expect("request");
.send();

assert_send_sync(&res_fut);
let res = res_fut.await.expect("request");

assert_eq!(res.version(), http::Version::HTTP_3);
assert_eq!(res.status(), reqwest::StatusCode::OK);
Expand Down