aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | Merge 0.10 -> trunkMatthew Wild2018-05-160-0/+0
|\| |
| * | MUC: Restore status codes on presence sent to occupant when their ↵Matthew Wild2018-05-161-2/+6
| | | | | | | | | | | | affiliation changes (thanks jonasw)
* | | Merge 0.10 -> trunkMatthew Wild2018-05-162-2/+33
|\| | | | | | | | | | | | | | This commit intentionally drops changes from c2b99fa134b3 and 8da11142fabf which are based on older MUC code.
| * | MUC: Allow the number of messages sent by default to be configured (fixes #397)Matthew Wild2018-05-161-1/+22
| | |
| * | MUC: Import revised, more comprehensive patch for 8da11142fabf (#345)Matthew Wild2018-05-161-95/+207
| | |
| * | muc: Allow clients to change multiple affiliations or roles at once (#345)Lennart Sauerbeck2017-03-181-7/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | According to XEP-0045 sections 9.2, 9.5 and 9.8 affiliation lists and role lists should allow mass-modification. Prosody however would just use the first entry of the list and ignore the rest. This is fixed by introducing a `for` loop to `set` stanzas of the respective `muc#admin` namespace. In order for this loop to work, the error handling was changed a little. Prosody no longer returns after the first error. Instead, an error reply is sent for each malformed or otherwise wrong entry, but the loop keeps going over the other entries. This may lead to multiple error messages being sent for one client request. A notable exception from this is when the XML Schema for `muc#admin` requests is violated. In that case the loop is aborted with an error message to the client. The change is a bit bigger than that in order to have the loop only for `set` stanzas without changing the behaviour of the `get` stanzas. This is now more in line with trunk, where there are separate methods for each stanza type. References: #345
| * | Added tag 0.10.1 for changeset 4ae8dd415e94Matthew Wild2018-05-110-0/+0
| | |
| * | mod_websocket: Store the request object on the session for use by other modules0.10.1Matthew Wild2018-05-081-0/+1
| | |
* | | util.async: Move runner id into log tagKim Alvefur2018-05-041-3/+6
| | | | | | | | | | | | Avoids string concatenation in every logger call
* | | prosodyctl: Config check for modules that are also components (fixes #1138)Kim Alvefur2018-05-111-0/+13
| | |
* | | mod_muc_mam: Have stanza-id filtering over all groupchat messages, not just ↵Kim Alvefur2018-04-281-4/+9
| | | | | | | | | | | | ones considered for history
* | | mod_muc_mam: Skip fetching history if built-in recent history is enoughKim Alvefur2018-04-271-0/+4
| | |
* | | mod_muc_mam: Skip fetching history if no history was requestedKim Alvefur2018-04-281-0/+4
| | |
* | | mod_muc_mam: Tweak calculation of max history to retrieveKim Alvefur2018-04-281-2/+6
| | |
* | | GNUMakefile: Add note about how to list coverage of individual filesMatthew Wild2018-04-301-0/+1
| | |
* | | net.server: Add watchfd, a simple API for watching file descriptorsKim Alvefur2018-05-094-0/+106
| | |
* | | MUC: Introduce an event to allow plugins to influence which messages are ↵Kim Alvefur2018-05-071-2/+5
| | | | | | | | | | | | added to history
* | | MUC: Move condition for what gets added to history so that other modules ↵Kim Alvefur2018-05-071-16/+16
| | | | | | | | | | | | | | | | | | | | | benefit (thanks jcbrand) This helps mod_muc_mam avoid logging eg chat-state-only messages without needing to implement similar logic in many places
* | | net.server_epoll: Guard against connection missing the getpeername method ↵Kim Alvefur2018-05-021-1/+1
| | | | | | | | | | | | (thanks LuaSec)
* | | net.server_epoll: Retry retrieving peername once connectedKim Alvefur2018-05-021-0/+3
| | |
* | | net.server_epoll: Handle connection being closed and destroyed in onconnect ↵Kim Alvefur2018-05-021-0/+1
| | | | | | | | | | | | callback
* | | net.resolvers.basic: Support IP address literalsKim Alvefur2018-05-021-0/+11
| | |
* | | mod_privacy: Silence long line warning [luacheck]Kim Alvefur2018-05-021-1/+1
| | |
* | | mod_admin_adhoc: Silence various harmless warnings [luacheck]Kim Alvefur2018-05-011-0/+1
| | |
* | | mod_admin_adhoc: Rename loop variable to avoid name clash [luacheck]Kim Alvefur2018-05-011-2/+2
| | |
* | | mod_admin_adhoc: Rename variable to avoid name clash [luacheck]Kim Alvefur2018-05-011-7/+7
| | |
* | | mod_admin_adhoc: Remove unused initial values [luacheck]Kim Alvefur2018-05-011-2/+2
| | |
* | | mod_admin_adhoc: Split a long line (improves readability) [luacheck]Kim Alvefur2018-05-011-1/+6
| | |
* | | mod_legacyauth: Split a long line [luacheck]Kim Alvefur2018-05-011-1/+2
| | |
* | | mod_bosh: Fix inconsistent whitespace [luacheck]Kim Alvefur2018-05-011-2/+2
| | |
* | | util.async: Add helper methods for setting watchersMatthew Wild2018-04-301-0/+16
| | |
* | | mod_bosh: Fix for 7be8f649d97d to skip error handling and allow other ↵Matthew Wild2018-04-291-3/+6
| | | | | | | | | | | | modules to handle the request
* | | mod_c2s: Add a counter for IPv6.Emmanuel Gil Peyrot2017-09-091-1/+7
| | |
* | | mod_s2s: Add a counter for IPv6.Emmanuel Gil Peyrot2017-09-091-1/+7
| | |
* | | util.timer: Ensure we don't try to schedule negative timeouts (which rightly ↵Matthew Wild2018-04-291-1/+2
| | | | | | | | | | | | upset libevent). Fixes #1135
* | | util.events: Add more tests (100% line coverage)Matthew Wild2018-04-251-0/+21
| | |
* | | util.events: Add testsMatthew Wild2018-04-241-0/+191
| | |
* | | Merge 0.10->trunkMatthew Wild2018-04-242-2/+2
|\| |
| * | util.events: Fix loop construct (negative step required)Matthew Wild2018-04-241-1/+1
| | |
| * | mod_http_files: Correct cache insertion (fixes #1130)Kim Alvefur2018-04-171-1/+1
| | |
* | | util.startup: Don't initialize global protection for prosodyctl, for nowMatthew Wild2018-04-181-1/+0
| | |
* | | util.startup: Force console logging before initializing logging (see ↵Kim Alvefur2018-04-141-1/+1
| | | | | | | | | | | | 2fdeb979cc7c)
* | | MUC: Move something into empty if branchKim Alvefur2018-03-091-3/+2
| | |
* | | mod_pep_plus: Skip getting PEP service instance for sessions that have not ↵Kim Alvefur2018-04-111-1/+1
| | | | | | | | | | | | touched PEP
* | | mod_bosh: Increase number of stored responses to ensure we always keep ↵Matthew Wild2018-04-111-1/+1
| | | | | | | | | | | | responses within the rid window available
* | | net.server_event: Don't close servers if just quitting the loop onceMatthew Wild2018-04-101-1/+3
| | |
* | | loggingmanager: Remove luacheck annotations for global log functions that ↵Kim Alvefur2018-04-101-1/+0
| | | | | | | | | | | | are now set in util.startup
* | | net.server_select: Allow setquitting("once") to allow resuming the loop laterMatthew Wild2018-04-101-2/+2
| | |
* | | util.startup: Initialize logging immediately after configuration is read ↵Matthew Wild2018-04-101-1/+2
| | | | | | | | | | | | (which is how it used to work)
* | | mod_bosh: Improve connection robustness with better handling of unexpected ridsMatthew Wild2018-04-101-12/+19
| | |