Exclude rejected state events when calculating state at backwards ext…

…rems (#6527)

* commit 'bbb75ff6e':
  Exclude rejected state events when calculating state at backwards extrems (#6527)

synapse/handlers/federation.py

@@ -601,7 +601,7 @@ def _get_state_for_room(
             remote_event = event_map.get(event_id)
             if not remote_event:
                 raise Exception("Unable to get missing prev_event %s" % (event_id,))
-            if remote_event.is_state():
+            if remote_event.is_state() and remote_event.rejected_reason is None:
                 remote_state.append(remote_event)
 
         auth_chain = [event_map[e_id] for e_id in auth_event_ids if e_id in event_map]