Skip to content

Add header casing public API #3971

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+47 −24
Open

Add header casing public API #3971

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
27 changes: 15 additions & 12 deletions src/ext/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,8 @@ use bytes::Bytes;
))]
use http::header::HeaderName;
#[cfg(all(any(feature = "client", feature = "server"), feature = "http1"))]
use http::header::InvalidHeaderName;
#[cfg(all(any(feature = "client", feature = "server"), feature = "http1"))]
use http::header::{HeaderMap, IntoHeaderName, ValueIter};
#[cfg(feature = "ffi")]
use std::collections::HashMap;
Expand Down Expand Up @@ -157,15 +159,15 @@ impl fmt::Debug for Protocol {
///
/// [`preserve_header_case`]: /client/struct.Client.html#method.preserve_header_case
#[cfg(all(any(feature = "client", feature = "server"), feature = "http1"))]
#[derive(Clone, Debug)]
pub(crate) struct HeaderCaseMap(HeaderMap<Bytes>);
#[derive(Clone, Debug, Default)]
pub struct HeaderCaseMap(HeaderMap<Bytes>);

#[cfg(all(any(feature = "client", feature = "server"), feature = "http1"))]
impl HeaderCaseMap {
/// Returns a view of all spellings associated with that header name,
/// in the order they were found.
#[cfg(feature = "client")]
pub(crate) fn get_all<'a>(
pub fn get_all<'a>(
&'a self,
name: &HeaderName,
) -> impl Iterator<Item = impl AsRef<[u8]> + 'a> + 'a {
Expand All @@ -179,22 +181,23 @@ impl HeaderCaseMap {
self.0.get_all(name).into_iter()
}

#[cfg(any(feature = "client", feature = "server"))]
pub(crate) fn default() -> Self {
Self(Default::default())
}

#[cfg(any(test, feature = "ffi"))]
pub(crate) fn insert(&mut self, name: HeaderName, orig: Bytes) {
/// Inserts a header spelling, replacing any existing ones associated with that header name.
#[cfg(all(any(feature = "client", feature = "server"), feature = "http1"))]
pub fn insert(&mut self, name: HeaderName, orig: Bytes) -> Result<(), InvalidHeaderName> {
HeaderName::from_bytes(&orig)?;
self.0.insert(name, orig);
Ok(())
}

#[cfg(any(feature = "client", feature = "server"))]
pub(crate) fn append<N>(&mut self, name: N, orig: Bytes)
/// Inserts a header spelling in addition to any existing ones associated with that header name.
#[cfg(all(any(feature = "client", feature = "server"), feature = "http1"))]
pub fn append<N>(&mut self, name: N, orig: Bytes) -> Result<(), InvalidHeaderName>
where
N: IntoHeaderName,
{
HeaderName::from_bytes(&orig)?;
self.0.append(name, orig);
Ok(())
}
}

Expand Down
4 changes: 2 additions & 2 deletions src/ffi/http_types.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -513,7 +513,7 @@ ffi_fn! {
match unsafe { raw_name_value(name, name_len, value, value_len) } {
Ok((name, value, orig_name)) => {
headers.headers.insert(&name, value);
headers.orig_casing.insert(name.clone(), orig_name.clone());
headers.orig_casing.insert(name.clone(), orig_name.clone()).unwrap();
headers.orig_order.insert(name);
hyper_code::HYPERE_OK
}
Expand All @@ -533,7 +533,7 @@ ffi_fn! {
match unsafe { raw_name_value(name, name_len, value, value_len) } {
Ok((name, value, orig_name)) => {
headers.headers.append(&name, value);
headers.orig_casing.append(&name, orig_name.clone());
headers.orig_casing.append(&name, orig_name.clone()).unwrap();
headers.orig_order.append(name);
hyper_code::HYPERE_OK
}
Expand Down
40 changes: 30 additions & 10 deletions src/proto/h1/role.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -315,7 +315,9 @@ impl Http1Transaction for Server {
}

if let Some(ref mut header_case_map) = header_case_map {
header_case_map.append(&name, slice.slice(header.name.0..header.name.1));
header_case_map
.append(&name, slice.slice(header.name.0..header.name.1))
.unwrap();
}

#[cfg(feature = "ffi")]
Expand Down Expand Up @@ -1106,7 +1108,9 @@ impl Http1Transaction for Client {
}

if let Some(ref mut header_case_map) = header_case_map {
header_case_map.append(&name, slice.slice(header.name.0..header.name.1));
header_case_map
.append(&name, slice.slice(header.name.0..header.name.1))
.unwrap();
}

#[cfg(feature = "ffi")]
Expand Down Expand Up @@ -2487,7 +2491,9 @@ mod tests {
.insert("content-type", HeaderValue::from_static("application/json"));

let mut orig_headers = HeaderCaseMap::default();
orig_headers.insert(CONTENT_LENGTH, "CONTENT-LENGTH".into());
orig_headers
.insert(CONTENT_LENGTH, "CONTENT-LENGTH".into())
.unwrap();
head.extensions.insert(orig_headers);

let mut vec = Vec::new();
Expand Down Expand Up @@ -2524,7 +2530,9 @@ mod tests {
.insert("content-type", HeaderValue::from_static("application/json"));

let mut orig_headers = HeaderCaseMap::default();
orig_headers.insert(CONTENT_LENGTH, "CONTENT-LENGTH".into());
orig_headers
.insert(CONTENT_LENGTH, "CONTENT-LENGTH".into())
.unwrap();
head.extensions.insert(orig_headers);

let mut vec = Vec::new();
Expand Down Expand Up @@ -2619,7 +2627,9 @@ mod tests {
.insert("content-type", HeaderValue::from_static("application/json"));

let mut orig_headers = HeaderCaseMap::default();
orig_headers.insert(CONTENT_LENGTH, "CONTENT-LENGTH".into());
orig_headers
.insert(CONTENT_LENGTH, "CONTENT-LENGTH".into())
.unwrap();
head.extensions.insert(orig_headers);

let mut vec = Vec::new();
Expand Down Expand Up @@ -2655,7 +2665,9 @@ mod tests {
.insert("content-type", HeaderValue::from_static("application/json"));

let mut orig_headers = HeaderCaseMap::default();
orig_headers.insert(CONTENT_LENGTH, "CONTENT-LENGTH".into());
orig_headers
.insert(CONTENT_LENGTH, "CONTENT-LENGTH".into())
.unwrap();
head.extensions.insert(orig_headers);

let mut vec = Vec::new();
Expand Down Expand Up @@ -2692,7 +2704,9 @@ mod tests {
.insert("content-type", HeaderValue::from_static("application/json"));

let mut orig_headers = HeaderCaseMap::default();
orig_headers.insert(CONTENT_LENGTH, "CONTENT-LENGTH".into());
orig_headers
.insert(CONTENT_LENGTH, "CONTENT-LENGTH".into())
.unwrap();
head.extensions.insert(orig_headers);

let mut vec = Vec::new();
Expand Down Expand Up @@ -2897,7 +2911,9 @@ mod tests {
let name = http::header::HeaderName::from_static("x-empty");
headers.insert(&name, "".parse().expect("parse empty"));
let mut orig_cases = HeaderCaseMap::default();
orig_cases.insert(name, Bytes::from_static(b"X-EmptY"));
orig_cases
.insert(name, Bytes::from_static(b"X-EmptY"))
.unwrap();

let mut dst = Vec::new();
super::write_headers_original_case(&headers, &orig_cases, &mut dst, false);
Expand All @@ -2916,8 +2932,12 @@ mod tests {
headers.append(&name, "b".parse().unwrap());

let mut orig_cases = HeaderCaseMap::default();
orig_cases.insert(name.clone(), Bytes::from_static(b"X-Empty"));
orig_cases.append(name, Bytes::from_static(b"X-EMPTY"));
orig_cases
.insert(name.clone(), Bytes::from_static(b"X-Empty"))
.unwrap();
orig_cases
.append(name, Bytes::from_static(b"X-EMPTY"))
.unwrap();

let mut dst = Vec::new();
super::write_headers_original_case(&headers, &orig_cases, &mut dst, false);
Expand Down