diff options
| author | Erik Johnston <erik@matrix.org> | 2015-11-17 14:37:13 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2015-11-17 14:37:13 +0000 |
| commit | 0186aef81421111ead4577debafcada211ddd0c3 (patch) | |
| tree | 2c8bfa0a7d9276b54ed2503926240015dfa47ea1 /synapse/federation/federation_client.py | |
| parent | Bump version and change log (diff) | |
| parent | Merge pull request #349 from stevenhammerton/sh-cas-auth-via-homeserver (diff) | |
| download | synapse-0186aef81421111ead4577debafcada211ddd0c3.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.11.0
Diffstat (limited to 'synapse/federation/federation_client.py')
| -rw-r--r-- | synapse/federation/federation_client.py | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/synapse/federation/federation_client.py b/synapse/federation/federation_client.py index d4f586fae7..c6a8c1249a 100644 --- a/synapse/federation/federation_client.py +++ b/synapse/federation/federation_client.py @@ -401,6 +401,12 @@ class FederationClient(FederationBase): pdu_dict["content"].update(content) + # The protoevent received over the JSON wire may not have all + # the required fields. Lets just gloss over that because + # there's some we never care about + if "prev_state" not in pdu_dict: + pdu_dict["prev_state"] = [] + defer.returnValue( (destination, self.event_from_pdu_json(pdu_dict)) ) |