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

Add comments for concept-headers-append

Browse source
This commit is contained in:
2shiori17 2023-03-21 17:15:57 +09:00
parent 74ecc2bd64
commit 80a140e82f
1 changed files with 32 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -65,7 +65,11 @@ impl Headers {
impl HeadersMethods for Headers { impl HeadersMethods for Headers {
// https://fetch.spec.whatwg.org/#concept-headers-append // https://fetch.spec.whatwg.org/#concept-headers-append
fn Append(&self, name: ByteString, value: ByteString) -> ErrorResult { fn Append(&self, name: ByteString, value: ByteString) -> ErrorResult {
// Step 1
let value = normalize_value(value); let value = normalize_value(value);
// Step 2
// https://fetch.spec.whatwg.org/#headers-validate
let (mut valid_name, valid_value) = validate_name_and_value(name, value)?; let (mut valid_name, valid_value) = validate_name_and_value(name, value)?;
valid_name = valid_name.to_lowercase(); valid_name = valid_name.to_lowercase();
@ -79,6 +83,7 @@ impl HeadersMethods for Headers {
return Ok(()); return Ok(());
} }
// Step 3
if self.guard.get() == Guard::RequestNoCors { if self.guard.get() == Guard::RequestNoCors {
let tmp_value = if let Some(value) = let tmp_value = if let Some(value) =
get_value_from_header_list(&valid_name, &self.header_list.borrow()) get_value_from_header_list(&valid_name, &self.header_list.borrow())
@ -96,11 +101,25 @@ impl HeadersMethods for Headers {
} }
} }
if self.guard.get() != Guard::RequestNoCors || valid_name != "range" { // Step 4
self.header_list.borrow_mut().append( match HeaderValue::from_bytes(&valid_value) {
HeaderName::from_str(&valid_name).unwrap(), Ok(value) => {
HeaderValue::from_bytes(&valid_value).unwrap(), self.header_list
.borrow_mut()
.append(HeaderName::from_str(&valid_name).unwrap(), value);
},
Err(_) => {
// can't add the header, but we don't need to panic the browser over it
warn!(
"Servo thinks \"{:?}\" is a valid HTTP header value but HeaderValue doesn't.",
valid_value
); );
},
};
// Step 5
if self.guard.get() != Guard::RequestNoCors {
self.remove_privileged_no_cors_request_headers();
} }
Ok(()) Ok(())
@ -282,16 +301,20 @@ impl Headers {
for value in borrowed_header_list.get_all(name).iter() { for value in borrowed_header_list.get_all(name).iter() {
header_vec.push((name.to_owned(), value.as_bytes().to_vec())); header_vec.push((name.to_owned(), value.as_bytes().to_vec()));
} }
} else { } else if let Some(value) = get_value_from_header_list(name, &borrowed_header_list) {
if let Some(value) = get_value_from_header_list(name, &borrowed_header_list) {
header_vec.push((name.to_owned(), value.as_bytes().to_vec())); header_vec.push((name.to_owned(), value.as_bytes().to_vec()));
} }
} }
}
header_vec.sort_by(|a, b| a.0.cmp(&b.0)); header_vec.sort_by(|a, b| a.0.cmp(&b.0));
header_vec header_vec
} }
// https://fetch.spec.whatwg.org/#ref-for-privileged-no-cors-request-header-name
pub fn remove_privileged_no_cors_request_headers(&self) {
// https://fetch.spec.whatwg.org/#privileged-no-cors-request-header-name
self.header_list.borrow_mut().remove("range");
}
} }
impl Iterable for Headers { impl Iterable for Headers {