From 51fd53294091bcfc45d42dad24cb24e7b24fbd72 Mon Sep 17 00:00:00 2001
From: Neil Alexander <neilalexander@users.noreply.github.com>
Date: Tue, 7 Jul 2020 16:53:10 +0100
Subject: [PATCH] Fix error handling in federationsender

---
 federationsender/queue/destinationqueue.go | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/federationsender/queue/destinationqueue.go b/federationsender/queue/destinationqueue.go
index 845600c9f..2e5916e83 100644
--- a/federationsender/queue/destinationqueue.go
+++ b/federationsender/queue/destinationqueue.go
@@ -397,15 +397,8 @@ func (oq *destinationQueue) nextTransaction(
 		}
 		return true, nil
 	case gomatrix.HTTPError:
-		// We received a HTTP error back. In this instance we only
-		// should report an error if
-		if e.Code >= 400 && e.Code <= 499 {
-			// We tried but the remote side has sent back a client error.
-			// It's no use retrying because it will happen again.
-			return true, nil
-		}
-		// Otherwise, report that we failed to send the transaction
-		// and we will retry again.
+		// Report that we failed to send the transaction and we
+		// will retry again, subject to backoff.
 		return false, err
 	default:
 		log.WithFields(log.Fields{