aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* luacheckrc: Remove allowance for the global log() since it may not exist as ↵Kim Alvefur2018-04-051-1/+0
| | | | early as before
* Merge 0.10 -> trunkMatthew Wild2018-04-041-2/+1
|\
| * CHANGES: Normalize syntaxKim Alvefur2018-04-031-2/+1
| |
* | Merge 0.10 -> trunkMatthew Wild2018-04-041-1/+1
|\|
| * net.http: Fix parameter order to http request callbacksMatthew Wild2018-04-041-1/+1
| | | | | | | | | | | | Commit e3b9dc9dd940 changed the parameter order in 2013, but did not update the names of the parameters in the callback function. Due to this inconsistency, 12df41a5a4b1 accidentally reversed the order when fixing the variable names without fixing where they are used. Additionally the documentation was incorrect (since 2013), and this has also now been fixed.
| * MUC: Don't reply to errors with more errors (fixes #1122)Kim Alvefur2018-03-281-1/+3
| |
| * MUC: Say something about storage failure before aborting (see #1091)Kim Alvefur2018-03-121-0/+1
| |
| * MUC: Prevent creation of room that could not be loaded from storage (see #1091)Kim Alvefur2018-03-091-2/+8
| |
| * MUC: Abort module loading if unable to get list of persistent rooms from ↵Kim Alvefur2018-03-071-1/+5
| | | | | | | | storage (fixes #1091)
* | prosodyctl: Increase robustness in luarocks version detection (fixes #1003)Kim Alvefur2018-03-301-3/+9
| |
* | Backed out changeset a0f728c3aa69 in favor of 580c13ed0ca1Kim Alvefur2018-03-291-7/+3
| |
* | util.startup: Initialize the 'prosody' global earlier (various things needs ↵Kim Alvefur2018-03-291-2/+2
| | | | | | | | the global util.events instance)
* | util.startup: Factor out processing of plugin and data paths into a separate ↵Kim Alvefur2018-03-291-9/+20
| | | | | | | | functions
* | util.json: Unescape surrogate pairsMatthew Wild2018-03-271-4/+5
| |
* | mod_pep_plus: Validate items here too (thanks Link Mauve)Kim Alvefur2018-03-251-0/+5
| |
* | mod_pubsub: Reject publishing of non-itemsKim Alvefur2018-03-211-0/+5
| |
* | util.pubsub: Allow setting a callback for validating items to be publishedKim Alvefur2018-03-211-0/+4
| |
* | loggingmanager: Hook event for reopening log files instead of config reloadedKim Alvefur2018-03-251-1/+1
| |
* | configmanager: Move firing of the 'config-reloaded' event into util.startup ↵Kim Alvefur2018-03-252-7/+5
| | | | | | | | (fixes #1117)
* | storagemanager: Default storage_async_check to false for a whileMatthew Wild2018-03-251-1/+1
| |
* | net.http: Allow enabling/disabling error suppression, useful for testsMatthew Wild2018-03-241-2/+7
| |
* | net.http: Fix for Lua 5.2: return error from error handler (xpcall changed)Matthew Wild2018-03-241-1/+1
| |
* | util.startup: Read version for prosodyctl (restores version in 'about' command)Kim Alvefur2018-03-241-0/+1
| |
* | net.http.server: Prevent loading of net.server in tests (breaks unrelated ↵Kim Alvefur2018-03-241-0/+1
| | | | | | | | tests for some reason)
* | net.server: Try to require configmanager instead checking for the prosody ↵Kim Alvefur2018-03-231-3/+7
| | | | | | | | global which does not yet exist when net.server is loaded now
* | util.timer: Move sleep() here from util.asyncKim Alvefur2018-03-232-8/+8
| | | | | | | | This is to solve a indirect dependency issue where net.server was initialized before the config was read
* | util.async: Remove last trace of async.once [luacheck]Kim Alvefur2018-03-231-1/+0
| |
* | util.async: Remove async.once(), can now be replaced by runner():run(func)Matthew Wild2018-03-232-33/+0
| |
* | prosody, util.startup: Switch from async.once() to long-lived thread, to ↵Matthew Wild2018-03-232-26/+28
| | | | | | | | avoid GC
* | util.async: Make parameters to async.runner() optionalMatthew Wild2018-03-232-3/+27
| |
* | mod_announce: Remove unreachable return statement [luacheck]Kim Alvefur2018-03-231-2/+0
| |
* | net.httpserver: Make function local, fixes loading since there is no ↵Kim Alvefur2018-03-231-1/+1
| | | | | | | | environment [luacheck]
* | luacheckrc: Allow top level variables in prosodyctl (eg CFG_*) [luacheck]Kim Alvefur2018-03-231-0/+4
| |
* | luacheckrc: Let luacheck know about the log and server globalsKim Alvefur2018-03-231-0/+2
| |
* | stanza_router: Limit scope of deprecated warning function since it is not ↵Kim Alvefur2018-03-231-1/+1
| | | | | | | | used anywhere else [luacheck]
* | s2smanager: Explicitly export the incoming_s2s table [luacheck]Kim Alvefur2018-03-231-2/+2
| |
* | luacheckrc: Only allow top level declarations in the main prosody executableKim Alvefur2018-03-231-1/+5
| |
* | util.startup: Expose make_host() functionMatthew Wild2018-03-221-10/+11
| |
* | util.startup: Expose user switching information via prosody global objectMatthew Wild2018-03-221-5/+4
| |
* | prosodyctl: Large number of changes to satisfy [luacheck], includes bug fixesMatthew Wild2018-03-221-113/+131
| |
* | storagemanager: Remove unused variable [luacheck]Kim Alvefur2018-03-221-1/+1
| |
* | util.async: Use wrapper for once runner (thanks luacheck)Kim Alvefur2018-03-222-1/+2
| |
* | prosodyctl, util.prosodyctl: Pass source path as a parameter instead of ↵Matthew Wild2018-03-222-6/+4
| | | | | | | | global variable
* | util.startup: Fix variable usage [luacheck]Matthew Wild2018-03-221-3/+3
| |
* | util.startup: Move original_logging_config to a local variableMatthew Wild2018-03-221-1/+3
| |
* | util.startup: Restore user switchingMatthew Wild2018-03-221-1/+2
| |
* | util.startup: Fix chdir() to use correct path variableMatthew Wild2018-03-221-7/+7
| |
* | mod_posix: Delay setting signal handlers until in the main threadMatthew Wild2018-03-221-18/+20
| | | | | | | | Signal handlers work by setting a debug hook. Hooks are per-thread, so we need this to be called in the main thread. However module loading is not in the main thread anymore.
* | MUC: Catch and log error in case of storage failure in iterator over roomsKim Alvefur2018-03-151-1/+9
| |
* | MUC: Override methods on broken rooms to return internal-server-error insteadKim Alvefur2018-03-221-0/+8
| |