aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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 modules...Matthew Wild2018-04-291-3/+6
* 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
* 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 2fdeb979...Kim Alvefur2018-04-141-1/+1
* | 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 to...Kim Alvefur2018-04-111-1/+1
* | mod_bosh: Increase number of stored responses to ensure we always keep respon...Matthew Wild2018-04-111-1/+1
* | 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 are...Kim Alvefur2018-04-101-1/+0
* | 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 (whi...Matthew Wild2018-04-101-1/+2
* | mod_bosh: Improve connection robustness with better handling of unexpected ridsMatthew Wild2018-04-101-12/+19
* | mod_bosh: Some additonal comments to improve code readabilityMatthew Wild2018-04-101-1/+3
* | mod_bosh: WhitespaceMatthew Wild2018-04-101-1/+0
* | mod_bosh: Improve logging - parse errors will now log through the session log...Matthew Wild2018-04-101-1/+2
* | mod_bosh: Improve logging on session close (reason may be a table with params)Matthew Wild2018-04-101-1/+1
* | Merge 0.10->trunkKim Alvefur2018-04-101-6/+3
|\|
| * mod_blocklist: Allow mod_presence to handle subscription stanzas before bounc...Kim Alvefur2018-04-061-6/+3
* | mod_register_limits: Promote log message about inability to apply black/white...Kim Alvefur2018-04-101-1/+1
* | mod_register_limits: Change debug message wording, there's no user yetKim Alvefur2018-04-101-1/+1
* | mod_register_limits: Use existing local variableKim Alvefur2018-04-101-2/+2
* | mod_register_ibr: Return a textual error to the user for problems with parsin...Kim Alvefur2018-04-091-1/+3
* | mod_register_ibr: Reshape the code using early returns to reduce needless ind...Kim Alvefur2018-04-071-58/+71
* | util.ringbuffer: Fix typo in comment [codespell]Kim Alvefur2018-04-061-1/+1
* | util.startup/prosodyctl: Delay enabling global protection until last (silence...Kim Alvefur2018-04-061-1/+1
* | util.startup: Fix traceback due to both plugin path becoming nil if plugin_pa...Kim Alvefur2018-04-061-1/+1
* | net.connlisteners: Remove duplicated field in exports [luacheck]Kim Alvefur2018-04-061-1/+0
* | Merge 0.10->trunkKim Alvefur2018-04-061-0/+1
|\|
| * net.http: Import setmetatable into local scope (fixes #1125)Kim Alvefur2018-04-061-0/+1
* | mod_ping: Ignore unused arguments [luacheck]Kim Alvefur2018-04-061-1/+1
* | Fix spelling throughout the codebase [codespell]Kim Alvefur2018-02-0417-35/+35
* | luacheckrc: No longer ignore use of the global 'server' (net.server)Kim Alvefur2018-04-051-1/+0
* | prosody: Get net.server via requre to avoid relying on globalsKim Alvefur2018-04-051-0/+1
* | mod_muc_mam: Save the MUC <x> on recorded join stanzasKim Alvefur2018-03-241-1/+1
* | mod_muc_mam: Let muc/history.lib decide which messages to storeKim Alvefur2018-03-241-4/+2
* | mod_muc_mam: Remove 0.10 compat codeKim Alvefur2017-12-121-97/+4
* | mod_muc_mam: Import mod_mam_muc from prosody-modules ba6466fa6823Kim Alvefur2018-04-022-0/+463
* | util.startup: Set up event hooks for reloading logging here instead of in log...Kim Alvefur2018-04-052-7/+6
* | util.startup: Initialize prosody.log / _G.log here instead of in loggingmanag...Kim Alvefur2018-04-052-4/+5
* | util.startup: Initialize logging earlier, so that messages from eg net.server...Kim Alvefur2018-04-051-1/+1
* | prosodyctl: Use prosody.hosts instead of _G.hostsKim Alvefur2018-03-291-8/+8