Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Backout ae48bf828f21 | Kim Alvefur | 2013-09-22 | 1 | -3/+0 |
| | |||||
* | Run with own LuaSec. | Tobias Markmann | 2011-01-17 | 1 | -0/+3 |
| | |||||
* | prosody: Don't add a datamanager callback when anonymous_login=true ↵ | Waqas Hussain | 2010-12-28 | 1 | -6/+0 |
| | | | | (mod_auth_anonymous does this now). | ||||
* | prosody: Catch a recursive Include error and print a more friendly error | Matthew Wild | 2010-12-21 | 1 | -2/+8 |
| | |||||
* | prosody, prosodyctl, util.dependencies: Split checking and logging of ↵ | Matthew Wild | 2010-12-20 | 1 | -6/+9 |
| | | | | dependencies so we can check hard deps before the config and logging is loaded | ||||
* | prosody: Added a comment, to match prosodyctl. | Waqas Hussain | 2010-12-12 | 1 | -0/+2 |
| | |||||
* | prosody: Don't attempt to load core.xmlhandlers in the main file. It no ↵ | Waqas Hussain | 2010-12-08 | 1 | -1/+0 |
| | | | | longer exists. | ||||
* | prosody: Added a stub implementation of core.componentmanager to the ↵ | Waqas Hussain | 2010-12-07 | 1 | -0/+4 |
| | | | | package.loaded table (re-commiting, as this was accidentally removed). | ||||
* | prosody, configmanager, certmanager: Relocate ↵ | Matthew Wild | 2010-11-10 | 1 | -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 Hussain | 2010-11-10 | 1 | -0/+4 |
| | | | | package.loaded table. | ||||
* | prosody: Removed all references to componentmanager from Prosody, except the ↵ | Waqas Hussain | 2010-11-10 | 1 | -1/+0 |
| | | | | main componentmanager file. | ||||
* | prosody: Ensure componentmanager is loaded in the main file. | Waqas Hussain | 2010-11-10 | 1 | -0/+1 |
| | |||||
* | prosody: Enable storage manager. | Waqas Hussain | 2010-07-31 | 1 | -0/+1 |
| | |||||
* | prosody.resolve_relative_path: Updated to take a parent path to resolve against. | Waqas Hussain | 2010-07-23 | 1 | -2/+2 |
| | |||||
* | prosody: Add prosody.resolve_relative_path() helper to change relative paths ↵ | Matthew Wild | 2010-07-13 | 1 | -0/+17 |
| | | | | to be relative to the config file | ||||
* | Merge 0.7->trunk | Matthew Wild | 2010-06-29 | 1 | -1/+1 |
|\ | |||||
| * | Merge backout | Matthew Wild | 2010-06-29 | 1 | -1/+1 |
| |\ | |||||
| | * | Backed out changeset 454e1cf18daf (this isn't for debugging, it's to inform ↵ | Matthew Wild | 2010-06-29 | 1 | -1/+1 |
| | | | | | | | | | | | | the user) | ||||
* | | | prosody: Load util.xmppstream :( | Matthew Wild | 2010-05-09 | 1 | -0/+1 |
| | | | |||||
* | | | Merge 0.7->trunk | Waqas Hussain | 2010-05-07 | 1 | -1/+5 |
|\| | | |||||
| * | | prosody: Modified function metatable for better string representation of ↵ | Waqas Hussain | 2010-05-07 | 1 | -0/+4 |
| |/ | | | | | | | functions. | ||||
| * | prosody: Lowered log level for a log message. | Waqas Hussain | 2010-05-07 | 1 | -1/+1 |
| | | |||||
* | | eventmanager, prosody: Adapt eventmanager to use prosody.events, as a step ↵ | Matthew Wild | 2010-05-04 | 1 | -11/+4 |
| | | | | | | | | towards removing it entirely | ||||
* | | Merge 0.7->trunk (with MUC needing checking, waqas) | Matthew Wild | 2010-05-04 | 1 | -0/+24 |
|\| | |||||
| * | prosody: Set metatable on functions to allow easy access to upvalues. | Waqas Hussain | 2010-04-19 | 1 | -0/+24 |
| | | |||||
* | | Merge 0.7->trunk | Matthew Wild | 2010-03-22 | 1 | -2/+2 |
|\| | |||||
| * | Merge 0.6->0.7 | Matthew Wild | 2010-03-22 | 1 | -2/+2 |
| |\ | |||||
| | * | Update copyright headers for 2010 | Matthew Wild | 2010-03-22 | 1 | -2/+2 |
| | | | |||||
| | * | Merge 0.6.2/waqas with 0.6.2/MattJ | Matthew Wild | 2010-03-03 | 1 | -4/+34 |
| | |\ | |||||
| | | * | prosody: More accurate friendly error message in the event that creating the ↵ | Matthew Wild | 2010-02-13 | 1 | -2/+6 |
| | | | | | | | | | | | | | | | | global SSL context fails | ||||
| | | * | prosody: Add a catch-all friendly message for when any port is in use we ↵ | Matthew Wild | 2010-02-05 | 1 | -0/+2 |
| | | | | | | | | | | | | | | | | want to use | ||||
| | | * | prosody: Show friendly error when no config present for legacy SSL ports | Matthew Wild | 2010-01-31 | 1 | -0/+3 |
| | | | | |||||
| | | * | prosody: Log error message when failing to open ports | Matthew Wild | 2010-01-31 | 1 | -1/+19 |
| | | | | |||||
| | | * | prosody: Listen for component connections on port 5347 by default. | Waqas Hussain | 2010-01-24 | 1 | -1/+1 |
| | | | | |||||
| | | * | prosody: Call tostring on the key being used for nil global read before ↵ | Waqas Hussain | 2009-12-10 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | concatenating it with a string. | ||||
| | | * | prosody: Log a warning and traceback, but don't throw an error on nil global ↵ | Waqas Hussain | 2009-12-10 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | read. | ||||
| | | * | Mainfile: Broke up a really long line. | Waqas Hussain | 2009-12-10 | 1 | -2/+5 |
| | | | | |||||
| | * | | util.dependencies: Load luarocks.loader/luarocks.require | Matthew Wild | 2010-01-28 | 1 | -1/+3 |
| | | | | |||||
| | * | | prosody: net_activate_ports: Accept strings as well as numbers for ↵ | Matthew Wild | 2010-01-09 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | specifying ports | ||||
| | * | | prosody: Fixed a possible nil concatenation. | Waqas Hussain | 2009-12-16 | 1 | -2/+2 |
| | | | | |||||
| | * | | prosody: Less strict matching for the magic 'interrupted' error | Matthew Wild | 2009-12-07 | 1 | -1/+1 |
| | | | | |||||
| | * | | Disable SSLv2 by default, it's known to be insecure. | Paul Aurich | 2009-12-04 | 1 | -1/+1 |
| | |/ | |||||
* | | | Merge with 0.7 | Matthew Wild | 2010-03-01 | 1 | -1/+1 |
|\| | | |||||
| * | | prosody: Bump log message describing current connection backend to level 'info' | Matthew Wild | 2010-02-27 | 1 | -1/+1 |
| | | | |||||
* | | | prosody: Don't add fallbacks to package.path and package.cpath. | Waqas Hussain | 2010-02-16 | 1 | -3/+0 |
|/ / | |||||
* | | prosody: More accurate friendly error message in the event that creating the ↵ | Matthew Wild | 2010-02-13 | 1 | -2/+6 |
| | | | | | | | | global SSL context fails | ||||
* | | prosody: Use certmanager to create the global SSL context | Matthew Wild | 2010-02-13 | 1 | -6/+3 |
| | | |||||
* | | prosody, prosodyctl: Re-jiggle load order again, fixes logging config not ↵ | Matthew Wild | 2010-02-11 | 1 | -28/+37 |
| | | | | | | | | being obeyed (thanks darkrain) | ||||
* | | prosody: Add a catch-all friendly message for when any port is in use we ↵ | Matthew Wild | 2010-02-05 | 1 | -0/+2 |
| | | | | | | | | want to use | ||||
* | | prosody: Initialize logging before checking dependencies (fixes another ↵ | Matthew Wild | 2010-02-05 | 1 | -3/+3 |
| | | | | | | | | traceback with no LuaSec) |