aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge 0.7->trunkWaqas Hussain2010-05-073-3/+10
|\
| * Merge 0.6->0.7Waqas Hussain2010-05-072-2/+4
| |\
| | * mod_console: Set a chunk name for loadstring calls (nicer errors).Waqas Hussain2010-05-071-2/+3
| | |
| | * mod_posix: Fixed a global access.Waqas Hussain2010-05-071-0/+1
| | |
| * | mod_console: Ensure that a null byte is printed after sending the banner.Waqas Hussain2010-05-071-0/+1
| | |
| * | 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
| | |
* | | mod_posix: Don't add a server-starting event handler while the ↵Waqas Hussain2010-05-071-10/+12
| | | | | | | | | | | | server-starting event is being fired.
* | | net.server_select: Remove some debugging code.Waqas Hussain2010-05-061-3/+0
| | |
* | | Merge 0.7->trunkWaqas Hussain2010-05-061-1/+1
|\| |
| * | Merge 0.6->0.7Waqas Hussain2010-05-060-0/+0
| |\|
| | * loggingmanager: Enable debug level for default console logging when 'debug' ↵Waqas Hussain2010-05-061-1/+1
| | | | | | | | | | | | mode is enabled in the config.
| * | loggingmanager: Enable debug level for default console logging when 'debug' ↵Waqas Hussain2010-05-061-1/+1
| | | | | | | | | | | | mode is enabled in the config.
* | | util.sasl.scram: Fixed global access.Waqas Hussain2010-05-061-2/+2
| | |
* | | prosodyctl: Use the global events objects for hosts (again) (thanks albert) ↵Matthew Wild2010-05-051-1/+1
| | | | | | | | | | | | (sorry albert)
* | | prosodyctl: Give each host an independant events object, because it seems to ↵Matthew Wild2010-05-051-3/+1
| | | | | | | | | | | | be the right thing to do
* | | prosodyctl: Relocate global prosody object creation (see fff153f7f4de)Matthew Wild2010-05-051-2/+8
| | |
* | | Merge configmanager->trunkMatthew Wild2010-05-051-3/+4
|\ \ \
| * | | configmanager: Add VirtualHost as an alias for Host (re-applied in trunk due ↵Matthew Wild2010-04-141-3/+3
| | | | | | | | | | | | | | | | to previous bad merge with 0.7)
* | | | Merge 0.7->trunkMatthew Wild2010-05-052-63/+63
|\ \ \ \ | | |/ / | |/| |
| * | | mod_console: Make use of the new onconnect callback to initialise session ↵Matthew Wild2010-05-051-62/+62
| | | | | | | | | | | | | | | | and send banner
| * | | net.server_select: Fix typo affecting connections with an onconnect listener ↵Matthew Wild2010-05-051-1/+1
| | | | | | | | | | | | | | | | that have data pending in the sendbuffer
* | | | Merge 0.7->trunkMatthew Wild2010-05-053-28/+100
|\| | |
| * | | mod_proxy65: Send error reply to activation stanza if one or both parties ↵Matthew Wild2010-05-051-0/+10
| | | | | | | | | | | | | | | | were not connected to the proxy
| * | | mod_proxy65: Return service-unavailable error when receiving an iq we didn't ↵Matthew Wild2010-05-051-0/+3
| | | | | | | | | | | | | | | | understand
| * | | mod_proxy65: Use new server.link to link proxied connections, now works with ↵Matthew Wild2010-05-051-24/+4
| | | | | | | | | | | | | | | | either connection backend
| * | | net.server_select, net.server_event: Add server.link() to link 2 connections ↵Matthew Wild2010-05-052-0/+44
| | | | | | | | | | | | | | | | with an intermediate buffer of the specified size
| * | | net.server_select, net.server_event: Support for ondrain listener callback ↵Matthew Wild2010-05-052-1/+9
| | | | | | | | | | | | | | | | for when send buffer is empty
| * | | net.server_select, net.server_event: Rename :pattern() method to :set_mode() ↵Matthew Wild2010-05-052-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 Wild2010-05-052-1/+21
| | | | | | | | | | | | | | | | connections
* | | | usermanager: Give the default auth provider a name, you'll never guess what ↵Matthew Wild2010-05-051-1/+1
| | | | | | | | | | | | | | | | it is.
* | | | Merge Tobias's fancy SASL branch->trunkMatthew Wild2010-05-056-83/+142
|\ \ \ \
| * \ \ \ Merge with tip.Tobias Markmann2010-03-1211-73/+84
| |\ \ \ \
| * | | | | util.sasl: 2009 -> 2010 in copyright header.Tobias Markmann2010-03-126-5/+8
| | | | | |
| * | | | | util.sasl.scram: Adjusting authentication backend name to conform with the ↵Tobias Markmann2010-02-281-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | style already used by the plain module.
| * | | | | util.sasl.plain: Adding plain_hashed authentication backend support.Tobias Markmann2010-02-281-1/+10
| | | | | |
| * | | | | util.sasl.scram: Adding documentation on SCRAM authentication backend.Tobias Markmann2010-02-281-0/+10
| | | | | |
| * | | | | util.sasl.anonymous: Adding documentation on anonymous authentication backend.Tobias Markmann2010-02-281-0/+10
| | | | | |
| * | | | | util.sasl: Moving SASL authentication backends documentation to the ↵Tobias Markmann2010-02-283-21/+30
| | | | | | | | | | | | | | | | | | | | | | | | mechanism files.
| * | | | | util.sasl: Abstracting out the hash function used since SCRAM is independent ↵Tobias Markmann2010-02-281-57/+75
| | | | | | | | | | | | | | | | | | | | | | | | of it. Adding scram-{mech} authentication backend support.
* | | | | | Merge 0.7->trunkMatthew Wild2010-05-051-1/+2
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | net.server_event: Be sure to fire onincoming for backwards-compatibility ↵Matthew Wild2010-05-051-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | with pre-onconnect listeners (thanks darkrain/mod_console)
* | | | | | usermanager: Support for pluggable authentication providersMatthew Wild2010-05-051-48/+83
| | | | | |
* | | | | | eventmanager, prosody: Adapt eventmanager to use prosody.events, as a step ↵Matthew Wild2010-05-042-22/+9
| | | | | | | | | | | | | | | | | | | | | | | | towards removing it entirely
* | | | | | Merge 0.7->trunk (with MUC needing checking, waqas)Matthew Wild2010-05-044-126/+147
|\| | | | |
| * | | | | Merge 0.6 into 0.7.Waqas Hussain2010-05-014-129/+118
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| | * | | | Tagging 0.6.2Matthew Wild2010-04-140-0/+0
| | | | | |
| | * | | | prosody.cfg.lua.dist: Refactor the default config file based on feedback ↵vault/0.6.20.6.2Matthew Wild2010-04-141-88/+82
| | | | | | | | | | | | | | | | | | | | | | | | from confused users
| | * | | | hostmanager: Re-word log messages in line with config changesMatthew Wild2010-04-141-3/+3
| | | | | |
| | * | | | configmanager: Add VirtualHost as an alias for HostMatthew Wild2010-04-141-3/+3
| | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-18 11:23:06 +0000