diff options
| author | Erik Johnston <erik@matrix.org> | 2019-10-10 13:10:57 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2019-10-10 13:10:57 +0100 |
| commit | 91f43dca3939cd6ccbc90d19a284d00f6e14fd7c (patch) | |
| tree | cb15ddf14a01a0e67b9eaf91b482d65bf2057f4e /synapse/federation/transport/server.py | |
| parent | Newsfile (diff) | |
| parent | Add domain validation when creating room with list of invitees (#6121) (diff) | |
| download | synapse-91f43dca3939cd6ccbc90d19a284d00f6e14fd7c.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/disable_sql_bytes
Diffstat (limited to 'synapse/federation/transport/server.py')
| -rw-r--r-- | synapse/federation/transport/server.py | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/synapse/federation/transport/server.py b/synapse/federation/transport/server.py index 7f8a16e355..0f16f21c2d 100644 --- a/synapse/federation/transport/server.py +++ b/synapse/federation/transport/server.py @@ -765,6 +765,10 @@ class PublicRoomList(BaseFederationServlet): else: network_tuple = ThirdPartyInstanceID(None, None) + if limit == 0: + # zero is a special value which corresponds to no limit. + limit = None + data = await maybeDeferred( self.handler.get_local_public_room_list, limit, @@ -800,6 +804,10 @@ class PublicRoomList(BaseFederationServlet): if search_filter is None: logger.warning("Nonefilter") + if limit == 0: + # zero is a special value which corresponds to no limit. + limit = None + data = await self.handler.get_local_public_room_list( limit=limit, since_token=since_token, |