aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge 0.11->trunkMatthew Wild2020-01-191-37/+39
|\
| * util.startup: Fix logic to make --config work againMatthew Wild2020-01-191-37/+39
* | Merge 0.11->trunkMatthew Wild2020-01-193-12/+67
|\|
| * mod_posix: Support for command-line flags to override 'daemonize' config optionMatthew Wild2020-01-191-1/+6
| * prosody/util.startup: Switch to parse_args() for --root and --configMatthew Wild2020-01-192-11/+7
| * util.startup: Add startup step for parsing command-line optionsMatthew Wild2020-01-191-0/+54
* | core.moduleapi: Hook correct event type in some casesKim Alvefur2020-01-161-1/+2
* | util.set: Fix equality metamethod in Lua 5.3Kim Alvefur2020-01-151-0/+6
* | util.ip: Fix equality metamethod for Lua 5.3Kim Alvefur2020-01-151-1/+7
* | util.array: Fix equality metamethod in Lua 5.3Kim Alvefur2020-01-151-0/+5
* | util.json: Test util.array integrationKim Alvefur2020-01-151-0/+10
* | util.array: Add a test case for a behavior change in Lua 5.3Kim Alvefur2020-01-141-0/+1
* | net.server_epoll: Log error about missing *all* callbacks at 'error' levelKim Alvefur2020-01-121-1/+1
* | net.server_epoll: Log errors caught in listeners on 'error' levelKim Alvefur2020-01-121-1/+1
* | net.server_epoll: Add option for reducing debug loggingKim Alvefur2020-01-121-14/+25
* | net.server_epoll: Collect full traceback from errors in listenersKim Alvefur2020-01-051-1/+3
* | mod_muc_mam: Measure how long a cleanup run takes (like mod_mam)Kim Alvefur2020-01-041-0/+4
* | net.websocket.frames: Add ping and pong test casesKim Alvefur2020-01-021-0/+24
* | net.websocket.frames: Add test case for masked dataKim Alvefur2020-01-021-0/+13
* | Merge 0.11->trunkKim Alvefur2020-01-021-0/+1
|\|
| * mod_websocket: Clear mask bit when reflecting ping frames (fixes #1484)0.11.4Kim Alvefur2020-01-021-0/+1
* | net.http.parser: Add TODO related to #726Kim Alvefur2020-01-011-0/+1
* | Merge 0.11->trunkKim Alvefur2019-12-311-0/+6
|\|
| * prosodyctl: Print a blank line to improve spacing and readabilityKim Alvefur2019-12-311-0/+1
| * prosodyctl check: Warn about conflict between mod_pep and mod_pep_simpleKim Alvefur2019-12-311-0/+5
* | core.moduleapi: Rename local name for util.error for consistencyKim Alvefur2019-12-301-6/+6
* | core.moduleapi: Fix error context in :send_iq APIKim Alvefur2019-12-301-1/+1
* | mod_http_errors: Use text from util.errror object if includedKim Alvefur2019-12-291-1/+1
* | util.pubsub: Ignore unused argument in tests [luacheck]Kim Alvefur2019-12-291-1/+1
* | util.pubsub: Cover subscription filter in a partial testKim Alvefur2019-12-261-0/+26
* | net.server_epoll: Avoid concatenating buffer with single itemKim Alvefur2019-12-281-1/+1
* | Merge 0.11->trunkMatthew Wild2019-12-240-0/+0
|\|
| * core.rostermanager: Cache rosters of offline users for faster access (fixes #...Kim Alvefur2018-12-161-0/+22
* | Merge 0.11->trunkKim Alvefur2019-12-240-0/+0
|\|
| * mod_mam: Fix rebase mistake [luacheck]Kim Alvefur2019-12-241-1/+1
| * mod_muc_mam: Fix rebase mistake [luacheck]Kim Alvefur2019-12-241-1/+1
* | mod_adhoc: Improve permission setting (fix #1482) BCKim Alvefur2019-12-203-4/+10
* | mod_storage_sql: Remove unused and not actually returned return value [luacheck]Kim Alvefur2019-12-241-1/+1
* | Merge 0.11->trunkKim Alvefur2019-12-24181-2402/+7065
|\ \ | |/ |/|
| * mod_muc_mam: Remove unused variable [luacheck]Kim Alvefur2019-12-231-1/+1
| * mod_mam: More careful validation of MAM query formKim Alvefur2019-12-231-1/+9
| * mod_muc_mam: Handle form identification error (e.g. not a form at all)Kim Alvefur2019-12-231-1/+4
| * mod_legacyauth: Report failure from sessionmanager (mostly invalid username)Kim Alvefur2019-12-231-1/+3
| * mod_presence: Ignore an unused variable [luacheck]Kim Alvefur2019-12-231-0/+2
| * mod_pep_simple: Ignore unused variable [luacheck]Kim Alvefur2019-12-231-0/+1
| * mod_pubsub: Ignore an unused variable [luacheck]Kim Alvefur2019-12-231-0/+1
| * MUC: Make note to handle configuration form errors [luacheck]Kim Alvefur2019-12-231-0/+2
| * mod_vcard: Remove unused variable [luacheck]Kim Alvefur2019-12-231-1/+1
| * mod_limits: Remove an unused variableKim Alvefur2019-12-231-1/+1
| * MUC: Remove some unused variables [luacheck]Kim Alvefur2019-12-231-4/+4