aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge 0.11->trunkMatthew Wild2020-01-231-4/+5
|\
| * prosodyctl: Fix some luacheck warningsMatthew Wild2020-01-231-4/+5
| |
* | Merge 0.11->trunkMatthew Wild2020-01-231-0/+20
|\|
| * Log warning when using prosodyctl start/stop/restartMatthew Wild2020-01-231-0/+20
| |
| * MergeKim Alvefur2020-01-200-0/+0
| |\
| | * Added tag 0.11.4 for changeset 10d6d0d91f4eKim Alvefur2020-01-060-0/+0
| | |
| * | Added tag 0.11.5 for changeset dbd60f473164Matthew Wild2020-01-190-0/+0
| | |
* | | Merge 0.11->trunkMatthew Wild2020-01-191-2/+1
|\| |
| * | util.startup: Ensure prosody.opts exists even when no options providedMatthew Wild2020-01-191-1/+1
| | |
| * | util.startup: Remove accidentally-committed debuggingMatthew Wild2020-01-191-1/+0
| | |
* | | 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
| | | | | | | | | | | | | | | -D / --daemonize -F / --no-daemonize
| * | 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
| | | | | | | | | | In rare cases, module.host can be a bare JID, in which case this test did the wrong thing.
* | 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
| | | | | | | | | | | | | | | | | | | | | | Lua 5.2 only used the __eq metamethod if both operands have the same __eq, but Lua 5.3 will pick one from either operands that has one as long as both are tables. This results in array() == {} and all sorts of odd behavior, including array() == util.json.null. <MattJ> I think [array() == {}] should have the same semantics as {} == {}
* | util.json: Test util.array integrationKim Alvefur2020-01-151-0/+10
| | | | | | | | | | This is to expose how [] == json.null due to a change in Lua 5.3 with how the equality metamethod is chosen.
* | util.array: Add a test case for a behavior change in Lua 5.3Kim Alvefur2020-01-141-0/+1
| | | | | | | | | | In Lua 5.1 and 5.2 the __eq metamethod is not invoked if the other argument is of a different metatable, but in Lua 5.3 it is.
* | 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
| | | | | | | | | | | | | | Sometimes all these things just drown out the logs you are interested in with low-level socket noise. Enabled since it's still new and experimental.
* | 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
| | | | | | | | ASCI is pretty neat in how lower case alphabet XOR space is upper case
* | Merge 0.11->trunkKim Alvefur2020-01-021-0/+1
|\|
| * mod_websocket: Clear mask bit when reflecting ping frames (fixes #1484)Kim 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
| | | | | | | | Related #1483
* | core.moduleapi: Rename local name for util.error for consistencyKim Alvefur2019-12-301-6/+6
| | | | | | | | It's called 'errors' everywhere else except here.
* | core.moduleapi: Fix error context in :send_iq APIKim Alvefur2019-12-301-1/+1
| | | | | | | | | | It got passed as argument to reject() instead of the util.error function and was lost.
* | mod_http_errors: Use text from util.errror object if includedKim Alvefur2019-12-291-1/+1
| | | | | | | | | | This makes util.error objects useful for more than just an error code container.
* | 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
| | | | | | | | | | | | | | I'm not sure I understand spies well enough to test that the arguments and return values are as expected. Better than nothing at least.
* | net.server_epoll: Avoid concatenating buffer with single itemKim Alvefur2019-12-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Saves creating a string that'll be identical to buffer[1] anyways, as well as a C function call. Depending on Lua version and length of the string, this could be reusing an interned string, but a longer one would probably be duplicated for no reason. Having exactly one item in the buffer seems like it would be fairly common, but I have not done an extensive study. If opportunistic writes are enabled then it will be even more likely. This special case could be optimized like this in table.concat but it does not look like it is.
* | 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
| | | | | | | | | | | | #1233) (grafted from 42a3e3a2824822cef7640ac56d182c59bdd4224e)
* | Merge 0.11->trunkKim Alvefur2019-12-240-0/+0
|\|
| * mod_mam: Fix rebase mistake [luacheck]Kim Alvefur2019-12-241-1/+1
| | | | | | | | The 'err' was there in trunk
| * mod_muc_mam: Fix rebase mistake [luacheck]Kim Alvefur2019-12-241-1/+1
| | | | | | | | The 'err' was there in trunk
* | mod_adhoc: Improve permission setting (fix #1482) BCKim Alvefur2019-12-203-4/+10
| | | | | | | | | | | | | | Rename 'user' permission mode to 'any' for clarity, too easily mistaken for what the 'local_user' setting does. It is also removed as a default and made a required argument.
* | mod_storage_sql: Remove unused and not actually returned return value [luacheck]Kim Alvefur2019-12-241-1/+1
| | | | | | | | The :delete throws an error, it does not return one like this.
* | Merge 0.11->trunkKim Alvefur2019-12-24181-2402/+7065
|\ \ | |/ |/|
| * mod_muc_mam: Remove unused variable [luacheck]Kim Alvefur2019-12-231-1/+1
| |
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-30 20:38:25 +0000