aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge 0.10->trunkKim Alvefur2016-04-031-0/+3
|\
| * Merge 0.9->0.10Kim Alvefur2016-04-031-0/+3
| |\
| | * mod_c2s: Just destroy the session when it has no connection (see #641)Kim Alvefur2016-04-031-0/+3
* | | Merge 0.10->trunkKim Alvefur2016-04-022-1/+2
|\| |
| * | mod_bosh: Skip sending stanzas removed out by filters (fixes #657)Kim Alvefur2016-04-011-0/+1
| * | storagemanager: Capitalize log messageKim Alvefur2016-04-011-1/+1
* | | Merge 0.10->trunkKim Alvefur2016-03-292-2/+3
|\| |
| * | net.server_select: Remove do-nothing os_difftime calls [backported from trunk]daurnimator2015-01-191-5/+3
| * | net.dns: Import unpack() in forward-compatible way (Fixes compat with Lua5.2+)Kim Alvefur2016-03-281-2/+2
| * | util.jid: Import select() into local (fixes traceback, tests on Lua 5.2)Kim Alvefur2016-03-281-0/+1
* | | Merge 0.10->trunkMatthew Wild2016-03-261-1/+1
|\| |
| * | certmanager: Explicitly tonumber() version number segments before doing arith...Matthew Wild2016-03-261-1/+1
* | | Merge 0.10->trunkKim Alvefur2016-03-261-1/+5
|\| |
| * | util.sql: Log errors in transaction to error level with traceback but return ...Kim Alvefur2016-03-251-1/+5
* | | Merge 0.10->trunkKim Alvefur2016-03-241-2/+8
|\| |
| * | mod_websocket: Send a ping on read timeoutKim Alvefur2016-03-231-0/+7
| * | mod_websocket: Remove warning about unsolicited pong frames "MAY be sent unso...Kim Alvefur2016-03-231-2/+1
* | | Merge 0.10->trunkMatthew Wild2016-03-232-3/+7
|\| |
| * | util.sql: Charset should be innocent until proven guilty (initialize charset_...Matthew Wild2016-03-231-1/+1
| * | prosodyctl: Only use host part of JIDs eg components that have node parts (th...Kim Alvefur2016-03-221-2/+6
* | | Merge 0.10->trunkMatthew Wild2016-03-211-2/+2
|\| |
| * | util.iterators: Fix use of incorrect variable accidentally introduced in a9ef...Matthew Wild2016-03-211-2/+2
* | | Merge 0.10->trunkKim Alvefur2016-03-212-6/+5
|\| |
| * | util.sql: Catch errors from LuaDBI connect (Fixes #568)Kim Alvefur2016-03-211-1/+2
| * | mod_storage_sql: Make sure all serialization errors are propagatedKim Alvefur2016-03-211-5/+3
* | | CHANGES: Move async to trunk, it was dropped from 0.10Kim Alvefur2016-03-211-1/+1
* | | Merge 0.10->trunkKim Alvefur2016-03-191-1/+3
|\| |
| * | modulemanager: Silence log message about attempts to load already loaded modu...Kim Alvefur2016-03-191-1/+3
* | | Merge 0.10->trunkMatthew Wild2016-03-186-13/+98
|\| |
| * | mod_component: Some cleanup [luacheck]Matthew Wild2016-03-181-4/+3
| * | mod_component: Fire event when component disconnectsMatthew Wild2016-03-181-0/+1
| * | MergeKim Alvefur2016-03-184-8/+93
| |\ \
| | * | prosody, prosodyctl: Allow setting CFG_* variables via Lua interpreter before...Matthew Wild2016-03-182-8/+8
| | * | util.jid+tests: Add simple helpers... node(), host() and resource() for extra...Matthew Wild2016-03-172-0/+85
| * | | mod_saslauth: Disable DIGEST-MD5 by default (closes #515)Kim Alvefur2016-03-181-1/+1
| |/ /
* | | Merge 0.10->trunkKim Alvefur2016-03-182-2/+2
|\| |
| * | mod_websocket: Make sure stanza xmlns filter runs late in the chainKim Alvefur2016-03-181-1/+1
| * | mod_register: Make sure only an on_evict function or nil is passed to util.cacheKim Alvefur2016-03-171-1/+1
* | | Merge 0.10->trunkMatthew Wild2016-03-172-15/+96
|\| |
| * | tests: util.cache: Tests for different return values of on_evictMatthew Wild2016-03-171-0/+24
| * | util.cache: Change behaviour of on_evict (and tests). Now accepts false inste...Matthew Wild2016-03-172-14/+34
| * | util.cache: Add head() and tail() methods (and tests)Matthew Wild2016-03-172-1/+38
* | | Merge 0.10->trunkKim Alvefur2016-03-170-0/+0
|\| |
| * | CHANGES: Remove mention of asyncKim Alvefur2016-03-171-1/+0
* | | Merge 0.10->trunkKim Alvefur2016-03-170-0/+0
|\| |
| * | util.async: Remove to prevent blocking a stable releaseKim Alvefur2016-03-171-158/+0
| * | mod_c2s: Remove use of util.asyncKim Alvefur2016-03-172-21/+5
| * | Backed out BOSH use of util.async (changeset f0687c313cf1)Kim Alvefur2016-03-171-13/+3
* | | Merge 0.10->trunkKim Alvefur2016-03-141-1/+1
|\| |
| * | mod_presence: Fix partial renameKim Alvefur2016-03-141-1/+1