Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge 0.11->trunk | Matthew Wild | 2020-01-19 | 1 | -37/+39 |
|\ | |||||
| * | util.startup: Fix logic to make --config work again | Matthew Wild | 2020-01-19 | 1 | -37/+39 |
| | | |||||
* | | Merge 0.11->trunk | Matthew Wild | 2020-01-19 | 3 | -12/+67 |
|\| | |||||
| * | mod_posix: Support for command-line flags to override 'daemonize' config option | Matthew Wild | 2020-01-19 | 1 | -1/+6 |
| | | | | | | | | | | -D / --daemonize -F / --no-daemonize | ||||
| * | prosody/util.startup: Switch to parse_args() for --root and --config | Matthew Wild | 2020-01-19 | 2 | -11/+7 |
| | | |||||
| * | util.startup: Add startup step for parsing command-line options | Matthew Wild | 2020-01-19 | 1 | -0/+54 |
| | | |||||
* | | core.moduleapi: Hook correct event type in some cases | Kim Alvefur | 2020-01-16 | 1 | -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.3 | Kim Alvefur | 2020-01-15 | 1 | -0/+6 |
| | | |||||
* | | util.ip: Fix equality metamethod for Lua 5.3 | Kim Alvefur | 2020-01-15 | 1 | -1/+7 |
| | | |||||
* | | util.array: Fix equality metamethod in Lua 5.3 | Kim Alvefur | 2020-01-15 | 1 | -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 integration | Kim Alvefur | 2020-01-15 | 1 | -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.3 | Kim Alvefur | 2020-01-14 | 1 | -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' level | Kim Alvefur | 2020-01-12 | 1 | -1/+1 |
| | | |||||
* | | net.server_epoll: Log errors caught in listeners on 'error' level | Kim Alvefur | 2020-01-12 | 1 | -1/+1 |
| | | |||||
* | | net.server_epoll: Add option for reducing debug logging | Kim Alvefur | 2020-01-12 | 1 | -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 listeners | Kim Alvefur | 2020-01-05 | 1 | -1/+3 |
| | | |||||
* | | mod_muc_mam: Measure how long a cleanup run takes (like mod_mam) | Kim Alvefur | 2020-01-04 | 1 | -0/+4 |
| | | |||||
* | | net.websocket.frames: Add ping and pong test cases | Kim Alvefur | 2020-01-02 | 1 | -0/+24 |
| | | |||||
* | | net.websocket.frames: Add test case for masked data | Kim Alvefur | 2020-01-02 | 1 | -0/+13 |
| | | | | | | | | ASCI is pretty neat in how lower case alphabet XOR space is upper case | ||||
* | | Merge 0.11->trunk | Kim Alvefur | 2020-01-02 | 1 | -0/+1 |
|\| | |||||
| * | mod_websocket: Clear mask bit when reflecting ping frames (fixes #1484)0.11.4 | Kim Alvefur | 2020-01-02 | 1 | -0/+1 |
| | | |||||
* | | net.http.parser: Add TODO related to #726 | Kim Alvefur | 2020-01-01 | 1 | -0/+1 |
| | | |||||
* | | Merge 0.11->trunk | Kim Alvefur | 2019-12-31 | 1 | -0/+6 |
|\| | |||||
| * | prosodyctl: Print a blank line to improve spacing and readability | Kim Alvefur | 2019-12-31 | 1 | -0/+1 |
| | | |||||
| * | prosodyctl check: Warn about conflict between mod_pep and mod_pep_simple | Kim Alvefur | 2019-12-31 | 1 | -0/+5 |
| | | | | | | | | Related #1483 | ||||
* | | core.moduleapi: Rename local name for util.error for consistency | Kim Alvefur | 2019-12-30 | 1 | -6/+6 |
| | | | | | | | | It's called 'errors' everywhere else except here. | ||||
* | | core.moduleapi: Fix error context in :send_iq API | Kim Alvefur | 2019-12-30 | 1 | -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 included | Kim Alvefur | 2019-12-29 | 1 | -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 Alvefur | 2019-12-29 | 1 | -1/+1 |
| | | |||||
* | | util.pubsub: Cover subscription filter in a partial test | Kim Alvefur | 2019-12-26 | 1 | -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 item | Kim Alvefur | 2019-12-28 | 1 | -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->trunk | Matthew Wild | 2019-12-24 | 0 | -0/+0 |
|\| | |||||
| * | core.rostermanager: Cache rosters of offline users for faster access (fixes ↵ | Kim Alvefur | 2018-12-16 | 1 | -0/+22 |
| | | | | | | | | | | | | #1233) (grafted from 42a3e3a2824822cef7640ac56d182c59bdd4224e) | ||||
* | | Merge 0.11->trunk | Kim Alvefur | 2019-12-24 | 0 | -0/+0 |
|\| | |||||
| * | mod_mam: Fix rebase mistake [luacheck] | Kim Alvefur | 2019-12-24 | 1 | -1/+1 |
| | | | | | | | | The 'err' was there in trunk | ||||
| * | mod_muc_mam: Fix rebase mistake [luacheck] | Kim Alvefur | 2019-12-24 | 1 | -1/+1 |
| | | | | | | | | The 'err' was there in trunk | ||||
* | | mod_adhoc: Improve permission setting (fix #1482) BC | Kim Alvefur | 2019-12-20 | 3 | -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 Alvefur | 2019-12-24 | 1 | -1/+1 |
| | | | | | | | | The :delete throws an error, it does not return one like this. | ||||
* | | Merge 0.11->trunk | Kim Alvefur | 2019-12-24 | 181 | -2402/+7065 |
|\ \ | |/ |/| | |||||
| * | mod_muc_mam: Remove unused variable [luacheck] | Kim Alvefur | 2019-12-23 | 1 | -1/+1 |
| | | |||||
| * | mod_mam: More careful validation of MAM query form | Kim Alvefur | 2019-12-23 | 1 | -1/+9 |
| | | | | | | | | Adapted from mod_muc_mam | ||||
| * | mod_muc_mam: Handle form identification error (e.g. not a form at all) | Kim Alvefur | 2019-12-23 | 1 | -1/+4 |
| | | |||||
| * | mod_legacyauth: Report failure from sessionmanager (mostly invalid username) | Kim Alvefur | 2019-12-23 | 1 | -1/+3 |
| | | |||||
| * | mod_presence: Ignore an unused variable [luacheck] | Kim Alvefur | 2019-12-23 | 1 | -0/+2 |
| | | | | | | | | Not sure if it should be unused, hence the TODO | ||||
| * | mod_pep_simple: Ignore unused variable [luacheck] | Kim Alvefur | 2019-12-23 | 1 | -0/+1 |
| | | |||||
| * | mod_pubsub: Ignore an unused variable [luacheck] | Kim Alvefur | 2019-12-23 | 1 | -0/+1 |
| | | |||||
| * | MUC: Make note to handle configuration form errors [luacheck] | Kim Alvefur | 2019-12-23 | 1 | -0/+2 |
| | | |||||
| * | mod_vcard: Remove unused variable [luacheck] | Kim Alvefur | 2019-12-23 | 1 | -1/+1 |
| | | |||||
| * | mod_limits: Remove an unused variable | Kim Alvefur | 2019-12-23 | 1 | -1/+1 |
| | | | | | | | | | | Hope this isn't meant to be used. 'outstanding' seems to be the more useful value anyways? | ||||
| * | MUC: Remove some unused variables [luacheck] | Kim Alvefur | 2019-12-23 | 1 | -4/+4 |
| | |