aboutsummaryrefslogtreecommitdiffstats
path: root/prosody
Commit message (Collapse)AuthorAgeFilesLines
* eventmanager, prosody: Adapt eventmanager to use prosody.events, as a step ↵Matthew Wild2010-05-041-11/+4
| | | | towards removing it entirely
* Merge 0.7->trunk (with MUC needing checking, waqas)Matthew Wild2010-05-041-0/+24
|\
| * prosody: Set metatable on functions to allow easy access to upvalues.Waqas Hussain2010-04-191-0/+24
| |
* | Merge 0.7->trunkMatthew Wild2010-03-221-2/+2
|\|
| * Merge 0.6->0.7Matthew Wild2010-03-221-2/+2
| |\
| | * Update copyright headers for 2010Matthew Wild2010-03-221-2/+2
| | |
| | * Merge 0.6.2/waqas with 0.6.2/MattJMatthew Wild2010-03-031-4/+34
| | |\
| | | * prosody: More accurate friendly error message in the event that creating the ↵Matthew Wild2010-02-131-2/+6
| | | | | | | | | | | | | | | | global SSL context fails
| | | * prosody: Add a catch-all friendly message for when any port is in use we ↵Matthew Wild2010-02-051-0/+2
| | | | | | | | | | | | | | | | want to use
| | | * prosody: Show friendly error when no config present for legacy SSL portsMatthew Wild2010-01-311-0/+3
| | | |
| | | * prosody: Log error message when failing to open portsMatthew Wild2010-01-311-1/+19
| | | |
| | | * prosody: Listen for component connections on port 5347 by default.Waqas Hussain2010-01-241-1/+1
| | | |
| | | * prosody: Call tostring on the key being used for nil global read before ↵Waqas Hussain2009-12-101-1/+1
| | | | | | | | | | | | | | | | concatenating it with a string.
| | | * prosody: Log a warning and traceback, but don't throw an error on nil global ↵Waqas Hussain2009-12-101-1/+1
| | | | | | | | | | | | | | | | read.
| | | * Mainfile: Broke up a really long line.Waqas Hussain2009-12-101-2/+5
| | | |
| | * | util.dependencies: Load luarocks.loader/luarocks.requireMatthew Wild2010-01-281-1/+3
| | | |
| | * | prosody: net_activate_ports: Accept strings as well as numbers for ↵Matthew Wild2010-01-091-0/+1
| | | | | | | | | | | | | | | | specifying ports
| | * | prosody: Fixed a possible nil concatenation.Waqas Hussain2009-12-161-2/+2
| | | |
| | * | prosody: Less strict matching for the magic 'interrupted' errorMatthew Wild2009-12-071-1/+1
| | | |
| | * | Disable SSLv2 by default, it's known to be insecure.Paul Aurich2009-12-041-1/+1
| | |/
* | | Merge with 0.7Matthew Wild2010-03-011-1/+1
|\| |
| * | prosody: Bump log message describing current connection backend to level 'info'Matthew Wild2010-02-271-1/+1
| | |
* | | prosody: Don't add fallbacks to package.path and package.cpath.Waqas Hussain2010-02-161-3/+0
|/ /
* | prosody: More accurate friendly error message in the event that creating the ↵Matthew Wild2010-02-131-2/+6
| | | | | | | | global SSL context fails
* | prosody: Use certmanager to create the global SSL contextMatthew Wild2010-02-131-6/+3
| |
* | prosody, prosodyctl: Re-jiggle load order again, fixes logging config not ↵Matthew Wild2010-02-111-28/+37
| | | | | | | | being obeyed (thanks darkrain)
* | prosody: Add a catch-all friendly message for when any port is in use we ↵Matthew Wild2010-02-051-0/+2
| | | | | | | | want to use
* | prosody: Initialize logging before checking dependencies (fixes another ↵Matthew Wild2010-02-051-3/+3
| | | | | | | | traceback with no LuaSec)
* | prosody: Show friendly error when no config present for legacy SSL portsMatthew Wild2010-01-311-0/+3
| |
* | prosody: Log error message when failing to open portsMatthew Wild2010-01-311-1/+19
| |
* | prosody: Only set the ssl_ctx for 'ssl' connectionsMatthew Wild2010-01-311-1/+1
| |
* | prosody: Check dependencies (and load LuaRocks) earlier on in the startup ↵Matthew Wild2010-01-281-7/+4
| | | | | | | | process
* | util.dependencies, prosody, prosodyctl: Give util.dependencies a ↵Matthew Wild2010-01-281-1/+3
| | | | | | | | check_dependencies() function so the caller can decide what to do when dependencies aren't met - update prosody/prosodyctl for this change
* | prosody: Listen for component connections on port 5347 by default.Waqas Hussain2010-01-241-1/+1
| |
* | prosody: net_activate_ports: Accept strings as well as numbers for ↵Matthew Wild2010-01-091-0/+1
| | | | | | | | specifying ports
* | prosody: Read list of possible config extensions from configmanager, removes ↵Matthew Wild2010-01-091-3/+3
| | | | | | | | old TODO
* | prosody: Fixed a possible nil concatenation.Waqas Hussain2009-12-161-2/+2
| |
* | prosody: Fix to net_activate_ports to mend binding to specific interfacesPaul Aurich2009-12-151-4/+4
| |
* | prosody: Added config option 'ssl_ports' to allow multiplexed SSL ports.Waqas Hussain2009-12-101-0/+3
| |
* | prosody: Use the multiplex listener when the 'ports' config option is specified.Waqas Hussain2009-12-101-4/+8
| |
* | net_activate_ports: Use the default config option 'ports' when no option is ↵Waqas Hussain2009-12-101-1/+2
| | | | | | | | specified.
* | prosody: Call tostring on the key being used for nil global read before ↵Waqas Hussain2009-12-101-1/+1
| | | | | | | | concatenating it with a string.
* | prosody: Log a warning and traceback, but don't throw an error on nil global ↵Waqas Hussain2009-12-101-1/+1
| | | | | | | | read.
* | Mainfile: Broke up a really long line.Waqas Hussain2009-12-101-3/+6
| |
* | prosody: Report the current socket backend in useMatthew Wild2009-12-081-0/+1
| |
* | prosody: Clarify and add some comments to describe what we're doing when and whyMatthew Wild2009-12-081-3/+12
| |
* | prosody: Less strict matching for the magic 'interrupted' errorMatthew Wild2009-12-071-1/+1
| |
* | prosody: Expose global_ssl_ctx through prosody objectMatthew Wild2009-12-041-0/+1
| |
* | Disable SSLv2 by default, it's known to be insecure.Paul Aurich2009-12-041-1/+1
|/
* prosody: Added support for command line argument '--config'.Waqas Hussain2009-11-231-1/+21
|