RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-19 06:57:34 +00:00
Code Issues Activity Actions

LibWeb: Rename XHR::{m_request_headers => m_author_request_headers}

Browse source
This commit is contained in:
Linus Groh 2022-11-13 14:12:07 +00:00
parent 6e53dd8767
commit c8184d85c1
2 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Userland/Libraries/LibWeb/XHR/XMLHttpRequest.cpp
View file

@ -313,14 +313,14 @@ WebIDL::ExceptionOr<void> XMLHttpRequest::set_request_header(String const& name_
// 6. Combine (name, value) in this’s author request headers. // 6. Combine (name, value) in this’s author request headers.
// FIXME: The header name look-up should be case-insensitive. // FIXME: The header name look-up should be case-insensitive.
// FIXME: Headers should be stored as raw byte sequences, not Strings. // FIXME: Headers should be stored as raw byte sequences, not Strings.
if (m_request_headers.contains(StringView { name })) { if (m_author_request_headers.contains(StringView { name })) {
// 1. If list contains name, then set the value of the first such header to its value, // 1. If list contains name, then set the value of the first such header to its value,
// followed by 0x2C 0x20, followed by value. // followed by 0x2C 0x20, followed by value.
auto maybe_header_value = m_request_headers.get(StringView { name }); auto maybe_header_value = m_author_request_headers.get(StringView { name });
m_request_headers.set(StringView { name }, String::formatted("{}, {}", maybe_header_value.release_value(), StringView { name })); m_author_request_headers.set(StringView { name }, String::formatted("{}, {}", maybe_header_value.release_value(), StringView { name }));
} else { } else {
// 2. Otherwise, append (name, value) to list. // 2. Otherwise, append (name, value) to list.
m_request_headers.set(StringView { name }, StringView { value }); m_author_request_headers.set(StringView { name }, StringView { value });
} }
return {}; return {};
@ -397,7 +397,7 @@ WebIDL::ExceptionOr<void> XMLHttpRequest::open(String const& method_string, Stri
// Set this’s synchronous flag if async is false; otherwise unset this’s synchronous flag. // Set this’s synchronous flag if async is false; otherwise unset this’s synchronous flag.
m_synchronous = !async; m_synchronous = !async;
// Empty this’s author request headers. // Empty this’s author request headers.
m_request_headers.clear(); m_author_request_headers.clear();
// FIXME: Set this’s response to a network error. // FIXME: Set this’s response to a network error.
// Set this’s received bytes to the empty byte sequence. // Set this’s received bytes to the empty byte sequence.
m_received_bytes = {}; m_received_bytes = {};
@ -481,14 +481,14 @@ WebIDL::ExceptionOr<void> XMLHttpRequest::send(Optional<DocumentOrXMLHttpRequest
} }
// If this’s headers’s header list does not contain `Content-Type`, then append (`Content-Type`, type) to this’s headers. // If this’s headers’s header list does not contain `Content-Type`, then append (`Content-Type`, type) to this’s headers.
if (!m_request_headers.contains("Content-Type"sv)) { if (!m_author_request_headers.contains("Content-Type"sv)) {
if (body_with_type.has_value() && body_with_type->type.has_value()) { if (body_with_type.has_value() && body_with_type->type.has_value()) {
request.set_header("Content-Type", String { body_with_type->type->span() }); request.set_header("Content-Type", String { body_with_type->type->span() });
} else if (body.has_value() && body->has<JS::Handle<DOM::Document>>()) { } else if (body.has_value() && body->has<JS::Handle<DOM::Document>>()) {
request.set_header("Content-Type", "text/html;charset=UTF-8"); request.set_header("Content-Type", "text/html;charset=UTF-8");
} }
} }
for (auto& it : m_request_headers) for (auto& it : m_author_request_headers)
request.set_header(it.key, it.value); request.set_header(it.key, it.value);
m_upload_complete = false; m_upload_complete = false;

2
Userland/Libraries/LibWeb/XHR/XMLHttpRequest.h
View file

@ -118,7 +118,7 @@ private:
// https://xhr.spec.whatwg.org/#author-request-headers // https://xhr.spec.whatwg.org/#author-request-headers
// author request headers // author request headers
// A header list, initially empty. // A header list, initially empty.
HashMap<String, String, CaseInsensitiveStringTraits> m_request_headers; HashMap<String, String, CaseInsensitiveStringTraits> m_author_request_headers;
// FIXME: https://xhr.spec.whatwg.org/#request-body // FIXME: https://xhr.spec.whatwg.org/#request-body