diff options
| author | Ali Mohammad Pur <ali.mpfard@gmail.com> | 2021-09-30 12:19:54 +0330 |
|---|---|---|
| committer | Andreas Kling <kling@serenityos.org> | 2021-09-30 11:46:37 +0200 |
| commit | b0a9c5673e7a8a100ddd827b780abe7d284802c1 (patch) | |
| tree | 282c91f61d3f2f11f8661a193a27a8e4a7fc5ad8 /Userland/Libraries/LibGemini | |
| parent | d16131b100aaf74e2d69207aea2c8a586bec6f1e (diff) | |
| download | serenity-b0a9c5673e7a8a100ddd827b780abe7d284802c1.zip | |
LibHTTP: Respect the 'Connection: close' header on keep-alive jobs
If the server responds with this header, we _must_ close the connection,
as the server is allowed to ignore the socket and not respond to
anything past that response.
Fixes some RequestServer spins.
Diffstat (limited to 'Userland/Libraries/LibGemini')
| -rw-r--r-- | Userland/Libraries/LibGemini/GeminiJob.cpp | 12 | ||||
| -rw-r--r-- | Userland/Libraries/LibGemini/GeminiJob.h | 2 | ||||
| -rw-r--r-- | Userland/Libraries/LibGemini/Job.h | 2 |
3 files changed, 10 insertions, 6 deletions
diff --git a/Userland/Libraries/LibGemini/GeminiJob.cpp b/Userland/Libraries/LibGemini/GeminiJob.cpp index 64ff2dbee2..b459d81afd 100644 --- a/Userland/Libraries/LibGemini/GeminiJob.cpp +++ b/Userland/Libraries/LibGemini/GeminiJob.cpp @@ -58,13 +58,17 @@ void GeminiJob::start(NonnullRefPtr<Core::Socket> socket) } } -void GeminiJob::shutdown() +void GeminiJob::shutdown(ShutdownMode mode) { if (!m_socket) return; - m_socket->on_tls_ready_to_read = nullptr; - m_socket->on_tls_connected = nullptr; - m_socket = nullptr; + if (mode == ShutdownMode::CloseSocket) { + m_socket->close(); + } else { + m_socket->on_tls_ready_to_read = nullptr; + m_socket->on_tls_connected = nullptr; + m_socket = nullptr; + } } void GeminiJob::read_while_data_available(Function<IterationDecision()> read) diff --git a/Userland/Libraries/LibGemini/GeminiJob.h b/Userland/Libraries/LibGemini/GeminiJob.h index 20cc8afcf9..7cad08473d 100644 --- a/Userland/Libraries/LibGemini/GeminiJob.h +++ b/Userland/Libraries/LibGemini/GeminiJob.h @@ -28,7 +28,7 @@ public: } virtual void start(NonnullRefPtr<Core::Socket>) override; - virtual void shutdown() override; + virtual void shutdown(ShutdownMode) override; void set_certificate(String certificate, String key); Core::Socket const* socket() const { return m_socket; } diff --git a/Userland/Libraries/LibGemini/Job.h b/Userland/Libraries/LibGemini/Job.h index 5bc50216f7..d8e2167385 100644 --- a/Userland/Libraries/LibGemini/Job.h +++ b/Userland/Libraries/LibGemini/Job.h @@ -20,7 +20,7 @@ public: virtual ~Job() override; virtual void start(NonnullRefPtr<Core::Socket>) override = 0; - virtual void shutdown() override = 0; + virtual void shutdown(ShutdownMode) override = 0; GeminiResponse* response() { return static_cast<GeminiResponse*>(Core::NetworkJob::response()); } const GeminiResponse* response() const { return static_cast<const GeminiResponse*>(Core::NetworkJob::response()); } |