From aee10768d8a9bf6c3df80859d2c135607aa1bf80 Mon Sep 17 00:00:00 2001
From: Patrick Cloke <patrickc@matrix.org>
Date: Tue, 2 Mar 2021 09:43:34 -0500
Subject: Revert "Fix #8518 (sync requests being cached wrongly on timeout)
 (#9358)"

This reverts commit f5c93fc9931e4029bbd8000f398b6f39d67a8c46.

This is being backed out due to a regression (#9507) and additional
review feedback being provided.
---
 synapse/handlers/sync.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'synapse/handlers')

diff --git a/synapse/handlers/sync.py b/synapse/handlers/sync.py
index ce644e01ad..4e8ed7b33f 100644
--- a/synapse/handlers/sync.py
+++ b/synapse/handlers/sync.py
@@ -277,9 +277,8 @@ class SyncHandler:
         user_id = sync_config.user.to_string()
         await self.auth.check_auth_blocking(requester=requester)
 
-        res = await self.response_cache.wrap_conditional(
+        res = await self.response_cache.wrap(
             sync_config.request_key,
-            lambda result: since_token != result.next_batch,
             self._wait_for_sync_for_user,
             sync_config,
             since_token,
-- 
cgit 1.4.1