Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge 0.10->trunk | Matthew Wild | 2018-05-30 | 1 | -2/+9 |
|\ | |||||
| * | Merge 0.9->0.10 | Matthew Wild | 2018-05-30 | 1 | -2/+9 |
| |\ | |||||
| | * | mod_c2s: Do not allow the stream 'to' to change across stream restarts ↵ | Kim Alvefur | 2018-05-25 | 1 | -2/+9 |
| | | | | | | | | | | | | (fixes #1147) | ||||
* | | | Merge 0.10->trunk | Kim Alvefur | 2018-05-22 | 1 | -1/+1 |
|\| | | |||||
| * | | mod_c2s: Avoid concatenating potential nil value (fixes #753) | Kim Alvefur | 2018-05-22 | 1 | -1/+1 |
| | | | |||||
* | | | mod_c2s: Add a counter for IPv6. | Emmanuel Gil Peyrot | 2017-09-09 | 1 | -1/+7 |
| | | | |||||
* | | | Merge 0.10->trunk | Kim Alvefur | 2017-11-10 | 1 | -1/+1 |
|\| | | |||||
| * | | mod_c2s: Set a default value for c2s_timeout (fixes #1036) | Kim Alvefur | 2017-11-10 | 1 | -1/+1 |
| | | | |||||
* | | | 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_c2s: Iterate over child tags instead of child nodes in stream error ↵ | Kim Alvefur | 2017-09-13 | 1 | -10/+8 |
| | | | | | | | | | | | | (fixes traceback from #987) | ||||
* | | | Merge 0.10->trunk | Kim Alvefur | 2017-08-28 | 1 | -0/+12 |
|\| | | |||||
| * | | core.usermanager, various modules: Disconnect other resources on password ↵ | Kim Alvefur | 2017-07-28 | 1 | -0/+12 |
| | | | | | | | | | | | | change (thanks waqas) (fixes #512) | ||||
* | | | mod_c2s: Remove unused locals [luacheck] | Kim Alvefur | 2017-04-01 | 1 | -2/+1 |
| | | | |||||
* | | | Merge 0.10->trunk | Kim Alvefur | 2017-03-06 | 1 | -8/+8 |
|\| | | |||||
| * | | mod_c2s: Rename unused loop variable to _ [luacheck] | Kim Alvefur | 2017-03-06 | 1 | -1/+1 |
| | | | |||||
| * | | mod_c2s: Rename variable no avoid name clash [luacheck] | Kim Alvefur | 2017-03-06 | 1 | -7/+7 |
| | | | |||||
* | | | 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_c2s: Clarify that there were no *stream* features to offer | Kim Alvefur | 2017-01-25 | 1 | -2/+2 |
| | | | |||||
* | | | Merge 0.10->trunk | Matthew Wild | 2016-09-12 | 1 | -5/+3 |
|\| | | |||||
| * | | mod_c2s, mod_s2s: Switch connection counting to 'amount' type and enumerate ↵ | Kim Alvefur | 2016-09-12 | 1 | -5/+3 |
| | | | | | | | | | | | | once per statistics interval | ||||
* | | | Merge 0.10->trunk | Kim Alvefur | 2016-08-08 | 1 | -4/+7 |
|\| | | |||||
| * | | mod_c2s: Don't try to keep alive sessions where the stream is not (yet) open | Kim Alvefur | 2016-08-07 | 1 | -1/+4 |
| | | | |||||
| * | | mod_c2s: Fix whitespace (why does it keep getting messed up?) | Kim Alvefur | 2016-08-07 | 1 | -3/+3 |
| | | | |||||
* | | | 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 |
| | | | |||||
* | | | Merge 0.10->trunk | Kim Alvefur | 2016-04-03 | 1 | -0/+3 |
|\| | | |||||
| * | | Merge 0.9->0.10 | Kim Alvefur | 2016-04-03 | 1 | -0/+3 |
| |\| | |||||
| | * | mod_c2s: Just destroy the session when it has no connection (see #641) | Kim Alvefur | 2016-04-03 | 1 | -0/+3 |
| | | | |||||
| * | | mod_c2s: Remove use of util.async | Kim Alvefur | 2016-03-17 | 1 | -20/+5 |
|/ / | |||||
* | | Merge 0.9->0.10 | Kim Alvefur | 2016-03-02 | 1 | -0/+1 |
|\| | |||||
| * | mod_c2s: Remove connection object from session object when connection ↵ | Kim Alvefur | 2016-03-02 | 1 | -0/+1 |
| | | | | | | | | disconnected to prevent accidental use (see #590) | ||||
* | | 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) | ||||
* | | mod_c2s, mod_s2s: Close incoming connections if there are no features to ↵ | Kim Alvefur | 2015-09-24 | 1 | -1/+6 |
| | | | | | | | | offer on incomplete streams (fixes #285) | ||||
* | | mod_c2s, mod_s2s: Collect statistics on number of connections | Kim Alvefur | 2015-04-26 | 1 | -0/+4 |
| | | |||||
* | | Merge 0.9->0.10 | Kim Alvefur | 2014-09-02 | 1 | -3/+3 |
|\| | |||||
| * | net.http, net.http.server, mod_c2s, mod_s2s, mod_component, ↵ | Matthew Wild | 2014-08-29 | 1 | -0/+4 |
| | | | | | | | | mod_admin_telnet, mod_net_multiplex: Add ondetach to release connection from 'sessions' table (or equivalent) | ||||
* | | Merge 0.9->0.10 | Matthew Wild | 2014-08-28 | 1 | -1/+1 |
|\| | |||||
| * | mod_c2s, mod_s2s: Log received invalid stream headers | Matthew Wild | 2014-08-23 | 1 | -1/+1 |
| | | |||||
| * | mod_c2s: Fix traceback if c2s stream sent to component | Kim Alvefur | 2014-05-10 | 1 | -1/+1 |
| | | |||||
* | | mod_c2s, mod_s2s, mod_component, util.xmppstream: Move all ↵ | Kim Alvefur | 2014-04-10 | 1 | -14/+0 |
| | | | | | | | | session:open_stream() functions to util.xmppstream | ||||
* | | mod_c2s: Break out stream opening into a separate function | Florian Zeitz | 2014-01-31 | 1 | -6/+16 |
| | | |||||
* | | mod_c2s, mod_s2s: Set session.encrypted as session.secure does not allways ↵ | Kim Alvefur | 2013-10-07 | 1 | -0/+2 |
| | | | | | | | | mean encrypted (eg consider_bosh_secure) | ||||
* | | mod_c2s: Move another log message to debug level | Kim Alvefur | 2013-08-14 | 1 | -1/+1 |
| | | |||||
* | | mod_c2s, mod_s2s: Log cipher and encryption info in a more compact and ↵ | Kim Alvefur | 2013-08-14 | 1 | -2/+1 |
| | | | | | | | | (hopefully) less confusing way | ||||
* | | mod_c2s: Port coroutine code to util.async | Matthew Wild | 2013-08-11 | 1 | -63/+18 |
| | | |||||
* | | Remove all trailing whitespace | Florian Zeitz | 2013-08-09 | 1 | -10/+10 |
| | | |||||
* | | mod_c2s: Add session:sleep() and session:wake() to pause a session (e.g. ↵ | Matthew Wild | 2013-08-09 | 1 | -10/+73 |
| | | | | | | | | while waiting for an external event). Needs a gallon or two of testing. |