Stowage/ladybird
2
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2025-12-08 06:09:58 +00:00
Code Issues Projects Releases Packages Wiki Activity

RequestServer: Rename CacheEntryReader::m_headers to m_response_headers

Browse source 
Let's be extra clear what we're talking about here.
This commit is contained in:
Timothy Flynn 2025-10-30 07:24:05 -04:00 • committed by Tim Flynn
parent 20cd19be4d
commit 3d45a209b6
Notes: github-actions[bot] 2025-11-02 18:04:32 +00:00
4 changed files with 14 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

18
Services/RequestServer/Cache/CacheEntry.cpp
View file

@ -103,7 +103,7 @@ CacheEntryWriter::CacheEntryWriter(DiskCache& disk_cache, CacheIndex& index, u64
{ {
} }
ErrorOr<void> CacheEntryWriter::write_status_and_reason(u32 status_code, Optional<String> reason_phrase, HTTP::HeaderMap const& headers) ErrorOr<void> CacheEntryWriter::write_status_and_reason(u32 status_code, Optional<String> reason_phrase, HTTP::HeaderMap const& response_headers)
{ {
if (m_marked_for_deletion) { if (m_marked_for_deletion) {
close_and_destroy_cache_entry(); close_and_destroy_cache_entry();
@ -118,10 +118,10 @@ ErrorOr<void> CacheEntryWriter::write_status_and_reason(u32 status_code, Optiona
} }
auto result = [&]() -> ErrorOr<void> { auto result = [&]() -> ErrorOr<void> {
if (!is_cacheable(status_code, headers)) if (!is_cacheable(status_code, response_headers))
return Error::from_string_literal("Response is not cacheable"); return Error::from_string_literal("Response is not cacheable");
if (auto freshness = calculate_freshness_lifetime(headers); freshness.is_negative() || freshness.is_zero()) if (auto freshness = calculate_freshness_lifetime(response_headers); freshness.is_negative() || freshness.is_zero())
return Error::from_string_literal("Response has already expired"); return Error::from_string_literal("Response has already expired");
TRY(m_file->write_value(m_cache_header)); TRY(m_file->write_value(m_cache_header));
@ -166,7 +166,7 @@ ErrorOr<void> CacheEntryWriter::write_data(ReadonlyBytes data)
return {}; return {};
} }
ErrorOr<void> CacheEntryWriter::flush(HTTP::HeaderMap headers) ErrorOr<void> CacheEntryWriter::flush(HTTP::HeaderMap response_headers)
{ {
ScopeGuard guard { [&]() { close_and_destroy_cache_entry(); } }; ScopeGuard guard { [&]() { close_and_destroy_cache_entry(); } };
@ -180,13 +180,13 @@ ErrorOr<void> CacheEntryWriter::flush(HTTP::HeaderMap headers)
return result.release_error(); return result.release_error();
} }
m_index.create_entry(m_cache_key, m_url, move(headers), m_cache_footer.data_size, m_request_time, m_response_time); m_index.create_entry(m_cache_key, m_url, move(response_headers), m_cache_footer.data_size, m_request_time, m_response_time);
dbgln("\033[34;1mFinished caching\033[0m {} ({} bytes)", m_url, m_cache_footer.data_size); dbgln("\033[34;1mFinished caching\033[0m {} ({} bytes)", m_url, m_cache_footer.data_size);
return {}; return {};
} }
ErrorOr<NonnullOwnPtr<CacheEntryReader>> CacheEntryReader::create(DiskCache& disk_cache, CacheIndex& index, u64 cache_key, HTTP::HeaderMap headers, u64 data_size) ErrorOr<NonnullOwnPtr<CacheEntryReader>> CacheEntryReader::create(DiskCache& disk_cache, CacheIndex& index, u64 cache_key, HTTP::HeaderMap response_headers, u64 data_size)
{ {
auto path = path_for_cache_key(disk_cache.cache_directory(), cache_key); auto path = path_for_cache_key(disk_cache.cache_directory(), cache_key);
@ -226,15 +226,15 @@ ErrorOr<NonnullOwnPtr<CacheEntryReader>> CacheEntryReader::create(DiskCache& dis
auto data_offset = sizeof(CacheHeader) + cache_header.url_size + cache_header.reason_phrase_size; auto data_offset = sizeof(CacheHeader) + cache_header.url_size + cache_header.reason_phrase_size;
return adopt_own(*new CacheEntryReader { disk_cache, index, cache_key, move(url), move(path), move(file), fd, cache_header, move(reason_phrase), move(headers), data_offset, data_size }); return adopt_own(*new CacheEntryReader { disk_cache, index, cache_key, move(url), move(path), move(file), fd, cache_header, move(reason_phrase), move(response_headers), data_offset, data_size });
} }
CacheEntryReader::CacheEntryReader(DiskCache& disk_cache, CacheIndex& index, u64 cache_key, String url, LexicalPath path, NonnullOwnPtr<Core::File> file, int fd, CacheHeader cache_header, Optional<String> reason_phrase, HTTP::HeaderMap header_map, u64 data_offset, u64 data_size) CacheEntryReader::CacheEntryReader(DiskCache& disk_cache, CacheIndex& index, u64 cache_key, String url, LexicalPath path, NonnullOwnPtr<Core::File> file, int fd, CacheHeader cache_header, Optional<String> reason_phrase, HTTP::HeaderMap response_headers, u64 data_offset, u64 data_size)
: CacheEntry(disk_cache, index, cache_key, move(url), move(path), cache_header) : CacheEntry(disk_cache, index, cache_key, move(url), move(path), cache_header)
, m_file(move(file)) , m_file(move(file))
, m_fd(fd) , m_fd(fd)
, m_reason_phrase(move(reason_phrase)) , m_reason_phrase(move(reason_phrase))
, m_headers(move(header_map)) , m_response_headers(move(response_headers))
, m_data_offset(data_offset) , m_data_offset(data_offset)
, m_data_size(data_size) , m_data_size(data_size)
{ {

4
Services/RequestServer/Cache/CacheEntry.h
View file

@ -104,7 +104,7 @@ public:
u32 status_code() const { return m_cache_header.status_code; } u32 status_code() const { return m_cache_header.status_code; }
Optional<String> const& reason_phrase() const { return m_reason_phrase; } Optional<String> const& reason_phrase() const { return m_reason_phrase; }
HTTP::HeaderMap const& headers() const { return m_headers; } HTTP::HeaderMap const& response_headers() const { return m_response_headers; }
private: private:
CacheEntryReader(DiskCache&, CacheIndex&, u64 cache_key, String url, LexicalPath, NonnullOwnPtr<Core::File>, int fd, CacheHeader, Optional<String> reason_phrase, HTTP::HeaderMap, u64 data_offset, u64 data_size); CacheEntryReader(DiskCache&, CacheIndex&, u64 cache_key, String url, LexicalPath, NonnullOwnPtr<Core::File>, int fd, CacheHeader, Optional<String> reason_phrase, HTTP::HeaderMap, u64 data_offset, u64 data_size);
@ -126,7 +126,7 @@ private:
u64 m_bytes_piped { 0 }; u64 m_bytes_piped { 0 };
Optional<String> m_reason_phrase; Optional<String> m_reason_phrase;
HTTP::HeaderMap m_headers; HTTP::HeaderMap m_response_headers;
u64 const m_data_offset { 0 }; u64 const m_data_offset { 0 };
u64 const m_data_size { 0 }; u64 const m_data_size { 0 };

4
Services/RequestServer/Cache/DiskCache.cpp
View file

@ -83,8 +83,8 @@ Variant<Optional<CacheEntryReader&>, DiskCache::CacheHasOpenEntry> DiskCache::op
return Optional<CacheEntryReader&> {}; return Optional<CacheEntryReader&> {};
} }
auto freshness_lifetime = calculate_freshness_lifetime(cache_entry.value()->headers()); auto freshness_lifetime = calculate_freshness_lifetime(cache_entry.value()->response_headers());
auto current_age = calculate_age(cache_entry.value()->headers(), index_entry->request_time, index_entry->response_time); auto current_age = calculate_age(cache_entry.value()->response_headers(), index_entry->request_time, index_entry->response_time);
if (!is_response_fresh(freshness_lifetime, current_age)) { if (!is_response_fresh(freshness_lifetime, current_age)) {
dbgln("\033[33;1mCache entry expired for\033[0m {} (lifetime={}s age={}s)", request.url(), freshness_lifetime.to_seconds(), current_age.to_seconds()); dbgln("\033[33;1mCache entry expired for\033[0m {} (lifetime={}s age={}s)", request.url(), freshness_lifetime.to_seconds(), current_age.to_seconds());

2
Services/RequestServer/Request.cpp
View file

@ -214,7 +214,7 @@ void Request::handle_read_cache_state()
#else #else
m_status_code = m_cache_entry_reader->status_code(); m_status_code = m_cache_entry_reader->status_code();
m_reason_phrase = m_cache_entry_reader->reason_phrase(); m_reason_phrase = m_cache_entry_reader->reason_phrase();
m_response_headers = m_cache_entry_reader->headers(); m_response_headers = m_cache_entry_reader->response_headers();
auto pipe_or_error = RequestPipe::create(); auto pipe_or_error = RequestPipe::create();
if (pipe_or_error.is_error()) { if (pipe_or_error.is_error()) {