Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-06 06:00:15 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fix header ordering

Browse source
This commit is contained in:
2shiori17 2023-03-11 20:05:32 +09:00
parent b5b6225850
commit 7d1d387f3d
2 changed files with 8 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

13
components/script/dom/headers.rs
View file

@ -79,7 +79,9 @@ impl HeadersMethods for Headers {
} }
if self.guard.get() == Guard::RequestNoCors { if self.guard.get() == Guard::RequestNoCors {
let tmp_value = if let Some(value) = get_value_from_header_list(&valid_name, &self.header_list.borrow()) { let tmp_value = if let Some(value) =
get_value_from_header_list(&valid_name, &self.header_list.borrow())
{
let mut l = value.as_bytes().to_vec(); let mut l = value.as_bytes().to_vec();
l.extend(b", "); l.extend(b", ");
l.extend(valid_value.clone()); l.extend(valid_value.clone());
@ -94,9 +96,10 @@ impl HeadersMethods for Headers {
} }
if self.guard.get() != Guard::RequestNoCors || valid_name != "range" { if self.guard.get() != Guard::RequestNoCors || valid_name != "range" {
self.header_list self.header_list.borrow_mut().append(
.borrow_mut() HeaderName::from_str(&valid_name).unwrap(),
.append(HeaderName::from_str(&valid_name).unwrap(), HeaderValue::from_bytes(&valid_value).unwrap()); HeaderValue::from_bytes(&valid_value).unwrap(),
);
} }
Ok(()) Ok(())
@ -286,7 +289,7 @@ impl Headers {
} }
} }
header_vec.sort(); header_vec.sort_by(|a, b| a.0.cmp(&b.0));
header_vec header_vec
} }
} }

30
tests/wpt/metadata/fetch/api/headers/header-setcookie.any.js.ini
View file

@ -2,41 +2,11 @@
expected: ERROR expected: ERROR
[header-setcookie.any.worker.html] [header-setcookie.any.worker.html]
[Headers iterator does not combine set-cookie headers]
expected: FAIL
[Headers iterator does not combine set-cookie & set-cookie2 headers]
expected: FAIL
[Headers iterator preserves set-cookie ordering]
expected: FAIL
[Headers iterator preserves per header ordering, but sorts keys alphabetically (and ignores value ordering)]
expected: FAIL
[Headers.prototype.append works for set-cookie]
expected: FAIL
[Headers.prototype.get combines set-cookie headers in order] [Headers.prototype.get combines set-cookie headers in order]
expected: FAIL expected: FAIL
[header-setcookie.any.html] [header-setcookie.any.html]
[Headers iterator does not combine set-cookie headers]
expected: FAIL
[Headers iterator does not combine set-cookie & set-cookie2 headers]
expected: FAIL
[Headers iterator preserves set-cookie ordering]
expected: FAIL
[Headers iterator preserves per header ordering, but sorts keys alphabetically (and ignores value ordering)]
expected: FAIL
[Headers.prototype.append works for set-cookie]
expected: FAIL
[Headers.prototype.get combines set-cookie headers in order] [Headers.prototype.get combines set-cookie headers in order]
expected: FAIL expected: FAIL