Matthew Hodgson
8e82611f37
fix comment
2017-01-05 11:44:44 +00:00
Mark Haines
6028718b1a
Merge pull request #1764 from matrix-org/markjh/fix_send_pdu
...
Only send events that originate on this server.
2017-01-05 11:41:22 +00:00
Mark Haines
f784980d2b
Only send events that originate on this server.
...
Or events that are sent via the federation "send_join" API.
This should match the behaviour from before v0.18.5 and #1635 landed.
2017-01-05 11:26:30 +00:00
Mark Haines
0d766c8ccf
Merge pull request #1758 from matrix-org/markjh/fix_ban_propagation
...
Fix propagation of bans to remote servers.
2017-01-04 15:39:31 +00:00
Mark Haines
e02bdaf08b
Get the destinations from the state from before the event
...
Rather than the state after then event.
2017-01-04 15:17:15 +00:00
Mark Haines
b6b67715ed
Send ALL membership events to the server that was affected.
...
Send all membership changes to the server that was affected.
This ensures that if the last member of a room on a server
was kicked or banned they get told about it.
2017-01-04 13:56:20 +00:00
Matrix
7ed07066ac
Merge branch 'markjh/linearizer_logging' into matrix-org-hotfixes
2017-01-01 13:55:13 +00:00
Matthew Hodgson
555d702e34
limit total timeout for get_missing_events to 10s
2016-12-31 15:21:37 +00:00
Matthew Hodgson
899a3a1268
Merge branch 'release-v0.18.6' into develop
2016-12-31 02:38:26 +00:00
Mark Haines
f3de4f8cb7
Bump version and changelog
2016-12-30 20:21:04 +00:00
Mark Haines
321d5b73d8
Merge pull request #1736 from matrix-org/markjh/linearizer_logging
...
Add more useful logging when we block fetching events
2016-12-30 20:05:12 +00:00
Mark Haines
62ce3034f3
s/aquire/acquire/g
2016-12-30 20:04:44 +00:00
Mark Haines
0aff09f6c9
Add more useful logging when we block fetching events
2016-12-30 20:00:44 +00:00
Mark Haines
48c3b7dc19
Merge pull request #1734 from matrix-org/markjh/fix_get_missing
...
Remove fallback from get_missing_events.
2016-12-30 19:42:11 +00:00
Mark Haines
2f703b8645
Merge branch 'markjh/fix_get_missing' into matrix-org-hotfixes
2016-12-30 18:47:10 +00:00
Mark Haines
cc50b1ae53
Remove fallback from get_missing_events.
...
get_missing_events used to fallback to fetching the missing events
individually requesting from every server in the room, one by one.e
This could be unacceptably slow, possibly causing #1732
2016-12-30 18:13:15 +00:00
Mark Haines
f576c34594
Merge remote-tracking branch 'origin/release-v0.18.6' into develop
2016-12-30 15:13:49 +00:00
Mark Haines
9fff1aacca
Merge remote-tracking branch 'origin/release-v0.18.6' into matrix-org-hotfixes
2016-12-30 14:04:16 +00:00
Mark Haines
0eac4fa525
Merge pull request #1731 from matrix-org/markjh/logging-memleak
...
Use the new twisted logging framework.
2016-12-30 12:52:50 +00:00
Mark Haines
822cb39dfa
Use the new twisted logging framework.
...
Hopefully adding an observer to the new framework will avoid a memory
leak https://twistedmatrix.com/trac/ticket/8164
2016-12-30 11:09:24 +00:00
Mark Haines
342fb8dae9
Merge branch 'release-v0.18.6' into develop
2016-12-29 17:33:46 +00:00
Mark Haines
cb842dc99f
Deleting from event_push_actions needs to use an index
2016-12-29 16:54:03 +00:00
Mark Haines
2238a10b42
Merge branch 'release-v0.18.6' into matrix-org-hotfixes
2016-12-29 16:26:52 +00:00
Mark Haines
f023be9293
Bump changelog and version
2016-12-29 16:18:04 +00:00
Mark Haines
828c58522e
Merge pull request #1725 from matrix-org/erikj/timeout_conn
...
Wrap connections in an N minute timeout to ensure they get reaped correctly
2016-12-29 16:14:57 +00:00
Mark Haines
97ffc5690b
Manually abort the underlying TLS connection.
...
The abort() method calls loseConnection() which tries to shutdown the
TLS connection cleanly. We now call abortConnection() directly which
should promptly close both the TLS connection and the underlying TCP
connection.
I also added some TODO markers to consider cancelling the old previous
timeout rather than checking time.time(). But given how urgently we want
to get this code released I'd rather leave the existing code with the
duplicate timeouts and the time.time() check.
2016-12-29 15:51:04 +00:00
Erik Johnston
b4bc6fef5b
Respect long_retries param and default to off
2016-12-29 00:58:34 +00:00
Erik Johnston
68030fd37b
Spelling and comments
2016-12-29 00:10:49 +00:00
Erik Johnston
b7336ff32d
Clean up
2016-12-29 00:09:33 +00:00
Erik Johnston
5b6672c66d
Wrap connections in an N minute timeout to ensure they get reaped correctly
2016-12-29 00:06:53 +00:00
David Baker
84cf00c645
Fix another comment typo
2016-12-21 09:51:43 +00:00
David Baker
bea15fb599
Merge pull request #1714 from matrix-org/dbkr/delete_threepid
...
Add /account/3pid/delete endpoint
2016-12-21 09:51:04 +00:00
David Baker
0c88ab1844
Add /account/3pid/delete endpoint
...
Also fix a typo in a comment
2016-12-20 18:27:30 +00:00
Matthew Hodgson
2998fa57b0
merge uncommitted changes from matrix.org into hotfixes-v0.18.5
2016-12-20 12:14:08 +00:00
Richard van der Hoff
f5abaafabd
uncommitted changes on matrix.org
...
These might be important? who knows?
2016-12-20 11:49:25 +00:00
Matthew Hodgson
b7f4f902fa
Merge pull request #1712 from kyrias/fix-bind-address-none
...
Fix check for bind_address
2016-12-20 00:41:42 +00:00
Johannes Löthberg
702c020e58
Fix check for bind_address
...
The empty string is a valid setting for the bind_address option, so
explicitly check for None here instead.
Signed-off-by: Johannes Löthberg <johannes@kyriasis.com>
2016-12-20 01:37:50 +01:00
Matthew Hodgson
09f15918be
Merge pull request #1711 from matrix-org/matthew/utf8-password-change
...
fix ability to change password to a non-ascii one
2016-12-20 00:02:13 +00:00
Matthew Hodgson
da2c8f3c94
Merge pull request #1709 from kyrias/bind_addresses
...
Add support for specifying multiple bind addresses
2016-12-19 23:49:34 +00:00
Matthew Hodgson
a58e4e0d48
Merge pull request #1696 from kyrias/ipv6
...
IPv6 support
2016-12-19 23:49:07 +00:00
Matthew Hodgson
f2a5aebf98
fix ability to change password to a non-ascii one
...
https://github.com/vector-im/riot-web/issues/2658
2016-12-18 22:25:21 +00:00
Johannes Löthberg
a9c1b419a9
Bump twisted dependency
...
At least 16.0.0 is needed for wrapClientTLS support.
Signed-off-by: Johannes Löthberg <johannes@kyriasis.com>
2016-12-18 23:16:43 +01:00
Johannes Löthberg
f5cd5ebd7b
Add IPv6 comment to default config
...
Signed-off-by: Johannes Löthberg <johannes@kyriasis.com>
2016-12-18 23:14:32 +01:00
Johannes Löthberg
1859af9b2a
Update README to use bind_addresses
...
Signed-off-by: Johannes Löthberg <johannes@kyriasis.com>
2016-12-18 22:01:34 +01:00
Johannes Löthberg
c95e9fff99
Make default homeserver config use bind_addresses
...
Signed-off-by: Johannes Löthberg <johannes@kyriasis.com>
2016-12-18 21:51:56 +01:00
Johannes Löthberg
7dfd70fc83
Add support for specifying multiple bind addresses
...
Signed-off-by: Johannes Löthberg <johannes@kyriasis.com>
2016-12-18 21:51:56 +01:00
Erik Johnston
b2f8642d3d
Cache network room list queries.
2016-12-16 16:11:43 +00:00
Erik Johnston
f5a4001bb1
Merge branch 'release-v0.18.5' of github.com:matrix-org/synapse
2016-12-16 10:40:10 +00:00
Erik Johnston
b9b6d17ab1
Bump version and changelog
2016-12-16 10:18:02 +00:00
Richard van der Hoff
c824dc727a
Merge pull request #1704 from matrix-org/rav/log_todevice_syncs
...
Add some logging for syncing to_device events
2016-12-15 18:33:55 +00:00