mirror of
https://github.com/mastodon/mastodon.git
synced 2024-12-22 17:35:40 +01:00
Consume up to 1 MB of remaining response
This commit is contained in:
parent
390cf34816
commit
b07e6d2f5d
2 changed files with 15 additions and 6 deletions
|
@ -113,6 +113,7 @@ class Request
|
|||
begin
|
||||
yield response if block_given?
|
||||
ensure
|
||||
response.truncated_body if http_client.persistent? && !response.connection.finished_request?
|
||||
http_client.close unless http_client.persistent? && response.connection.finished_request?
|
||||
end
|
||||
end
|
||||
|
|
|
@ -99,30 +99,38 @@ RSpec.describe Request do
|
|||
end
|
||||
|
||||
context 'with persistent connection' do
|
||||
before { stub_request(:get, 'http://example.com').to_return(body: SecureRandom.random_bytes(100.kilobytes)) }
|
||||
before { stub_request(:get, 'http://example.com').to_return(body: SecureRandom.random_bytes(2.megabytes)) }
|
||||
|
||||
let(:http_client) { described_class.http_client.persistent('http://example.com') }
|
||||
let(:options) { { http_client: http_client } }
|
||||
|
||||
it 'leaves connection open after complete response' do
|
||||
it 'leaves connection open after completely consumed response' do
|
||||
allow(http_client).to receive(:close)
|
||||
|
||||
subject.perform(&:truncated_body)
|
||||
subject.perform { |response| response.truncated_body(3.megabytes) }
|
||||
|
||||
expect(http_client).to_not have_received(:close)
|
||||
end
|
||||
|
||||
it 'closes connection after aborted response' do
|
||||
it 'leaves connection open after nearly consumed response' do
|
||||
allow(http_client).to receive(:close)
|
||||
|
||||
subject.perform { |response| response.truncated_body(1.kilobyte) }
|
||||
subject.perform { |response| response.truncated_body(1.8.megabytes) }
|
||||
|
||||
expect(http_client).to_not have_received(:close)
|
||||
end
|
||||
|
||||
it 'closes connection after unconsumed response' do
|
||||
allow(http_client).to receive(:close)
|
||||
|
||||
subject.perform
|
||||
|
||||
expect(http_client).to have_received(:close)
|
||||
end
|
||||
|
||||
it 'yields response' do
|
||||
subject.perform do |response|
|
||||
expect(response.body_with_limit.size).to eq 100.kilobytes
|
||||
expect(response.body_with_limit(2.megabytes).size).to eq 2.megabytes
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
Loading…
Reference in a new issue