diff options
| author | Eugen Rochko <eugen@zeonfederated.com> | 2017-05-03 17:02:18 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-03 17:02:18 +0200 |
| commit | bafd22ecf487774c252a271d668716b0e1c84c6c (patch) | |
| tree | bda1f7d712b3d0094595b56261a36b38034d345b /app/controllers/api/subscriptions_controller.rb | |
| parent | dd9d57300ba3b6df91ef6398d8c369437cc2a9c7 (diff) | |
Fix #2706 - Always respond with 200 to PuSH payloads (#2733)
Fix #2196 - Respond with 201 when Salmon accepted, 400 when unverified Fix #2629 - Correctly handle confirm_domain? for local accounts Unify rules for extracting author acct from XML, prefer <email>, fall back to <name> + <uri> (see also #2017, #2172)
Diffstat (limited to 'app/controllers/api/subscriptions_controller.rb')
| -rw-r--r-- | app/controllers/api/subscriptions_controller.rb | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/app/controllers/api/subscriptions_controller.rb b/app/controllers/api/subscriptions_controller.rb index 51c476436..135a5632e 100644 --- a/app/controllers/api/subscriptions_controller.rb +++ b/app/controllers/api/subscriptions_controller.rb @@ -19,10 +19,9 @@ class Api::SubscriptionsController < ApiController if subscription.verify(body, request.headers['HTTP_X_HUB_SIGNATURE']) ProcessingWorker.perform_async(@account.id, body.force_encoding('UTF-8')) - head 201 - else - head 202 end + + head 200 end private |