Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix readversion #97

Merged
merged 4 commits into from
Jan 31, 2024
Merged

Fix readversion #97

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e24f0d9
feat: allow enabling http1/http2 individually
SergioBenitez Dec 22, 2023
a376675
properly mark optional dependencies optional
SergioBenitez Jan 18, 2024
3b5d593
fix ReadVersion async Read impl
SergioBenitez Jan 18, 2024
3c02f13
Merge branch 'hyperium:master' into fix-readversion
SergioBenitez Jan 31, 2024
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
37 changes: 15 additions & 22 deletions src/server/conn/auto.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,11 @@
use futures_util::ready;
use hyper::service::HttpService;
use std::future::Future;
use std::io::{Error as IoError, ErrorKind, Result as IoResult};
use std::marker::PhantomPinned;
use std::mem::MaybeUninit;
use std::pin::Pin;
use std::task::{Context, Poll};
use std::{error::Error as StdError, marker::Unpin, time::Duration};
use std::{error::Error as StdError, io, marker::Unpin, time::Duration};

use bytes::Bytes;
use http::{Request, Response};
Expand Down Expand Up @@ -174,7 +173,7 @@ where
io: Some(io),
buf: [MaybeUninit::uninit(); 24],
filled: 0,
version: Version::H1,
version: Version::H2,
_pin: PhantomPinned,
}
}
Expand All @@ -196,7 +195,7 @@ impl<I> Future for ReadVersion<I>
where
I: Read + Unpin,
{
type Output = IoResult<(Version, Rewind<I>)>;
type Output = io::Result<(Version, Rewind<I>)>;

fn poll(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Self::Output> {
let this = self.project();
Expand All @@ -208,27 +207,21 @@ where
buf.unfilled().advance(*this.filled);
};

// We start as H2 and switch to H1 as soon as we don't have the preface.
while buf.filled().len() < H2_PREFACE.len() {
if buf.filled() != &H2_PREFACE[0..buf.filled().len()] {
let io = this.io.take().unwrap();
let buf = buf.filled().to_vec();
return Poll::Ready(Ok((
*this.version,
Rewind::new_buffered(io, Bytes::from(buf)),
)));
} else {
// if our buffer is empty, then we need to read some data to continue.
let len = buf.filled().len();
ready!(Pin::new(this.io.as_mut().unwrap()).poll_read(cx, buf.unfilled()))?;
*this.filled = buf.filled().len();
if buf.filled().len() == len {
return Err(IoError::new(ErrorKind::UnexpectedEof, "early eof")).into();
}
let len = buf.filled().len();
ready!(Pin::new(this.io.as_mut().unwrap()).poll_read(cx, buf.unfilled()))?;
*this.filled = buf.filled().len();

// We starts as H2 and switch to H1 when we don't get the preface.
if buf.filled().len() == len
|| &buf.filled()[len..] != &H2_PREFACE[len..buf.filled().len()]
{
*this.version = Version::H1;
break;
}
}
if buf.filled() == H2_PREFACE {
*this.version = Version::H2;
}

let io = this.io.take().unwrap();
let buf = buf.filled().to_vec();
Poll::Ready(Ok((
Expand Down