aboutsummaryrefslogtreecommitdiffstats
path: root/prosody
Commit message (Collapse)AuthorAgeFilesLines
* prosody, prosodyctl, util.startup: Finally factor out startup-related and ↵Matthew Wild2018-03-201-349/+4
| | | | common code into a separate module
* Merge 0.10->trunkKim Alvefur2017-09-291-2/+2
|\
| * prosody, prosodyctl: Print the actual config file name used when a problem ↵Kim Alvefur2017-09-271-2/+2
| | | | | | | | loading it was encountered (see #990)
* | Merge 0.10->trunkMatthew Wild2017-09-261-2/+2
|\|
| * prosody: Tiny whitespace fixKim Alvefur2017-09-241-2/+2
| |
* | Merge 0.10->trunkKim Alvefur2017-08-291-1/+1
|\|
| * prosody, prosodyctl: Fix traceback if ssl config is missing (thanks lookshe ↵Kim Alvefur2017-08-291-1/+1
| | | | | | | | and sol)
* | Merge 0.10->trunkKim Alvefur2017-08-281-1/+5
|\|
| * prosody, prosodyctl: Set up TLS settings for HTTPS requests in net.http ↵Kim Alvefur2017-07-071-1/+5
| | | | | | | | (part of fix for #659)
* | configmanager: Remove support for multiple parsers, fixes #852.Emmanuel Gil Peyrot2017-05-271-3/+1
| |
* | Merge 0.10->trunkKim Alvefur2017-01-291-19/+20
|\|
| * prosody: Silence warnings about setting the globals 'server' and 'socket' ↵Kim Alvefur2017-01-291-0/+1
| | | | | | | | [luacheck]
| * prosody: Trim trailing whitespaceKim Alvefur2017-01-291-19/+19
| |
* | Merge 0.10->trunkKim Alvefur2017-01-021-1/+1
|\|
| * prosody: Fix typoKim Alvefur2017-01-021-1/+1
| |
* | Merge 0.10->trunkKim Alvefur2016-11-211-8/+16
|\|
| * prosody: Add annotations to ignore various globals and unused arguments ↵Kim Alvefur2016-11-201-1/+9
| | | | | | | | [luacheck]
| * prosody: Set session tables on the 'prosody' global first, then export them ↵Kim Alvefur2016-11-201-7/+7
| | | | | | | | as globals
* | Update every link to the documentation to use HTTPSEmmanuel Gil Peyrot2016-04-161-1/+1
|/
* prosody, prosodyctl: Allow setting CFG_* variables via Lua interpreter ↵Matthew Wild2016-03-181-4/+4
| | | | before loading Prosody. Fixes #308.
* prosody: Allow prosody.shutdown() to take an exit code for the process ↵Matthew Wild2016-01-151-2/+7
| | | | (thanks daurnimator)
* prosody: Don't silently ignore unknown command-line optionsMatthew Wild2015-12-101-0/+6
|
* prosody: Fix sleep call that relied on the no longer existing socket globalKim Alvefur2015-11-161-1/+3
|
* prosody: Set a luasocket global, fixes undefined global access in loop() ↵Kim Alvefur2015-09-021-0/+1
| | | | (pending util.startup)
* statsmanager, prosody: New core module and API for gathering statistics ↵Matthew Wild2015-01-201-0/+1
| | | | about the running server
* prosody: Make getfenv() replacement for require() sandboxing local to avoid ↵Kim Alvefur2014-10-131-6/+4
| | | | polluting the globals table
* prosody: Fix getfenv replacement for Lua 5.2Kim Alvefur2014-09-171-1/+6
|
* Merge 0.9->0.10Kim Alvefur2014-04-101-3/+7
|\
| * prosody: Check dependencies later in the startup sequenceKim Alvefur2014-04-091-3/+7
| |
* | Merge 0.9->0.10Matthew Wild2013-12-131-1/+2
|\|
| * prosody: Store the config file name so the same file can be used when reloadingKim Alvefur2013-12-131-1/+2
| |
* | prosody: Remove global ssl context, no longer usedKim Alvefur2013-06-131-6/+0
|/
* prosody: load rostermanager after usermanager during environment initialization.Marco Cirillo2013-04-051-1/+1
|
* prosody, prosodyctl: Remove last trace of "core" \o/Kim Alvefur2013-03-231-2/+2
|
* prosody: Add COMPAT note about globalsMatthew Wild2013-03-221-0/+1
|
* configmanager, hostmanager, prosody: Almost complete removal of ↵Matthew Wild2013-03-221-2/+2
| | | | section-related code, and the infamous 'core' section. Still backwards-compatible with API users.
* prosodyctl, prosody: Pass the selected config file from prosodyctl to prosodyKim Alvefur2013-01-091-0/+2
|
* prosody, mod_c2s, mod_s2s: Move closing of c2s and s2s sessions to ↵Kim Alvefur2012-12-281-37/+0
| | | | respective plugins
* prosody, prosodyctl: chdir() to data directory on startupMatthew Wild2012-09-191-0/+5
|
* mod_admin_telnet, prosody, prosodyctl, ejabberd2prosody: Don't depend on ↵Florian Zeitz2012-06-091-1/+1
| | | | modules setting globals
* prosody: Define a getfenv() replacement for Lua 5.2Florian Zeitz2012-06-091-1/+5
|
* prosody, stanza_router: Load stanza_router earlier. Put routing functions in ↵Kim Alvefur2012-05-141-1/+1
| | | | the global prosody table. Fixes module:send()
* prosody: Load portmanager at startup, to ensure it is ready to receive ↵Matthew Wild2012-04-241-0/+1
| | | | item-added events when modules are loaded
* prosody: Don't require net.httpserver nowMatthew Wild2012-04-211-2/+0
|
* prosody: sandboxed require(): Point __index of _G at current env for modules ↵Matthew Wild2012-01-231-1/+5
| | | | that need to reference globals they already set
* prosody: Remove connlisteners, and net_activate_portsMatthew Wild2012-01-231-72/+0
|
* prosody: Ensure prosody.paths.config is never nil ↵Waqas Hussain2011-11-021-1/+1
| | | | (certmanager.create_context fails otherwise).
* prosody: Invalid escape sequence in componentmanager deprecation warning ↵Waqas Hussain2011-09-211-1/+1
| | | | (can cause luajit to throw).
* connlistener, server_select, prosody: Add support for binding to multiple ↵Florian Zeitz2011-06-151-24/+26
| | | | addresses
* prosody: Add sanity_check() to startup sequence. Check that we have at least ↵Matthew Wild2011-04-141-0/+14
| | | | one vhost enabled to avoid Bad Things.