Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | 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 | |
| | | | ||||||
| * | | mod_register: Make sure only an on_evict function or nil is passed to util.cache | Kim Alvefur | 2016-03-17 | 1 | -1/+1 | |
| | | | ||||||
* | | | Merge 0.10->trunk | Matthew Wild | 2016-03-17 | 2 | -15/+96 | |
|\| | | ||||||
| * | | tests: util.cache: Tests for different return values of on_evict | Matthew Wild | 2016-03-17 | 1 | -0/+24 | |
| | | | ||||||
| * | | util.cache: Change behaviour of on_evict (and tests). Now accepts false ↵ | Matthew Wild | 2016-03-17 | 2 | -14/+34 | |
| | | | | | | | | | | | | instead of a function (never evict), or on_evict can return false to prevent eviction. | |||||
| * | | util.cache: Add head() and tail() methods (and tests) | Matthew Wild | 2016-03-17 | 2 | -1/+38 | |
| | | | ||||||
* | | | Merge 0.10->trunk | Kim Alvefur | 2016-03-17 | 0 | -0/+0 | |
|\| | | ||||||
| * | | CHANGES: Remove mention of async | Kim Alvefur | 2016-03-17 | 1 | -1/+0 | |
| | | | ||||||
* | | | Merge 0.10->trunk | Kim Alvefur | 2016-03-17 | 0 | -0/+0 | |
|\| | | ||||||
| * | | util.async: Remove to prevent blocking a stable release | Kim Alvefur | 2016-03-17 | 1 | -158/+0 | |
| | | | ||||||
| * | | mod_c2s: Remove use of util.async | Kim Alvefur | 2016-03-17 | 2 | -21/+5 | |
| | | | ||||||
| * | | Backed out BOSH use of util.async (changeset f0687c313cf1) | Kim Alvefur | 2016-03-17 | 1 | -13/+3 | |
| | | | ||||||
* | | | Merge 0.10->trunk | Kim Alvefur | 2016-03-14 | 1 | -1/+1 | |
|\| | | ||||||
| * | | mod_presence: Fix partial rename | Kim Alvefur | 2016-03-14 | 1 | -1/+1 | |
| | | | ||||||
* | | | Merge 0.10->trunk | Kim Alvefur | 2016-03-14 | 2 | -24/+40 | |
|\| | | ||||||
| * | | mod_presence: Move function for selecting "top resources" into a new ↵ | Kim Alvefur | 2016-03-14 | 2 | -24/+40 | |
| | | | | | | | | | | | | util.presence | |||||
* | | | Merge 0.10->trunk | Kim Alvefur | 2016-03-14 | 4 | -26/+37 | |
|\| | | ||||||
| * | | mod_s2s: Include name of remote server when it's missing the stream ID ↵ | Kim Alvefur | 2016-03-14 | 1 | -1/+1 | |
| | | | | | | | | | | | | (thanks Ge0rG) | |||||
| * | | util.sql: Remove unused arguments [luacheck] | Kim Alvefur | 2016-03-13 | 1 | -2/+2 | |
| | | | ||||||
| * | | util.sql: Don't break out of result retreival loops | Kim Alvefur | 2016-03-13 | 1 | -7/+13 | |
| | | |