Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | prosody: Load util.xmppstream :( | Matthew Wild | 2010-05-09 | 1 | -0/+1 | |
| | | | | | | ||||||
* | | | | | | util.xmppstream: Stream objects now just have feed/reset methods | Matthew Wild | 2010-05-09 | 1 | -4/+22 | |
| | | | | | | ||||||
* | | | | | | usermanager: Bump log level of incorrect config option warnings | Matthew Wild | 2010-05-07 | 1 | -2/+2 | |
| | | | | | | ||||||
* | | | | | | usermanager: Fix for is_admin to work with the new auth provider architecture | Matthew Wild | 2010-05-07 | 1 | -7/+16 | |
| | | | | | | ||||||
* | | | | | | Merge 0.7->trunk | Waqas Hussain | 2010-05-07 | 3 | -3/+10 | |
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | ||||||
| * | | | | | Merge 0.6->0.7 | Waqas Hussain | 2010-05-07 | 2 | -2/+4 | |
| |\ \ \ \ \ | | | |/ / / | | |/| | | | ||||||
| | * | | | | mod_console: Set a chunk name for loadstring calls (nicer errors). | Waqas Hussain | 2010-05-07 | 1 | -2/+3 | |
| | | | | | | ||||||
| | * | | | | mod_posix: Fixed a global access. | Waqas Hussain | 2010-05-07 | 1 | -0/+1 | |
| | | | | | | ||||||
| * | | | | | mod_console: Ensure that a null byte is printed after sending the banner. | Waqas Hussain | 2010-05-07 | 1 | -0/+1 | |
| | | | | | | ||||||
| * | | | | | 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 | |
| | | | | | ||||||
* | | | | | mod_posix: Don't add a server-starting event handler while the ↵ | Waqas Hussain | 2010-05-07 | 1 | -10/+12 | |
| | | | | | | | | | | | | | | | | | | | | server-starting event is being fired. | |||||
* | | | | | net.server_select: Remove some debugging code. | Waqas Hussain | 2010-05-06 | 1 | -3/+0 | |
| | | | | | ||||||
* | | | | | Merge 0.7->trunk | Waqas Hussain | 2010-05-06 | 1 | -1/+1 | |
|\| | | | | ||||||
| * | | | | Merge 0.6->0.7 | Waqas Hussain | 2010-05-06 | 0 | -0/+0 | |
| |\| | | | ||||||
| | * | | | loggingmanager: Enable debug level for default console logging when 'debug' ↵ | Waqas Hussain | 2010-05-06 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | mode is enabled in the config. | |||||
| * | | | | loggingmanager: Enable debug level for default console logging when 'debug' ↵ | Waqas Hussain | 2010-05-06 | 1 | -1/+1 | |
| | |/ / | |/| | | | | | | | | | | mode is enabled in the config. | |||||
* | | | | util.sasl.scram: Fixed global access. | Waqas Hussain | 2010-05-06 | 1 | -2/+2 | |
| | | | | ||||||
* | | | | prosodyctl: Use the global events objects for hosts (again) (thanks albert) ↵ | Matthew Wild | 2010-05-05 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | (sorry albert) | |||||
* | | | | prosodyctl: Give each host an independant events object, because it seems to ↵ | Matthew Wild | 2010-05-05 | 1 | -3/+1 | |
| | | | | | | | | | | | | | | | | be the right thing to do | |||||
* | | | | prosodyctl: Relocate global prosody object creation (see fff153f7f4de) | Matthew Wild | 2010-05-05 | 1 | -2/+8 | |
| | | | | ||||||
* | | | | Merge configmanager->trunk | Matthew Wild | 2010-05-05 | 1 | -3/+4 | |
|\ \ \ \ | ||||||
| * | | | | configmanager: Add VirtualHost as an alias for Host (re-applied in trunk due ↵ | Matthew Wild | 2010-04-14 | 1 | -3/+3 | |
| | | | | | | | | | | | | | | | | | | | | to previous bad merge with 0.7) | |||||
* | | | | | Merge 0.7->trunk | Matthew Wild | 2010-05-05 | 2 | -63/+63 | |
|\ \ \ \ \ | | |/ / / | |/| | | | ||||||
| * | | | | mod_console: Make use of the new onconnect callback to initialise session ↵ | Matthew Wild | 2010-05-05 | 1 | -62/+62 | |
| | | | | | | | | | | | | | | | | | | | | and send banner | |||||
| * | | | | net.server_select: Fix typo affecting connections with an onconnect listener ↵ | Matthew Wild | 2010-05-05 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | that have data pending in the sendbuffer | |||||
* | | | | | Merge 0.7->trunk | Matthew Wild | 2010-05-05 | 3 | -28/+100 | |
|\| | | | | ||||||
| * | | | | mod_proxy65: Send error reply to activation stanza if one or both parties ↵ | Matthew Wild | 2010-05-05 | 1 | -0/+10 | |
| | | | | | | | | | | | | | | | | | | | | were not connected to the proxy | |||||
| * | | | | mod_proxy65: Return service-unavailable error when receiving an iq we didn't ↵ | Matthew Wild | 2010-05-05 | 1 | -0/+3 | |
| | | | | | | | | | | | | | | | | | | | | understand | |||||
| * | | | | mod_proxy65: Use new server.link to link proxied connections, now works with ↵ | Matthew Wild | 2010-05-05 | 1 | -24/+4 | |
| | | | | | | | | | | | | | | | | | | | | either connection backend | |||||
| * | | | | net.server_select, net.server_event: Add server.link() to link 2 connections ↵ | Matthew Wild | 2010-05-05 | 2 | -0/+44 | |
| | | | | | | | | | | | | | | | | | | | | with an intermediate buffer of the specified size | |||||
| * | | | | net.server_select, net.server_event: Support for ondrain listener callback ↵ | Matthew Wild | 2010-05-05 | 2 | -1/+9 | |
| | | | | | | | | | | | | | | | | | | | | for when send buffer is empty | |||||
| * | | | | net.server_select, net.server_event: Rename :pattern() method to :set_mode() ↵ | Matthew Wild | 2010-05-05 | 2 | -2/+9 | |
| | | | | | | | | | | | | | | | | | | | | for select backend, and add :set_mode() to event backend | |||||
| * | | | | net.server_select, net.server_event: Support for :pause() and :resume() on ↵ | Matthew Wild | 2010-05-05 | 2 | -1/+21 | |
| | | | | | | | | | | | | | | | | | | | | connections | |||||
* | | | | | usermanager: Give the default auth provider a name, you'll never guess what ↵ | Matthew Wild | 2010-05-05 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | it is. | |||||
* | | | | | Merge Tobias's fancy SASL branch->trunk | Matthew Wild | 2010-05-05 | 6 | -83/+142 | |
|\ \ \ \ \ | ||||||
| * \ \ \ \ | Merge with tip. | Tobias Markmann | 2010-03-12 | 11 | -73/+84 | |
| |\ \ \ \ \ | ||||||
| * | | | | | | util.sasl: 2009 -> 2010 in copyright header. | Tobias Markmann | 2010-03-12 | 6 | -5/+8 | |
| | | | | | | | ||||||
| * | | | | | | util.sasl.scram: Adjusting authentication backend name to conform with the ↵ | Tobias Markmann | 2010-02-28 | 1 | -2/+2 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | style already used by the plain module. | |||||
| * | | | | | | util.sasl.plain: Adding plain_hashed authentication backend support. | Tobias Markmann | 2010-02-28 | 1 | -1/+10 | |
| | | | | | | | ||||||
| * | | | | | | util.sasl.scram: Adding documentation on SCRAM authentication backend. | Tobias Markmann | 2010-02-28 | 1 | -0/+10 | |
| | | | | | | | ||||||
| * | | | | | | util.sasl.anonymous: Adding documentation on anonymous authentication backend. | Tobias Markmann | 2010-02-28 | 1 | -0/+10 | |
| | | | | | | | ||||||
| * | | | | | | util.sasl: Moving SASL authentication backends documentation to the ↵ | Tobias Markmann | 2010-02-28 | 3 | -21/+30 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | mechanism files. | |||||
| * | | | | | | util.sasl: Abstracting out the hash function used since SCRAM is independent ↵ | Tobias Markmann | 2010-02-28 | 1 | -57/+75 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | of it. Adding scram-{mech} authentication backend support. | |||||
* | | | | | | | Merge 0.7->trunk | Matthew Wild | 2010-05-05 | 1 | -1/+2 | |
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | ||||||
| * | | | | | | net.server_event: Be sure to fire onincoming for backwards-compatibility ↵ | Matthew Wild | 2010-05-05 | 1 | -1/+2 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | with pre-onconnect listeners (thanks darkrain/mod_console) | |||||
* | | | | | | | usermanager: Support for pluggable authentication providers | Matthew Wild | 2010-05-05 | 1 | -48/+83 | |
| | | | | | | | ||||||
* | | | | | | | eventmanager, prosody: Adapt eventmanager to use prosody.events, as a step ↵ | Matthew Wild | 2010-05-04 | 2 | -22/+9 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | towards removing it entirely | |||||
* | | | | | | | Merge 0.7->trunk (with MUC needing checking, waqas) | Matthew Wild | 2010-05-04 | 4 | -126/+147 | |
|\| | | | | | | ||||||
| * | | | | | | Merge 0.6 into 0.7. | Waqas Hussain | 2010-05-01 | 4 | -129/+118 | |
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | | |