aboutsummaryrefslogtreecommitdiffstats
path: root/prosody
Commit message (Collapse)AuthorAgeFilesLines
* Backout ae48bf828f21Kim Alvefur2013-09-221-3/+0
|
* Run with own LuaSec.Tobias Markmann2011-01-171-0/+3
|
* prosody: Don't add a datamanager callback when anonymous_login=true ↵Waqas Hussain2010-12-281-6/+0
| | | | (mod_auth_anonymous does this now).
* prosody: Catch a recursive Include error and print a more friendly errorMatthew Wild2010-12-211-2/+8
|
* prosody, prosodyctl, util.dependencies: Split checking and logging of ↵Matthew Wild2010-12-201-6/+9
| | | | dependencies so we can check hard deps before the config and logging is loaded
* prosody: Added a comment, to match prosodyctl.Waqas Hussain2010-12-121-0/+2
|
* prosody: Don't attempt to load core.xmlhandlers in the main file. It no ↵Waqas Hussain2010-12-081-1/+0
| | | | longer exists.
* prosody: Added a stub implementation of core.componentmanager to the ↵Waqas Hussain2010-12-071-0/+4
| | | | package.loaded table (re-commiting, as this was accidentally removed).
* prosody, configmanager, certmanager: Relocate ↵Matthew Wild2010-11-101-21/+0
| | | | prosody.resolve_relative_path() to configmanager, and update certmanager (the only user of this function)
* prosody: Added a stub implementation of core.componentmanager to the ↵Waqas Hussain2010-11-101-0/+4
| | | | package.loaded table.
* prosody: Removed all references to componentmanager from Prosody, except the ↵Waqas Hussain2010-11-101-1/+0
| | | | main componentmanager file.
* prosody: Ensure componentmanager is loaded in the main file.Waqas Hussain2010-11-101-0/+1
|
* prosody: Enable storage manager.Waqas Hussain2010-07-311-0/+1
|
* prosody.resolve_relative_path: Updated to take a parent path to resolve against.Waqas Hussain2010-07-231-2/+2
|
* prosody: Add prosody.resolve_relative_path() helper to change relative paths ↵Matthew Wild2010-07-131-0/+17
| | | | to be relative to the config file
* Merge 0.7->trunkMatthew Wild2010-06-291-1/+1
|\
| * Merge backoutMatthew Wild2010-06-291-1/+1
| |\
| | * Backed out changeset 454e1cf18daf (this isn't for debugging, it's to inform ↵Matthew Wild2010-06-291-1/+1
| | | | | | | | | | | | the user)
* | | prosody: Load util.xmppstream :(Matthew Wild2010-05-091-0/+1
| | |
* | | Merge 0.7->trunkWaqas Hussain2010-05-071-1/+5
|\| |
| * | prosody: Modified function metatable for better string representation of ↵Waqas Hussain2010-05-071-0/+4
| |/ | | | | | | functions.
| * prosody: Lowered log level for a log message.Waqas Hussain2010-05-071-1/+1
| |
* | 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)