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.

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

Allow to config h2 max concurrent reset streams. #2535

Merged
merged 3 commits into from May 13, 2021
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
15 changes: 15 additions & 0 deletions src/client/client.rs
Expand Up @@ -1151,6 +1151,21 @@ impl Builder {
self
}

/// Sets the maximum number of HTTP2 concurrent locally reset streams.
///
/// See the documentation of [`h2::client::Builder::max_concurrent_reset_streams`] for more
/// details.
///
/// The default value is determined by the `h2` crate.
///
/// [`h2::client::Builder::max_concurrent_reset_streams`]: https://docs.rs/h2/client/struct.Builder.html#method.max_concurrent_reset_streams
#[cfg(feature = "http2")]
#[cfg_attr(docsrs, doc(cfg(feature = "http2")))]
pub fn http2_max_concurrent_reset_streams(&mut self, max: usize) -> &mut Self {
self.conn_builder.http2_max_concurrent_reset_streams(max);
self
}

/// Set whether to retry requests that get disrupted before ever starting
/// to write.
///
Expand Down
18 changes: 17 additions & 1 deletion src/client/conn.rs
Expand Up @@ -530,7 +530,8 @@ impl Builder {
&mut self,
enabled: bool,
) -> &mut Builder {
self.h1_parser_config.allow_spaces_after_header_name_in_responses(enabled);
self.h1_parser_config
.allow_spaces_after_header_name_in_responses(enabled);
self
}

Expand Down Expand Up @@ -701,6 +702,21 @@ impl Builder {
self
}

/// Sets the maximum number of HTTP2 concurrent locally reset streams.
///
/// See the documentation of [`h2::client::Builder::max_concurrent_reset_streams`] for more
/// details.
///
/// The default value is determined by the `h2` crate.
///
/// [`h2::client::Builder::max_concurrent_reset_streams`]: https://docs.rs/h2/client/struct.Builder.html#method.max_concurrent_reset_streams
#[cfg(feature = "http2")]
#[cfg_attr(docsrs, doc(cfg(feature = "http2")))]
pub fn http2_max_concurrent_reset_streams(&mut self, max: usize) -> &mut Self {
self.h2_builder.max_concurrent_reset_streams = Some(max);
self
}

/// Constructs a connection with the configured options and IO.
pub fn handshake<T, B>(
&self,
Expand Down
7 changes: 6 additions & 1 deletion src/proto/h2/client.rs
Expand Up @@ -10,7 +10,7 @@ use tokio::io::{AsyncRead, AsyncWrite};

use super::{decode_content_length, ping, PipeToSendStream, SendBuf};
use crate::body::HttpBody;
use crate::common::{task, exec::Exec, Future, Never, Pin, Poll};
use crate::common::{exec::Exec, task, Future, Never, Pin, Poll};
use crate::headers;
use crate::proto::Dispatched;
use crate::{Body, Request, Response};
Expand Down Expand Up @@ -44,6 +44,7 @@ pub(crate) struct Config {
pub(crate) keep_alive_timeout: Duration,
#[cfg(feature = "runtime")]
pub(crate) keep_alive_while_idle: bool,
pub(crate) max_concurrent_reset_streams: Option<usize>,
seanmonstar marked this conversation as resolved.
Show resolved Hide resolved
}

impl Default for Config {
Expand All @@ -59,6 +60,7 @@ impl Default for Config {
keep_alive_timeout: Duration::from_secs(20),
#[cfg(feature = "runtime")]
keep_alive_while_idle: false,
max_concurrent_reset_streams: None,
}
}
}
Expand All @@ -70,6 +72,9 @@ fn new_builder(config: &Config) -> Builder {
.initial_connection_window_size(config.initial_conn_window_size)
.max_frame_size(config.max_frame_size)
.enable_push(false);
if let Some(max) = config.max_concurrent_reset_streams {
builder.max_concurrent_reset_streams(max);
}
builder
}

Expand Down