gearheads
/
mastodon
Archived
2
0
Fork 0
Code Releases 4 Activity

Flush body when POST requests (#5128)

gh/stable
abcang 2017-09-28 22:04:32 +09:00 committed by Eugen Rochko
parent b9f59ebcc6
commit 3d9b8847d2
5 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/services/send_interaction_service.rb
View File

@ -12,7 +12,7 @@ class SendInteractionService < BaseService
return if !target_account.ostatus? || block_notification? return if !target_account.ostatus? || block_notification?
delivery = build_request.perform delivery = build_request.perform.flush
raise Mastodon::UnexpectedResponseError, delivery unless delivery.code > 199 && delivery.code < 300 raise Mastodon::UnexpectedResponseError, delivery unless delivery.code > 199 && delivery.code < 300
end end

2
app/services/subscribe_service.rb
View File

@ -6,7 +6,7 @@ class SubscribeService < BaseService
@account = account @account = account
@account.secret = SecureRandom.hex @account.secret = SecureRandom.hex
@response = build_request.perform @response = build_request.perform.flush
if response_failed_permanently? if response_failed_permanently?
# We're not allowed to subscribe. Fail and move on. # We're not allowed to subscribe. Fail and move on.

2
app/services/unsubscribe_service.rb
View File

@ -7,7 +7,7 @@ class UnsubscribeService < BaseService
@account = account @account = account
begin begin
@response = build_request.perform @response = build_request.perform.flush
Rails.logger.debug "PuSH unsubscribe for #{@account.acct} failed: #{@response.status}" unless @response.status.success? Rails.logger.debug "PuSH unsubscribe for #{@account.acct} failed: #{@response.status}" unless @response.status.success?
rescue HTTP::Error, OpenSSL::SSL::SSLError => e rescue HTTP::Error, OpenSSL::SSL::SSLError => e

2
app/workers/activitypub/delivery_worker.rb
View File

@ -28,7 +28,7 @@ class ActivityPub::DeliveryWorker
end end
def perform_request def perform_request
@response = build_request.perform @response = build_request.perform.flush
end end
def response_successful? def response_successful?

2
app/workers/pubsubhubbub/delivery_worker.rb
View File

@ -37,7 +37,7 @@ class Pubsubhubbub::DeliveryWorker
def callback_post_payload def callback_post_payload
request = Request.new(:post, subscription.callback_url, body: payload) request = Request.new(:post, subscription.callback_url, body: payload)
request.add_headers(headers) request.add_headers(headers)
request.perform request.perform.flush
end end
def blocked_domain? def blocked_domain?