mirrors/ntex
1
0
Fork 0
mirror of https://github.com/ntex-rs/ntex.git synced 2025-04-04 21:37:58 +03:00
Code Issues Projects Releases Packages Wiki Activity

Keep multi header values order

Browse source
This commit is contained in:
Nikolay Kim 2022-11-24 14:38:54 +01:00
parent ce16bfa1b2
commit 427e78d385
3 changed files with 24 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

4
ntex-http/CHANGES.md
View file

@ -1,5 +1,9 @@
# Changes # Changes
## [0.1.7] - 2022-11-24
* Keep multi header values order #145
## [0.1.6] - 2022-11-10 ## [0.1.6] - 2022-11-10
* Add From<HeaderValue> impl for Value, allow to use HeaderMap::collect() * Add From<HeaderValue> impl for Value, allow to use HeaderMap::collect()

2
ntex-http/Cargo.toml
View file

@ -1,6 +1,6 @@
[package] [package]
name = "ntex-http" name = "ntex-http"
version = "0.1.6" version = "0.1.7"
authors = ["ntex contributors <team@ntex.rs>"] authors = ["ntex contributors <team@ntex.rs>"]
description = "Http types for ntex framework" description = "Http types for ntex framework"
keywords = ["network", "framework", "async", "futures"] keywords = ["network", "framework", "async", "futures"]

28
ntex-http/src/map.rs
View file

@ -1,4 +1,4 @@
use std::collections::{self, hash_map, hash_map::Entry}; use std::collections::{self, hash_map, hash_map::Entry, VecDeque};
use std::{convert::TryFrom, iter::FromIterator}; use std::{convert::TryFrom, iter::FromIterator};
use crate::{HeaderName, HeaderValue}; use crate::{HeaderName, HeaderValue};
@ -28,7 +28,7 @@ pub struct HeaderMap {
#[derive(Debug, Clone, PartialEq, Eq)] #[derive(Debug, Clone, PartialEq, Eq)]
pub enum Value { pub enum Value {
One(HeaderValue), One(HeaderValue),
Multi(Vec<HeaderValue>), Multi(VecDeque<HeaderValue>),
} }
impl Value { impl Value {
@ -50,13 +50,15 @@ impl Value {
match self { match self {
Value::One(prev_val) => { Value::One(prev_val) => {
let prev_val = std::mem::replace(prev_val, val); let prev_val = std::mem::replace(prev_val, val);
let data = std::mem::replace(self, Value::Multi(vec![prev_val])); let mut val = VecDeque::new();
val.push_back(prev_val);
let data = std::mem::replace(self, Value::Multi(val));
match data { match data {
Value::One(val) => self.append(val), Value::One(val) => self.append(val),
Value::Multi(_) => unreachable!(), Value::Multi(_) => unreachable!(),
} }
} }
Value::Multi(ref mut vec) => vec.push(val), Value::Multi(ref mut vec) => vec.push_back(val),
} }
} }
} }
@ -67,18 +69,23 @@ pub struct ValueIntoIter {
impl Iterator for ValueIntoIter { impl Iterator for ValueIntoIter {
type Item = HeaderValue; type Item = HeaderValue;
fn next(&mut self) -> Option<Self::Item> { fn next(&mut self) -> Option<Self::Item> {
match &mut self.value { match &mut self.value {
Value::One(_) => { Value::One(_) => {
let val = std::mem::replace(&mut self.value, Value::Multi(Vec::new())); let val = std::mem::replace(
&mut self.value,
Value::Multi(VecDeque::with_capacity(0)),
);
match val { match val {
Value::One(val) => Some(val), Value::One(val) => Some(val),
_ => unreachable!(), _ => unreachable!(),
} }
} }
Value::Multi(vec) => vec.pop(), Value::Multi(vec) => vec.pop_front(),
} }
} }
fn size_hint(&self) -> (usize, Option<usize>) { fn size_hint(&self) -> (usize, Option<usize>) {
match self.value { match self.value {
Value::One(_) => (1, None), Value::One(_) => (1, None),
@ -90,6 +97,7 @@ impl Iterator for ValueIntoIter {
impl IntoIterator for Value { impl IntoIterator for Value {
type Item = HeaderValue; type Item = HeaderValue;
type IntoIter = ValueIntoIter; type IntoIter = ValueIntoIter;
#[inline] #[inline]
fn into_iter(self) -> Self::IntoIter { fn into_iter(self) -> Self::IntoIter {
ValueIntoIter { value: self } ValueIntoIter { value: self }
@ -374,6 +382,7 @@ impl<N: std::fmt::Display, V> FromIterator<(N, V)> for HeaderMap
where where
HeaderName: TryFrom<N>, HeaderName: TryFrom<N>,
Value: TryFrom<V>, Value: TryFrom<V>,
V: std::fmt::Debug,
{ {
#[inline] #[inline]
#[allow(clippy::mutable_key_type)] #[allow(clippy::mutable_key_type)]
@ -491,7 +500,7 @@ impl<'a> IntoIterator for &'a HeaderMap {
pub struct Iter<'a> { pub struct Iter<'a> {
idx: usize, idx: usize,
current: Option<(&'a HeaderName, &'a Vec<HeaderValue>)>, current: Option<(&'a HeaderName, &'a VecDeque<HeaderValue>)>,
iter: hash_map::Iter<'a, HeaderName, Value>, iter: hash_map::Iter<'a, HeaderName, Value>,
} }
@ -507,6 +516,7 @@ impl<'a> Iter<'a> {
impl<'a> Iterator for Iter<'a> { impl<'a> Iterator for Iter<'a> {
type Item = (&'a HeaderName, &'a HeaderValue); type Item = (&'a HeaderName, &'a HeaderValue);
#[inline] #[inline]
fn next(&mut self) -> Option<(&'a HeaderName, &'a HeaderValue)> { fn next(&mut self) -> Option<(&'a HeaderName, &'a HeaderValue)> {
if let Some(ref mut item) = self.current { if let Some(ref mut item) = self.current {
@ -556,11 +566,11 @@ mod tests {
assert_eq!( assert_eq!(
map.get_all("Accept").collect::<Vec<&HeaderValue>>(), map.get_all("Accept").collect::<Vec<&HeaderValue>>(),
vec![ vec![
&HeaderValue::from_static("image/webp"),
&HeaderValue::from_static("text/html"), &HeaderValue::from_static("text/html"),
&HeaderValue::from_static("application/xml;q=0.9"),
&HeaderValue::from_static("*/*"), &HeaderValue::from_static("*/*"),
&HeaderValue::from_static("application/xhtml+xml"), &HeaderValue::from_static("application/xhtml+xml"),
&HeaderValue::from_static("application/xml;q=0.9"),
&HeaderValue::from_static("image/webp"),
] ]
) )
} }