Compare commits

4 Commits
master ... imp

Author SHA1 Message Date
4JX
90af7b9da9 Switch pseudo header order to mimic chrome 2022-09-05 19:26:38 +02:00
4JX
f486fc3adc Fix formatting 2022-08-25 01:29:22 +02:00
4JX
7af4adf829 Include a test for setting header_table_size 2022-08-25 01:25:58 +02:00
4JX
4e6d835094 Add a setter for header_table_size 2022-08-23 14:17:43 +02:00
8 changed files with 91 additions and 6 deletions

View File

@@ -1022,6 +1022,39 @@ impl Builder {
self self
} }
/// Sets the header table size.
///
/// This setting informs the peer of the maximum size of the header compression
/// table used to encode header blocks, in octets. The encoder may select any value
/// equal to or less than the header table size specified by the sender.
///
/// The default value is 4,096.
///
/// # Examples
///
/// ```
/// # use tokio::io::{AsyncRead, AsyncWrite};
/// # use h2::client::*;
/// # use bytes::Bytes;
/// #
/// # async fn doc<T: AsyncRead + AsyncWrite + Unpin>(my_io: T)
/// # -> Result<((SendRequest<Bytes>, Connection<T, Bytes>)), h2::Error>
/// # {
/// // `client_fut` is a future representing the completion of the HTTP/2
/// // handshake.
/// let client_fut = Builder::new()
/// .header_table_size(1_000_000)
/// .handshake(my_io);
/// # client_fut.await
/// # }
/// #
/// # pub fn main() {}
/// ```
pub fn header_table_size(&mut self, size: u32) -> &mut Self {
self.settings.set_header_table_size(Some(size));
self
}
/// Sets the first stream ID to something other than 1. /// Sets the first stream ID to something other than 1.
#[cfg(feature = "unstable")] #[cfg(feature = "unstable")]
pub fn initial_stream_id(&mut self, stream_id: u32) -> &mut Self { pub fn initial_stream_id(&mut self, stream_id: u32) -> &mut Self {

View File

@@ -88,6 +88,12 @@ impl<T> FramedRead<T> {
pub fn set_max_header_list_size(&mut self, val: usize) { pub fn set_max_header_list_size(&mut self, val: usize) {
self.max_header_list_size = val; self.max_header_list_size = val;
} }
/// Update the header table size setting.
#[inline]
pub fn set_header_table_size(&mut self, val: usize) {
self.hpack.queue_size_update(val);
}
} }
/// Decodes a frame. /// Decodes a frame.

View File

@@ -95,6 +95,11 @@ impl<T, B> Codec<T, B> {
self.framed_write().set_header_table_size(val) self.framed_write().set_header_table_size(val)
} }
/// Set the decoder header table size size.
pub fn set_recv_header_table_size(&mut self, val: usize) {
self.inner.set_header_table_size(val)
}
/// Set the max header list size that can be received. /// Set the max header list size that can be received.
pub fn set_max_recv_header_list_size(&mut self, val: usize) { pub fn set_max_recv_header_list_size(&mut self, val: usize) {
self.inner.set_max_header_list_size(val); self.inner.set_max_header_list_size(val);

View File

@@ -686,13 +686,13 @@ impl Iterator for Iter {
return Some(Method(method)); return Some(Method(method));
} }
if let Some(scheme) = pseudo.scheme.take() {
return Some(Scheme(scheme));
}
if let Some(authority) = pseudo.authority.take() { if let Some(authority) = pseudo.authority.take() {
return Some(Authority(authority)); return Some(Authority(authority));
} }
if let Some(scheme) = pseudo.scheme.take() {
return Some(Scheme(scheme));
}
if let Some(path) = pseudo.path.take() { if let Some(path) = pseudo.path.take() {
return Some(Path(path)); return Some(Path(path));

View File

@@ -121,11 +121,9 @@ impl Settings {
self.header_table_size self.header_table_size
} }
/*
pub fn set_header_table_size(&mut self, size: Option<u32>) { pub fn set_header_table_size(&mut self, size: Option<u32>) {
self.header_table_size = size; self.header_table_size = size;
} }
*/
pub fn load(head: Head, payload: &[u8]) -> Result<Settings, Error> { pub fn load(head: Head, payload: &[u8]) -> Result<Settings, Error> {
use self::Setting::*; use self::Setting::*;

View File

@@ -60,6 +60,10 @@ impl Settings {
codec.set_max_recv_header_list_size(max as usize); codec.set_max_recv_header_list_size(max as usize);
} }
if let Some(val) = local.header_table_size() {
codec.set_recv_header_table_size(val as usize);
}
streams.apply_local_settings(local)?; streams.apply_local_settings(local)?;
self.local = Local::Synced; self.local = Local::Synced;
Ok(()) Ok(())

View File

@@ -372,6 +372,11 @@ impl Mock<frame::Settings> {
self.0.set_enable_connect_protocol(Some(val)); self.0.set_enable_connect_protocol(Some(val));
self self
} }
pub fn header_table_size(mut self, val: u32) -> Self {
self.0.set_header_table_size(Some(val));
self
}
} }
impl From<Mock<frame::Settings>> for frame::Settings { impl From<Mock<frame::Settings>> for frame::Settings {

View File

@@ -1452,6 +1452,40 @@ async fn extended_connect_request() {
join(srv, h2).await; join(srv, h2).await;
} }
#[tokio::test]
async fn client_builder_header_table_size() {
h2_support::trace_init!();
let (io, mut srv) = mock::new();
let mut settings = frame::Settings::default();
settings.set_header_table_size(Some(10000));
let srv = async move {
let recv_settings = srv.assert_client_handshake().await;
assert_frame_eq(recv_settings, settings);
srv.recv_frame(
frames::headers(1)
.request("GET", "https://example.com/")
.eos(),
)
.await;
srv.send_frame(frames::headers(1).response(200).eos()).await;
};
let mut builder = client::Builder::new();
builder.header_table_size(10000);
let h2 = async move {
let (mut client, mut h2) = builder.handshake::<_, Bytes>(io).await.unwrap();
let request = Request::get("https://example.com/").body(()).unwrap();
let (response, _) = client.send_request(request, true).unwrap();
h2.drive(response).await.unwrap();
};
join(srv, h2).await;
}
const SETTINGS: &'static [u8] = &[0, 0, 0, 4, 0, 0, 0, 0, 0]; const SETTINGS: &'static [u8] = &[0, 0, 0, 4, 0, 0, 0, 0, 0];
const SETTINGS_ACK: &'static [u8] = &[0, 0, 0, 4, 1, 0, 0, 0, 0]; const SETTINGS_ACK: &'static [u8] = &[0, 0, 0, 4, 1, 0, 0, 0, 0];