Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'release-v0.18.6' into develop | Mark Haines | 2016-12-29 | 1 | -4/+66 |
|\ | |||||
| * | Manually abort the underlying TLS connection. | Mark Haines | 2016-12-29 | 1 | -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 comments | Erik Johnston | 2016-12-29 | 1 | -4/+6 |
| | | |||||
| * | Clean up | Erik Johnston | 2016-12-29 | 1 | -2/+4 |
| | | |||||
| * | Wrap connections in an N minute timeout to ensure they get reaped correctly | Erik Johnston | 2016-12-29 | 1 | -4/+54 |
| | | |||||
* | | Fixup for #1689 and #1690 | Johannes Löthberg | 2016-12-12 | 1 | -4/+6 |
| | | | | | | | | Signed-off-by: Johannes Löthberg <johannes@kyriasis.com> | ||||
* | | IPv6 support for endpoint.py | Glyph | 2016-12-11 | 1 | -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 Hodgson | 2016-05-01 | 1 | -5/+9 |
| | | | | matrix.org IP space | ||||
* | Merge pull request #688 from matrix-org/matthew/preview_urls | Matthew Hodgson | 2016-04-11 | 1 | -2/+33 |
|\ | | | | | URL previewing support | ||||
| * | Add url_preview_enabled config option to turn on/off preview_url endpoint. ↵ | Matthew Hodgson | 2016-04-08 | 1 | -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 func | Erik Johnston | 2016-03-31 | 1 | -3/+3 |
| | | |||||
* | | Read from DNS cache if within TTL | Erik Johnston | 2016-03-31 | 1 | -16/+23 |
|/ | |||||
* | Fix AttributeError | Erik Johnston | 2016-01-21 | 1 | -1/+1 |
| | |||||
* | Cache dns lookups, and use the cache if we fail to lookup servers later | Erik Johnston | 2016-01-20 | 1 | -30/+71 |
| | |||||
* | copyrights | Matthew Hodgson | 2016-01-07 | 1 | -1/+1 |
| | |||||
* | Update copyright notices | Mark Haines | 2015-01-06 | 1 | -1/+1 |
| | |||||
* | Fix pep8 and pyflakes warnings | Mark Haines | 2014-11-20 | 1 | -1/+1 |
| | |||||
* | Separate out the matrix http client completely because just about all of its ↵ | David Baker | 2014-11-20 | 1 | -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 Hodgson | 2014-09-03 | 1 | -1/+1 |
| | | | | hasn't been incorporated in time for launch. | ||||
* | Update default endpoint port to match the default ports in the config | Erik Johnston | 2014-09-02 | 1 | -2/+2 |
| | |||||
* | Fix SSL for federation http client | Mark Haines | 2014-09-01 | 1 | -1/+1 |
| | |||||
* | add in whitespace after copyright statements to improve legibility | Matthew Hodgson | 2014-08-13 | 1 | -0/+1 |
| | |||||
* | Reference Matrix Home Server | matrix.org | 2014-08-12 | 1 | -0/+171 |