aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* util.prosodyctl: Tell prosody do daemonize via command line flag (fixes #1514)Kim Alvefur2020-01-261-2/+2
| | | | Backport of 88be11e9f9b9
* core.certmanager: Look for privkey.pem to go with fullchain.pem (fix #1526)Kim Alvefur2020-04-101-6/+8
| | | | | | | This makes `prosodyctl cert import example.com /path/to/example.com/fullchain.pem` work. This was never intended to, yet users commonly tried this and got problems.
* mod_vcard4: Report correct error condition (fixes #1521)Kim Alvefur2020-04-031-2/+2
| | | | On error, the second return value is the error condition, not the third.
* mod_register_ibr: Add FORM_TYPE as required by XEP-0077 (fixes #1511)Emmanuel Gil Peyrot2019-09-291-0/+2
| | | | Backport of f90abf142d53 from trunk
* mod_storage_sql: Add index covering sort_id to improve performance (fixes #1505)Kim Alvefur2020-03-221-0/+1
|
* mod_admin_telnet: Handle unavailable cipher info (fixes #1510)Kim Alvefur2020-03-221-5/+8
| | | | | | | | The LuaSec :info() method gathers info using the OpenSSL function SSL_get_current_cipher(). Documentation for this function states that it may return NULL if no session has been established (yet). If so, the LuaSec functions wrapping this return nil, triggering a nil-indexing error in mod_admin_telnet.
* MUC: Persist affiliation_data in new MUC format!Matthew Wild2020-03-121-0/+1
|
* mod_mam,mod_muc_mam: Allow other work to be performed during archive cleanup ↵Kim Alvefur2020-03-112-2/+10
| | | | | | | | | | | (fixes #1504) This lets Prosody handle socket related work between each step in the cleanup in order to prevent the server from being completely blocked during this. An async storage backend would not need this but those are currently rare.
* net.server_epoll: Fix indentationKim Alvefur2020-03-111-3/+3
| | | | | | Some lines seem to have gotten the wrong indentation, possibly caused by Meld which often ignores lines with only whitespace changes and leaves their previous indentation.
* mod_pubsub, mod_pep: Ensure correct number of children of <item/> (fixes #1496)Kim Alvefur2020-02-272-2/+2
|
* mod_muc_mam: Fix traceback saving message from non-occupant (fixes #1497)Kim Alvefur2020-02-271-5/+8
| | | | Caused by a plugin sending a message from the room itself.
* util.datamanager: Fix iterating over "users" (thanks marc0s)Kim Alvefur2020-02-241-1/+1
| | | | | | | | | The 'store' path componend used to be unescaped until 756a2a00e7e7 added escaping to address issues with characters like '/' used in PEP, but with a special case for '_' which was already in common use in 'store' path components. Missed adding this escaping here.
* mod_storage_sql: Move update limit check back one step, fixes tracebackKim Alvefur2020-02-221-6/+6
| | | | | 0c00274528a4 moved it one step too far, so the check was performed before connecting to the database instead of after.
* mod_storage_sql: Fix check for deletion limits (fixes #1494)Kim Alvefur2020-02-211-7/+7
| | | | | The check was only performed if sql_manage_tables was set to true (the default) It should always be performed
* mod_muc: Allow control over the server-admins-are-room-owners feature (see ↵Matthew Wild2020-02-131-1/+2
| | | | #1174)
* mod_admin_telnet: Create a DNS resolver per console session (fixes #1492)Kim Alvefur2020-01-241-6/+19
| | | | This is now the common pattern, eg see mod_s2s.
* mod_websocket: Fire event on session creation (thanks Aaron van Meerten)Matthew Wild2020-01-241-0/+2
|
* prosodyctl: Fix some luacheck warningsMatthew Wild2020-01-231-4/+5
|
* 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
| |
* | util.startup: Ensure prosody.opts exists even when no options provided0.11.5Matthew Wild2020-01-191-1/+1
| |
* | util.startup: Remove accidentally-committed debuggingMatthew Wild2020-01-191-1/+0
| |
* | util.startup: Fix logic to make --config work againMatthew Wild2020-01-191-37/+39
| |
* | 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
|/
* mod_websocket: Clear mask bit when reflecting ping frames (fixes #1484)0.11.4Kim Alvefur2020-01-021-0/+1
|
* 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.rostermanager: Cache rosters of offline users for faster access (fixes ↵Kim Alvefur2018-12-161-0/+22
| | | | | | #1233) (grafted from 42a3e3a2824822cef7640ac56d182c59bdd4224e)
* 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_muc_mam: Schedule cleanup again on failureKim Alvefur2019-12-241-0/+1
|
* mod_muc_mam: Log error when unable to delete old messages (fix #1481) [luacheck]Kim Alvefur2019-12-241-0/+2
|
* mod_muc_mam: Log error when unable to store stanza (fix #1480) [luacheck]Kim Alvefur2019-12-231-0/+2
|
* mod_mam: Schedule cleanup again if unable to delete messagesKim Alvefur2019-12-241-0/+1
|
* mod_mam: Log error when unable to delete old messages (fix #1479) [luacheck]Kim Alvefur2019-12-241-0/+2
|
* mod_mam: Log error when unable to store stanza (fix #1478)Kim Alvefur2019-12-231-0/+2
| | | | | | Unclear what else to do here. Caught by luacheck
* mod_auth_internal_hashed: Pass on errors from password hash function (fixes ↵Kim Alvefur2019-12-231-0/+6
| | | | #1477)
* mod_pep: Handle presence subscriptions in filter (fixes #1372)Kim Alvefur2019-06-101-34/+17
| | | | Take two on 045209b41b3a
* util.pubsub: Pass subscribers trough a filter callbackKim Alvefur2019-06-061-0/+2
|
* util.pubsub: Factor out calling of broadcasterKim Alvefur2019-06-061-4/+8
| | | | This will simplify doing things along with broadcasting.
* net.resolvers.basic: Normalise IP literals, ensures net.server is happyKim Alvefur2019-11-241-0/+2
|
* net.resolvers.basic: Fix resolution of IPv6 literals (in brackets) (fixes #1459)Kim Alvefur2019-11-241-0/+3
|
* net.resolvers.basic: Move IP literal check to constructorKim Alvefur2019-11-241-11/+14
| | | | | This is to prepare for fixing #1459. An IPv6 literal in [ ] brackets does not pass IDNA and resolving it fails there.
* core.modulemanager: Disable mod_vcard if mod_vcard_legacy is enabled to ↵Kim Alvefur2019-11-231-0/+5
| | | | prevent conflict (#1469)
* prosodyctl check: Warn about conflict between mod_vcard and mod_vcard_legacy ↵Kim Alvefur2019-11-231-0/+4
| | | | (#1469)
* MUC: Keep role across nickname change (fixes #1466)Kim Alvefur2019-11-231-0/+3
|