aboutsummaryrefslogtreecommitdiffstats
path: root/plugins/mod_s2s/mod_s2s.lua
Commit message (Collapse)AuthorAgeFilesLines
* Merge 0.10->trunkKim Alvefur2017-09-141-10/+8
|\
| * Merge 0.9->0.10Kim Alvefur2017-09-141-10/+8
| |\
| | * mod_component, mod_s2s: Iterate over child tags instead of child nodes (can ↵Kim Alvefur2017-09-141-10/+8
| | | | | | | | | | | | include text) in stream error (same as 176b7f4e4ac9)
* | | Merge 0.10->trunkKim Alvefur2017-01-261-4/+2
|\| |
| * | mod_c2s, mod_s2s: Remove comment that no longer applies since 946871f6e3c8Kim Alvefur2017-01-251-2/+0
| | |
| * | mod_s2s: Clarify that it is stream features that can't be offered (here too)Kim Alvefur2017-01-251-2/+2
| | |
* | | Merge 0.10->trunkKim Alvefur2016-10-071-1/+1
|\| |
| * | Merge 0.9->0.10Kim Alvefur2016-09-281-1/+1
| |\|
| | * mod_s2s: Lower log message to 'warn' level, standard for remotely-triggered ↵0.9.11Matthew Wild2016-09-271-1/+1
| | | | | | | | | | | | protocol issues
* | | Merge 0.10->trunkMatthew Wild2016-09-121-10/+3
|\| |
| * | mod_c2s, mod_s2s: Switch connection counting to 'amount' type and enumerate ↵Kim Alvefur2016-09-121-10/+3
| | | | | | | | | | | | once per statistics interval
* | | Merge 0.10->trunkMatthew Wild2016-08-311-1/+0
|\| |
| * | Backed out changeset a23b5cb8c22bMatthew Wild2016-08-311-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->trunkKim Alvefur2016-08-281-0/+1
|\| |
| * | mod_s2s: Fire event when s2s connection failsMatthew Wild2016-08-271-0/+1
| | |
* | | Merge 0.10->trunkKim Alvefur2016-08-081-1/+1
|\| |
| * | mod_s2s: Index session after checking if it exists (fixes traceback in case ↵Kim Alvefur2016-08-071-1/+1
| | | | | | | | | | | | of a connection without a session having a read timeout)
* | | Merge 0.10->trunkKim Alvefur2016-07-081-0/+10
|\| |
| * | mod_c2s, mod_s2s: Bootstrap connection count statistic on module loadKim Alvefur2016-07-071-0/+10
| | |
* | | mod_s2s: Add util.async supportKim Alvefur2016-05-301-9/+37
| | |
* | | Merge 0.10->trunkKim Alvefur2016-05-301-3/+0
|\| |
| * | mod_s2s: Remove compat with namespace issue from Prosody pre-0.6.2Kim Alvefur2016-05-301-3/+0
| | |
* | | Update every link to the documentation to use HTTPSEmmanuel Gil Peyrot2016-04-161-1/+1
| | |
* | | Merge 0.10->trunkKim Alvefur2016-03-141-1/+1
|\| |
| * | mod_s2s: Include name of remote server when it's missing the stream ID ↵Kim Alvefur2016-03-141-1/+1
| | | | | | | | | | | | (thanks Ge0rG)
* | | Merge 0.10->trunkKim Alvefur2016-01-261-1/+1
|\| |
| * | Merge 0.9->0.10Kim Alvefur2016-01-261-1/+1
| |\|
| | * mod_c2s, mod_s2s: Lower priority of session shutdown to negative, so that ↵Kim Alvefur2016-01-261-1/+1
| | | | | | | | | | | | plugins hooking at the default priority run first (fixes #601)
* | | Merge 0.10->trunkKim Alvefur2015-10-111-0/+1
|\| |
| * | mod_s2s: Fire global event for stream features where the remote server has ↵Kim Alvefur2015-10-111-0/+1
| | | | | | | | | | | | not sent the 'to' stream attribute
* | | Merge 0.10->trunkKim Alvefur2015-09-251-0/+5
|\| |
| * | mod_s2s: Account for connections that time out in connection count measureKim Alvefur2015-09-251-0/+5
| | |
* | | Merge 0.10->trunkKim Alvefur2015-09-241-2/+7
|\| |
| * | mod_c2s, mod_s2s: Close incoming connections if there are no features to ↵Kim Alvefur2015-09-241-2/+7
| | | | | | | | | | | | offer on incomplete streams (fixes #285)
* | | Merge 0.10->trunkKim Alvefur2015-05-131-5/+4
|\| |
| * | Merge 0.9->0.10Kim Alvefur2015-05-131-5/+4
| |\|
| | * mod_s2s: Mark stream as opened directly after opening stream, prevents ↵Kim Alvefur2015-05-131-1/+1
| | | | | | | | | | | | session.close opening it again
| | * mod_s2s: Don't cache session.sends2s (or do it later), prevents sending data ↵Kim Alvefur2015-05-131-4/+3
| | | | | | | | | | | | after session was closed
* | | Merge 0.10->trunkMatthew Wild2015-05-061-1/+2
|\| |
| * | mod_s2s: Fire read timeout event on correct virtualhost for incoming connectionsKim Alvefur2015-05-061-1/+2
| | |
* | | Merge 0.10->trunkKim Alvefur2015-04-261-0/+4
|\| |
| * | mod_c2s, mod_s2s: Collect statistics on number of connectionsKim Alvefur2015-04-261-0/+4
| | |
* | | mod_s2s: Catch attempt to close dummy origin of s2s error replies (fixes a ↵Kim Alvefur2015-04-051-0/+3
|/ / | | | | | | top level error)
* | Merge 0.9->0.10 againKim Alvefur2015-03-271-0/+6
|\|
| * mod_s2s: to/from attributes are required on s2s stream headers. Set them to ↵0.9.8Matthew Wild2015-03-241-1/+1
| | | | | | | | '' when not available. Fixes #468.
* | Merge 0.9->0.10Matthew Wild2014-10-141-1/+1
|\|
| * mod_s2s: Capitalize log messageKim Alvefur2014-10-101-1/+1
| |
* | mod_s2s: Close s2s connections that can not proceed due to mod_dialback not ↵Kim Alvefur2014-09-231-0/+4
| | | | | | | | being present
* | core.stanza_router, mod_s2s: Move handling of S2S features to mod_s2s from ↵Kim Alvefur2014-09-091-0/+1
| | | | | | | | stanza_router
* | Merge 0.9->0.10Kim Alvefur2014-09-021-2/+9
|\|