summary refs log tree commit diff
path: root/synapse/http/endpoint.py (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'release-v0.18.6' into developMark Haines2016-12-291-4/+66
|\
| * Manually abort the underlying TLS connection.Mark Haines2016-12-291-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | 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.
| * Spelling and commentsErik Johnston2016-12-291-4/+6
| |
| * Clean upErik Johnston2016-12-291-2/+4
| |
| * Wrap connections in an N minute timeout to ensure they get reaped correctlyErik Johnston2016-12-291-4/+54
| |
* | Fixup for #1689 and #1690Johannes Löthberg2016-12-121-4/+6
| | | | | | | | Signed-off-by: Johannes Löthberg <johannes@kyriasis.com>
* | IPv6 support for endpoint.pyGlyph2016-12-111-4/+4
|/ | | Similar to https://github.com/matrix-org/synapse/pull/1689, but for endpoint.py
* add a url_preview_ip_range_whitelist config param so we can whitelist the ↵Matthew Hodgson2016-05-011-5/+9
| | | | matrix.org IP space
* Merge pull request #688 from matrix-org/matthew/preview_urlsMatthew Hodgson2016-04-111-2/+33
|\ | | | | URL previewing support
| * Add url_preview_enabled config option to turn on/off preview_url endpoint. ↵Matthew Hodgson2016-04-081-2/+33
| | | | | | | | | | | | | | | | | | defaults to off. Add url_preview_ip_range_blacklist to let admins specify internal IP ranges that must not be spidered. Add url_preview_url_blacklist to let admins specify URL patterns that must not be spidered. Implement a custom SpiderEndpoint and associated support classes to implement url_preview_ip_range_blacklist Add commentary and generally address PR feedback
* | Allow clock to be passed in to funcErik Johnston2016-03-311-3/+3
| |
* | Read from DNS cache if within TTLErik Johnston2016-03-311-16/+23
|/
* Fix AttributeErrorErik Johnston2016-01-211-1/+1
|
* Cache dns lookups, and use the cache if we fail to lookup servers laterErik Johnston2016-01-201-30/+71
|
* copyrightsMatthew Hodgson2016-01-071-1/+1
|
* Update copyright noticesMark Haines2015-01-061-1/+1
|
* Fix pep8 and pyflakes warningsMark Haines2014-11-201-1/+1
|
* Separate out the matrix http client completely because just about all of its ↵David Baker2014-11-201-1/+1
| | | | code it now separate from the simple case we need for standard HTTP(S)
* fix the copyright holder from matrix.org to OpenMarket Ltd, as matrix.org ↵Matthew Hodgson2014-09-031-1/+1
| | | | hasn't been incorporated in time for launch.
* Update default endpoint port to match the default ports in the configErik Johnston2014-09-021-2/+2
|
* Fix SSL for federation http clientMark Haines2014-09-011-1/+1
|
* add in whitespace after copyright statements to improve legibilityMatthew Hodgson2014-08-131-0/+1
|
* Reference Matrix Home Servermatrix.org2014-08-121-0/+171