diff options
author | 2shiori17 <98276492+2shiori17@users.noreply.github.com> | 2023-03-26 19:57:39 +0900 |
---|---|---|
committer | 2shiori17 <98276492+2shiori17@users.noreply.github.com> | 2023-03-26 19:57:39 +0900 |
commit | b6e4e44ccf4c963e03cc47e5a623ac95b8290970 (patch) | |
tree | b7102f70493fe2657c587bf36c4ac0ea18ce507b /components/net/fetch | |
parent | d6d48510d9ede472f789a83b68ba8c5437f0de49 (diff) | |
download | servo-b6e4e44ccf4c963e03cc47e5a623ac95b8290970.tar.gz servo-b6e4e44ccf4c963e03cc47e5a623ac95b8290970.zip |
Fix return value of concept-header-list-get to Option<Vec<u8>>
Diffstat (limited to 'components/net/fetch')
-rw-r--r-- | components/net/fetch/headers.rs | 30 |
1 files changed, 17 insertions, 13 deletions
diff --git a/components/net/fetch/headers.rs b/components/net/fetch/headers.rs index 8a31d68738b..e88fe641866 100644 --- a/components/net/fetch/headers.rs +++ b/components/net/fetch/headers.rs @@ -26,49 +26,53 @@ fn get_header_value_as_list(name: &str, headers: &HeaderMap) -> Option<Vec<Strin return c != '\u{0022}' && c != '\u{002C}'; } + // https://fetch.spec.whatwg.org/#header-value-get-decode-and-split // Step 1 let initial_value = get_value_from_header_list(name, headers); if let Some(input) = initial_value { - // Step 4 - let mut position = input.chars().peekable(); + // Step 1 + let input = input.into_iter().map(|u| char::from(u)).collect::<String>(); - // Step 5 + // Step 2 + let mut position = s.chars().peekable(); + + // Step 3 let mut values: Vec<String> = vec![]; - // Step 6 + // Step 4 let mut value = String::new(); - // Step 7 + // Step 5 while position.peek().is_some() { - // Step 7.1 + // Step 5.1 value += &*collect_sequence(&mut position, char_is_not_quote_or_comma); - // Step 7.2 + // Step 5.2 if let Some(&ch) = position.peek() { if ch == '\u{0022}' { - // Step 7.2.1.1 + // Step 5.2.1.1 value += &*collect_http_quoted_string(&mut position, false); - // Step 7.2.1.2 + // Step 5.2.1.2 if position.peek().is_some() { continue; } } else { // ch == '\u{002C}' - // Step 7.2.2.2 + // Step 5.2.2.2 position.next(); } } - // Step 7.3 + // Step 5.3 value = value.trim_matches(HTTP_TAB_OR_SPACE).to_string(); - // Step 7.4 + // Step 5.4 values.push(value); - // Step 7.5 + // Step 5.5 value = String::new(); } |