aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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 ha...Kim Alvefur2016-07-111-0/+42
| * mod_http_files: send valid ETag headerAnton Shestakov2016-07-091-1/+1
| * 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
| * prosodyctl: remove unused one-letter loop variable [luacheck]Anton Shestakov2016-07-091-1/+1
| * util.openssl: remove unused one-letter loop variable [luacheck]Anton Shestakov2016-07-091-1/+1
| * util.ip: remove unused one-letter loop variables [luacheck]Anton Shestakov2016-07-091-2/+2
| * net.dns: don't use "for s,s in pairs..." (unused loop variable s) [luacheck]Anton Shestakov2016-07-091-2/+2
| * luacheckrc: make module a global in plugins/Anton Shestakov2016-07-091-1/+1
| * luacheckrc: make test helpers read-only globals, add testlib_new_env and runtestAnton Shestakov2016-07-091-8/+10
* | MUC: Hide new MUC room storage format behind an off-by-default optionKim Alvefur2016-07-091-6/+17
* | Merge 0.10->trunkKim Alvefur2016-07-088-14/+23
|\|
| * luacheckrc: Ignore assert helper functions used in tests/*Kim Alvefur2016-07-081-0/+11
| * net.adns: remove unused local variables t_insert and t_remove [luacheck]Anton Shestakov2016-07-091-1/+0
| * mod_admin_telnet: remove unused import (util.serialization) [luacheck]Anton Shestakov2016-07-091-1/+0
| * test_util_jid: make function test() local [luacheck]Anton Shestakov2016-07-091-1/+1
| * test_util_multitable: make mt variable local [luacheck]Anton Shestakov2016-07-091-2/+2
| * mod_admin_telnet: rename variable to make it defined (room -> room_name)Anton Shestakov2016-07-091-2/+2
| * mod_presence: remove unused one-letter loop variable [luacheck]Anton Shestakov2016-07-091-1/+1
| * net.dns: remove unused one-letter loop variables [luacheck]Anton Shestakov2016-07-091-4/+4
| * net.server_select: remove unused one-letter loop variables [luacheck]Anton Shestakov2016-07-091-2/+2
* | Merge 0.10->trunkKim Alvefur2016-07-082-0/+20
|\|
| * mod_c2s, mod_s2s: Bootstrap connection count statistic on module loadKim Alvefur2016-07-072-0/+20
* | Merge 0.10->trunkMatthew Wild2016-07-071-1/+17
|\|
| * net.http: Add log messages for requests, including their id (so "calling call...Matthew Wild2016-07-071-1/+13
| * net.http: Add request.id to every request object (can be overridden by provid...Matthew Wild2016-07-071-0/+4
* | Merge 0.10->trunkMatthew Wild2016-06-283-2/+11
|\|
| * util.time: New tiny library to abstract LuaSocket's gettime() function, so we...Matthew Wild2016-06-281-0/+8
| * Merge 0.9->0.10Kim Alvefur2016-06-240-0/+0
| |\
| | * mod_privacy: Fix selecting the top resource (fixes #694)Kim Alvefur2016-06-221-1/+1
| * | util.openssl: Handle return value from os.execute being true in Lua 5.2Kim Alvefur2016-06-231-1/+2
| * | util.prosodyctl: Handle os.execute in Lua 5.2 returning true when command ter...Kim Alvefur2016-06-231-1/+1
* | | Merge 0.10->trunkKim Alvefur2016-06-122-4/+9
|\| |
| * | prosodyctl: Warn if encryption is required but mod_tls is not enabled (see #617)Kim Alvefur2016-06-121-1/+7
| * | mod_pep: Use correct field for full JID (thanks Milan*)Kim Alvefur2016-06-101-1/+1
| * | mod_pep: Include the bare user jid in eventKim Alvefur2016-06-091-3/+2
* | | s2smanager: Include a stub thread on destroyed sessions (thanks Link Mauve)Kim Alvefur2016-06-091-0/+1
* | | mod_s2s: Add util.async supportKim Alvefur2016-05-301-9/+37
* | | Merge 0.10->trunkKim Alvefur2016-05-302-4/+0
|\| |
| * | mod_s2s: Remove compat with namespace issue from Prosody pre-0.6.2Kim Alvefur2016-05-301-3/+0
| * | core.stanza_router: Remove compatibility with Jabiru not including id attribu...Kim Alvefur2016-05-301-1/+0
* | | Merge 0.10->trunkKim Alvefur2016-05-302-3/+3
|\| |
| * | util.dataforms: Fix including default value for list-single when given as fie...Kim Alvefur2016-05-291-1/+1
| * | prosodyctl: Fix typo (thanks av6)Kim Alvefur2016-05-281-2/+2