Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge 0.10->trunk | Kim Alvefur | 2017-09-14 | 1 | -10/+8 |
|\ | |||||
| * | Merge 0.9->0.10 | Kim Alvefur | 2017-09-14 | 1 | -10/+8 |
| |\ | |||||
| | * | mod_component, mod_s2s: Iterate over child tags instead of child nodes (can ↵ | Kim Alvefur | 2017-09-14 | 1 | -10/+8 |
| | | | | | | | | | | | | include text) in stream error (same as 176b7f4e4ac9) | ||||
* | | | Merge 0.10->trunk | Kim Alvefur | 2017-01-26 | 1 | -4/+2 |
|\| | | |||||
| * | | mod_c2s, mod_s2s: Remove comment that no longer applies since 946871f6e3c8 | Kim Alvefur | 2017-01-25 | 1 | -2/+0 |
| | | | |||||
| * | | mod_s2s: Clarify that it is stream features that can't be offered (here too) | Kim Alvefur | 2017-01-25 | 1 | -2/+2 |
| | | | |||||
* | | | Merge 0.10->trunk | Kim Alvefur | 2016-10-07 | 2 | -1/+5 |
|\| | | |||||
| * | | mod_s2s: Log error message from DNS lookup | Kim Alvefur | 2016-10-04 | 1 | -0/+4 |
| | | | |||||
| * | | Merge 0.9->0.10 | Kim Alvefur | 2016-09-28 | 1 | -1/+1 |
| |\| | |||||
| | * | mod_s2s: Lower log message to 'warn' level, standard for remotely-triggered ↵0.9.11 | Matthew Wild | 2016-09-27 | 1 | -1/+1 |
| | | | | | | | | | | | | protocol issues | ||||
* | | | Merge 0.10->trunk | Matthew Wild | 2016-09-12 | 1 | -10/+3 |
|\| | | |||||
| * | | mod_c2s, mod_s2s: Switch connection counting to 'amount' type and enumerate ↵ | Kim Alvefur | 2016-09-12 | 1 | -10/+3 |
| | | | | | | | | | | | | once per statistics interval | ||||
* | | | Merge 0.10->trunk | Matthew Wild | 2016-08-31 | 1 | -1/+0 |
|\| | | |||||
| * | | Backed out changeset a23b5cb8c22b | Matthew Wild | 2016-08-31 | 1 | -1/+0 |
| | | | | | | | | | | | | | | | It was a nice idea, but our s2s connection logic is too complicated. The session may have been destroyed inside attempt_connection(). | ||||
* | | | Merge 0.10->trunk | Kim Alvefur | 2016-08-28 | 1 | -0/+1 |
|\| | | |||||
| * | | mod_s2s: Fire event when s2s connection fails | Matthew Wild | 2016-08-27 | 1 | -0/+1 |
| | | | |||||
* | | | Merge 0.10->trunk | Kim Alvefur | 2016-08-12 | 1 | -1/+3 |
|\| | | |||||
| * | | mod_s2s: Set read mode for s2sout sockets to the same as s2sins | Kim Alvefur | 2016-08-12 | 1 | -1/+3 |
| | | | |||||
* | | | Merge 0.10->trunk | Kim Alvefur | 2016-08-08 | 1 | -1/+1 |
|\| | | |||||
| * | | mod_s2s: Index session after checking if it exists (fixes traceback in case ↵ | Kim Alvefur | 2016-08-07 | 1 | -1/+1 |
| | | | | | | | | | | | | of a connection without a session having a read timeout) | ||||
* | | | Merge 0.10->trunk | Kim Alvefur | 2016-07-08 | 1 | -0/+10 |
|\| | | |||||
| * | | mod_c2s, mod_s2s: Bootstrap connection count statistic on module load | Kim Alvefur | 2016-07-07 | 1 | -0/+10 |
| | | | |||||
* | | | mod_s2s: Add util.async support | Kim Alvefur | 2016-05-30 | 1 | -9/+37 |
| | | | |||||
* | | | Merge 0.10->trunk | Kim Alvefur | 2016-05-30 | 1 | -3/+0 |
|\| | | |||||
| * | | mod_s2s: Remove compat with namespace issue from Prosody pre-0.6.2 | Kim Alvefur | 2016-05-30 | 1 | -3/+0 |
| | | | |||||
* | | | Update every link to the documentation to use HTTPS | Emmanuel Gil Peyrot | 2016-04-16 | 1 | -1/+1 |
| | | | |||||
* | | | Merge 0.10->trunk | Kim Alvefur | 2016-03-14 | 1 | -1/+1 |
|\| | | |||||
| * | | mod_s2s: Include name of remote server when it's missing the stream ID ↵ | Kim Alvefur | 2016-03-14 | 1 | -1/+1 |
| | | | | | | | | | | | | (thanks Ge0rG) | ||||
* | | | Merge 0.10->trunk | Kim Alvefur | 2016-01-26 | 1 | -1/+1 |
|\| | | |||||
| * | | Merge 0.9->0.10 | Kim Alvefur | 2016-01-26 | 1 | -1/+1 |
| |\| | |||||
| | * | mod_c2s, mod_s2s: Lower priority of session shutdown to negative, so that ↵ | Kim Alvefur | 2016-01-26 | 1 | -1/+1 |
| | | | | | | | | | | | | plugins hooking at the default priority run first (fixes #601) | ||||
* | | | Merge 0.10->trunk | Kim Alvefur | 2016-01-22 | 1 | -24/+22 |
|\| | | |||||
| * | | Merge 0.9->0.10 | Kim Alvefur | 2016-01-22 | 1 | -24/+22 |
| |\| | |||||
| | * | Backout 63f5870f9afe, no longer needed since Windows is currently unsupported | Kim Alvefur | 2016-01-21 | 1 | -24/+22 |
| | | | |||||
* | | | Merge 0.10->trunk | Kim Alvefur | 2015-11-09 | 1 | -2/+3 |
|\| | | |||||
| * | | mod_s2s/s2sout: Keep SRV lookup response around even if it's empty | Kim Alvefur | 2015-11-05 | 1 | -2/+3 |
| | | | |||||
* | | | Merge 0.10->trunk | Kim Alvefur | 2015-10-11 | 1 | -0/+1 |
|\| | | |||||
| * | | mod_s2s: Fire global event for stream features where the remote server has ↵ | Kim Alvefur | 2015-10-11 | 1 | -0/+1 |
| | | | | | | | | | | | | not sent the 'to' stream attribute | ||||
* | | | Merge 0.10->trunk | Kim Alvefur | 2015-09-25 | 1 | -0/+5 |
|\| | | |||||
| * | | mod_s2s: Account for connections that time out in connection count measure | Kim Alvefur | 2015-09-25 | 1 | -0/+5 |
| | | | |||||
* | | | Merge 0.10->trunk | Kim Alvefur | 2015-09-24 | 1 | -2/+7 |
|\| | | |||||
| * | | mod_c2s, mod_s2s: Close incoming connections if there are no features to ↵ | Kim Alvefur | 2015-09-24 | 1 | -2/+7 |
| | | | | | | | | | | | | offer on incomplete streams (fixes #285) | ||||
* | | | Merge 0.10->trunk | Kim Alvefur | 2015-05-13 | 2 | -28/+28 |
|\| | | |||||
| * | | Merge 0.9->0.10 | Kim Alvefur | 2015-05-13 | 2 | -28/+28 |
| |\| | |||||
| | * | mod_s2s: Mark stream as opened directly after opening stream, prevents ↵ | Kim Alvefur | 2015-05-13 | 1 | -1/+1 |
| | | | | | | | | | | | | session.close opening it again | ||||
| | * | mod_s2s: Don't cache session.sends2s (or do it later), prevents sending data ↵ | Kim Alvefur | 2015-05-13 | 1 | -4/+3 |
| | | | | | | | | | | | | after session was closed | ||||
| | * | mod_s2s/s2sout: Use the local address assigned to UDP sockets instead of ↵ | Kim Alvefur | 2015-05-13 | 1 | -22/+24 |
| | | | | | | | | | | | | util.net to enumerate possible source addresses | ||||
| | * | mod_s2s/s2sout: Remove now unused config option dns_max_depth | Kim Alvefur | 2015-05-13 | 1 | -1/+0 |
| | | | |||||
* | | | Merge 0.10->trunk | Matthew Wild | 2015-05-06 | 1 | -1/+2 |
|\| | | |||||
| * | | mod_s2s: Fire read timeout event on correct virtualhost for incoming connections | Kim Alvefur | 2015-05-06 | 1 | -1/+2 |
| | | |