aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge 0.10 -> trunkMatthew Wild2016-07-291-59/+66
|\
| * statsmanager: Refactor to simplify logic. Notably renames ↵Matthew Wild2016-07-291-59/+66
| | | | | | | | 'statistics_provider' to 'statistics', and external libs now just begin with ':'
* | Merge 0.10->trunkKim Alvefur2016-07-291-1/+1
|\|
| * certmanager: Assume default config path of '.' (fixes prosodyctl check certs ↵Kim Alvefur2016-07-291-1/+1
| | | | | | | | when not installed)
* | Merge 0.10 -> trunkMatthew Wild2016-07-283-9/+6
|\|
| * util.openssl: rename variable to not collide with other 'k's [luacheck]Anton Shestakov2016-07-281-4/+4
| |
| * prosodyctl: remove unused variables [luacheck]Anton Shestakov2016-07-281-3/+0
| |
| * net.dns: remove unused variable unpack [luacheck]Anton Shestakov2016-07-281-2/+2
| |
| * net.server_select: remove unused import [luacheck]Anton Shestakov2016-07-281-1/+0
| |
* | Merge 0.10->trunkMatthew Wild2016-07-271-13/+12
|\|
| * statsmanager: If provider doesn't offer a get_stats method, still fire the ↵Matthew Wild2016-07-271-13/+12
| | | | | | | | stats-update event if stats_interval is specified (however stats-updated will not fire)
* | Merge 0.10 -> trunkMatthew Wild2016-07-274-30/+168
|\|
| * statsmanager, util.statsd: Add built-in statsd providerMatthew Wild2016-07-272-0/+85
| |
| * statsmanager: Add 'stats_provider' option, to allow selecting alternative ↵Matthew Wild2016-07-271-27/+65
| | | | | | | | API providers to util.statistics
| * net.http: Add quotes around ids in log messagesMatthew Wild2016-07-271-3/+3
| |
| * util.table: Add pack() function (this is already available in Lua 5.2+)Matthew Wild2016-07-271-0/+15
| |
* | mod_http: Fix indentation in redir_handlerEmmanuel Gil Peyrot2016-07-241-3/+3
| |
* | Default configuration: Remove trailing whitespacesEmmanuel Gil Peyrot2016-07-241-2/+2
| |
* | Merge 0.10->trunkKim Alvefur2016-07-235-13/+16
|\|
| * test_utf8: remove 2 unused variables and an undefined variable [luacheck]Anton Shestakov2016-07-231-1/+0
| |
| * test_util_http: wrap individual test blocks in do-end [luacheck]Anton Shestakov2016-07-231-8/+12
| |
| * util.sql: remove unused one-letter loop variables [luacheck]Anton Shestakov2016-07-231-2/+2
| |
| * test_util_uuid: remove unused one-letter loop variable [luacheck]Anton Shestakov2016-07-231-1/+1
| |
| * test_util_multitable: remove unused one-letter loop variable [luacheck]Anton Shestakov2016-07-231-1/+1
| |
* | Merge 0.10->trunkMatthew Wild2016-07-212-54/+61
|\|
| * test_util_queue: finish stress-test by emptying the queueAnton Shestakov2016-07-211-0/+2
| |
| * test_util_queue: Reduce iteration count of loop and add assertsKim Alvefur2016-07-201-3/+3
| |
| * tests: Adapt test for util.queue to the test frameworkKim Alvefur2016-07-202-54/+59
| |
* | mod_bosh: Fix merge mistakes from c8923f882274Kim Alvefur2016-07-141-5/+18
| |
* | Merge 0.10->trunkKim Alvefur2016-07-147-189/+210
|\|
| * test_util_cache: wrap individual test blocks in do-end [luacheck]Anton Shestakov2016-07-141-123/+134
| |
| * test_util_stanza: wrap individual test blocks in do-end [luacheck]Anton Shestakov2016-07-141-56/+66
| |
| * mod_net_multiplex: remove unused one-letter loop variable [luacheck]Anton Shestakov2016-07-141-1/+1
| |
| * net.server_select: remove unused one-letter loop variable [luacheck]Anton Shestakov2016-07-141-1/+1
| |
| * net.dns: remove unused one-letter loop variables [luacheck]Anton Shestakov2016-07-141-4/+4
| |
| * fallbacks.bit: remove unused one-letter loop variables [luacheck]Anton Shestakov2016-07-141-3/+3
| |
| * run_tests: use "$@" for passing arguments [shellcheck]Anton Shestakov2016-07-141-1/+1
| |
* | Merge 0.10->trunkKim Alvefur2016-07-130-0/+0
|\|
| * Merge 0.9->0.10Kim Alvefur2016-07-130-0/+0
| |\
| | * sessionmanager: Make session.send() return true unless there really is an ↵Kim Alvefur2015-09-211-1/+7
| | | | | | | | | | | | error [backported from 0.10]
* | | Merge 0.10->trunkKim Alvefur2016-07-1311-31/+130
|\| |
| * | tests: Add basic test for net.http.parserKim Alvefur2016-07-122-0/+48
| | |
| * | mod_http_errors: Add a newline after end of HTMLKim Alvefur2016-07-121-1/+2
| | |
| * | mod_http_files: Send larger files using new file handle APIKim Alvefur2016-07-111-7/+12
| | |
| * | mod_http_files: Switch to use util.cache for cacheKim Alvefur2016-07-111-3/+4
| | |
| * | net.http.server: Add response method for reading response body from a file ↵Kim Alvefur2016-07-111-0/+42
| | | | | | | | | | | | handle
| * | mod_http_files: send valid ETag headerAnton Shestakov2016-07-091-1/+1
| | | | | | | | | | | | | | | RFC 2616 section 14 (header field definitions) shows that ETag header content should be wrapped in double quotes.
| * | util.ip: rename variable (i is already defined) [luacheck]Anton Shestakov2016-07-091-2/+2
| | |
| * | test_util_cache: rename a variable (c is already defined) [luacheck]Anton Shestakov2016-07-091-2/+2
| | |
| * | test_util_cache: remove unused argument c3 [luacheck]Anton Shestakov2016-07-091-1/+1
| | |