forked/hyper
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(server): change Builder window size methods to be by-value

Browse Source 
Closes #1814
This commit is contained in:
Sean McArthur
2019-08-20 17:45:01 -07:00
parent b3774bd6d3
commit a22dabd093
2 changed files with 4 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
benches/end_to_end.rs
View File

@@ -236,8 +236,8 @@ fn spawn_server(rt: &mut Runtime, opts: &Opts) -> SocketAddr {
let body = opts.response_body; let body = opts.response_body;
let srv = Server::bind(&addr) let srv = Server::bind(&addr)
.http2_only(opts.http2) .http2_only(opts.http2)
.http2_initial_stream_window_size_(opts.http2_stream_window) .http2_initial_stream_window_size(opts.http2_stream_window)
.http2_initial_connection_window_size_(opts.http2_conn_window) .http2_initial_connection_window_size(opts.http2_conn_window)
.serve(make_service_fn( move |_| async move { .serve(make_service_fn( move |_| async move {
Ok::<_, hyper::Error>(service_fn(move |req: Request<Body>| async move { Ok::<_, hyper::Error>(service_fn(move |req: Request<Body>| async move {
let mut req_body = req.into_body(); let mut req_body = req.into_body();

20
src/server/mod.rs
View File

@@ -307,29 +307,13 @@ impl<I, E> Builder<I, E> {
self self
} }
// soft-deprecated? deprecation warning just seems annoying...
// reimplemented to take `self` instead of `&mut self`
#[doc(hidden)]
pub fn http2_initial_stream_window_size(&mut self, sz: impl Into<Option<u32>>) -> &mut Self {
self.protocol.http2_initial_stream_window_size(sz.into());
self
}
// soft-deprecated? deprecation warning just seems annoying...
// reimplemented to take `self` instead of `&mut self`
#[doc(hidden)]
pub fn http2_initial_connection_window_size(&mut self, sz: impl Into<Option<u32>>) -> &mut Self {
self.protocol.http2_initial_connection_window_size(sz.into());
self
}
/// Sets the [`SETTINGS_INITIAL_WINDOW_SIZE`][spec] option for HTTP2 /// Sets the [`SETTINGS_INITIAL_WINDOW_SIZE`][spec] option for HTTP2
/// stream-level flow control. /// stream-level flow control.
/// ///
/// Default is 65,535 /// Default is 65,535
/// ///
/// [spec]: https://http2.github.io/http2-spec/#SETTINGS_INITIAL_WINDOW_SIZE /// [spec]: https://http2.github.io/http2-spec/#SETTINGS_INITIAL_WINDOW_SIZE
pub fn http2_initial_stream_window_size_(mut self, sz: impl Into<Option<u32>>) -> Self { pub fn http2_initial_stream_window_size(mut self, sz: impl Into<Option<u32>>) -> Self {
self.protocol.http2_initial_stream_window_size(sz.into()); self.protocol.http2_initial_stream_window_size(sz.into());
self self
} }
@@ -337,7 +321,7 @@ impl<I, E> Builder<I, E> {
/// Sets the max connection-level flow control for HTTP2 /// Sets the max connection-level flow control for HTTP2
/// ///
/// Default is 65,535 /// Default is 65,535
pub fn http2_initial_connection_window_size_(mut self, sz: impl Into<Option<u32>>) -> Self { pub fn http2_initial_connection_window_size(mut self, sz: impl Into<Option<u32>>) -> Self {
self.protocol.http2_initial_connection_window_size(sz.into()); self.protocol.http2_initial_connection_window_size(sz.into());
self self
} }