Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge 0.10->trunk | Kim Alvefur | 2016-04-07 | 1 | -2/+2 |
|\ | |||||
| * | moduleapi: Allow an origin session to be passed to module:send() | Kim Alvefur | 2016-04-06 | 1 | -2/+2 |
| | | |||||
* | | Merge 0.10->trunk | Kim Alvefur | 2016-04-06 | 2 | -2/+4 |
|\| | |||||
| * | mod_websocket: Fix read timeout handler (thanks mt) | Kim Alvefur | 2016-04-06 | 1 | -1/+4 |
| | | |||||
| * | server_event: addclient: wrapclient already calls startconnection for us ↵ | daurnimator | 2013-12-18 | 1 | -2/+1 |
| | | | | | | | | [backported from trunk] | ||||
* | | Merge 0.10->trunk | Kim Alvefur | 2016-04-05 | 1 | -17/+22 |
|\| | |||||
| * | server_event: Split long list of assignments into multiple lines for readability | Kim Alvefur | 2016-04-05 | 1 | -4/+7 |
| | | |||||
| * | server_event: Fix indentation (again) | Kim Alvefur | 2016-04-05 | 1 | -526/+527 |
| | | |||||
* | | Merge 0.10->trunk | Kim Alvefur | 2016-04-05 | 2 | -12/+35 |
|\| | |||||
| * | mod_roster: Fire event for pending items for good measure | Kim Alvefur | 2016-04-04 | 1 | -0/+6 |
| | | |||||
| * | mod_roster: Handle roster item removal with event on user deletion | Kim Alvefur | 2016-04-04 | 1 | -6/+4 |
| | | |||||
| * | mod_presence: Send unavailable presence when roster items are removed (fixes ↵ | Kim Alvefur | 2016-04-04 | 1 | -0/+1 |
| | | | | | | | | #331) | ||||
| * | mod_presence, mod_roster: Move responsibility for sending presence on roster ↵ | Kim Alvefur | 2016-04-04 | 2 | -7/+25 |
| | | | | | | | | removal to mod_presence | ||||
* | | 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 |
| | | | |||||
* | | | Merge 0.10->trunk | Kim Alvefur | 2016-04-02 | 2 | -1/+2 |
|\| | | |||||
| * | | mod_bosh: Skip sending stanzas removed out by filters (fixes #657) | Kim Alvefur | 2016-04-01 | 1 | -0/+1 |
| | | | |||||
| * | | storagemanager: Capitalize log message | Kim Alvefur | 2016-04-01 | 1 | -1/+1 |
| | | | |||||
* | | | Merge 0.10->trunk | Kim Alvefur | 2016-03-29 | 2 | -2/+3 |
|\| | | |||||
| * | | net.server_select: Remove do-nothing os_difftime calls [backported from trunk] | daurnimator | 2015-01-19 | 1 | -5/+3 |
| | | | |||||
| * | | net.dns: Import unpack() in forward-compatible way (Fixes compat with Lua5.2+) | Kim Alvefur | 2016-03-28 | 1 | -2/+2 |
| | | | |||||
| * | | util.jid: Import select() into local (fixes traceback, tests on Lua 5.2) | Kim Alvefur | 2016-03-28 | 1 | -0/+1 |
| | | | |||||
* | | | Merge 0.10->trunk | Matthew Wild | 2016-03-26 | 1 | -1/+1 |
|\| | | |||||
| * | | certmanager: Explicitly tonumber() version number segments before doing ↵ | Matthew Wild | 2016-03-26 | 1 | -1/+1 |
| | | | | | | | | | | | | arithmetic and avoid relying on implicit coercion (thanks David Favro) | ||||
* | | | Merge 0.10->trunk | Kim Alvefur | 2016-03-26 | 1 | -1/+5 |
|\| | | |||||
| * | | util.sql: Log errors in transaction to error level with traceback but return ↵ | Kim Alvefur | 2016-03-25 | 1 | -1/+5 |
| | | | | | | | | | | | | only error message (fixes #464) | ||||
* | | | Merge 0.10->trunk | Kim Alvefur | 2016-03-24 | 1 | -2/+8 |
|\| | | |||||
| * | | mod_websocket: Send a ping on read timeout | Kim Alvefur | 2016-03-23 | 1 | -0/+7 |
| | | | |||||
| * | | mod_websocket: Remove warning about unsolicited pong frames "MAY be sent ↵ | Kim Alvefur | 2016-03-23 | 1 | -2/+1 |
| | | | | | | | | | | | | unsolicited" per RFC 6455 (thanks mt) | ||||
* | | | Merge 0.10->trunk | Matthew Wild | 2016-03-23 | 2 | -3/+7 |
|\| | | |||||
| * | | util.sql: Charset should be innocent until proven guilty (initialize ↵ | Matthew Wild | 2016-03-23 | 1 | -1/+1 |
| | | | | | | | | | | | | charset_ok to true), fixes bug introduced in 187ba2e9c012 | ||||
| * | | prosodyctl: Only use host part of JIDs eg components that have node parts ↵ | Kim Alvefur | 2016-03-22 | 1 | -2/+6 |
| | | | | | | | | | | | | (thanks suzyo) | ||||
* | | | Merge 0.10->trunk | Matthew Wild | 2016-03-21 | 1 | -2/+2 |
|\| | | |||||
| * | | util.iterators: Fix use of incorrect variable accidentally introduced in ↵ | Matthew Wild | 2016-03-21 | 1 | -2/+2 |
| | | | | | | | | | | | | a9ef93bc81d9 | ||||
* | | | Merge 0.10->trunk | Kim Alvefur | 2016-03-21 | 2 | -6/+5 |
|\| | | |||||
| * | | util.sql: Catch errors from LuaDBI connect (Fixes #568) | Kim Alvefur | 2016-03-21 | 1 | -1/+2 |
| | | | |||||
| * | | mod_storage_sql: Make sure all serialization errors are propagated | Kim Alvefur | 2016-03-21 | 1 | -5/+3 |
| | | | |||||
* | | | CHANGES: Move async to trunk, it was dropped from 0.10 | Kim Alvefur | 2016-03-21 | 1 | -1/+1 |
| | | | |||||
* | | | Merge 0.10->trunk | Kim Alvefur | 2016-03-19 | 1 | -1/+3 |
|\| | | |||||
| * | | modulemanager: Silence log message about attempts to load already loaded ↵ | Kim Alvefur | 2016-03-19 | 1 | -1/+3 |
| | | | | | | | | | | | | modules for shared modules | ||||
* | | | Merge 0.10->trunk | Matthew Wild | 2016-03-18 | 6 | -13/+98 |
|\| | | |||||
| * | | mod_component: Some cleanup [luacheck] | Matthew Wild | 2016-03-18 | 1 | -4/+3 |
| | | | |||||
| * | | mod_component: Fire event when component disconnects | Matthew Wild | 2016-03-18 | 1 | -0/+1 |
| | | | |||||
| * | | Merge | Kim Alvefur | 2016-03-18 | 4 | -8/+93 |
| |\ \ | |||||
| | * | | prosody, prosodyctl: Allow setting CFG_* variables via Lua interpreter ↵ | Matthew Wild | 2016-03-18 | 2 | -8/+8 |
| | | | | | | | | | | | | | | | | before loading Prosody. Fixes #308. | ||||
| | * | | util.jid+tests: Add simple helpers... node(), host() and resource() for ↵ | Matthew Wild | 2016-03-17 | 2 | -0/+85 |
| | | | | | | | | | | | | | | | | extracting specific parts of a JID | ||||
| * | | | mod_saslauth: Disable DIGEST-MD5 by default (closes #515) | Kim Alvefur | 2016-03-18 | 1 | -1/+1 |
| |/ / | |||||
* | | | Merge 0.10->trunk | Kim Alvefur | 2016-03-18 | 2 | -2/+2 |
|\| | | |||||
| * | | mod_websocket: Make sure stanza xmlns filter runs late in the chain | Kim Alvefur | 2016-03-18 | 1 | -1/+1 |
| | | |