Merge 0.7/MattJ with 0.7

Merge with 0.6

mod_bosh: Always give requests a destroy handler, so that the management of each session's request array and the inactive_sessions logic can happen in one place. Simplifies everything and concludes this series of BOSH fixes.

mod_bosh: Fix handling of rids by not dropping requests with repeated rids (assign them their sid instead), and always starting a session with first_rid-1.

mod_bosh: Remove some hacky code for pruning dead requests that hopefully never gets executed - if it does there's a bug anyway.

mod_bosh: Remove requests from the session table using table.remove(), prevents the possibility of holes in the array.

prosodyctl: Support for the new usermanager, refactor host creation and fail if a host is not using the default authentication provider, for now. (thanks Nicola)

usermanager: Export new_default_provider()

usermanager: Handle auth providers for components.

usermanager: Fix logic for per-host admin tables (thanks Maranda)

net.xmppclient_listener: Port to util.xmppstream \o/

prosody: Load util.xmppstream :(

util.xmppstream: Stream objects now just have feed/reset methods

usermanager: Bump log level of incorrect config option warnings

usermanager: Fix for is_admin to work with the new auth provider architecture

Merge 0.7->trunk

Merge 0.6->0.7

mod_console: Set a chunk name for loadstring calls (nicer errors).

mod_posix: Fixed a global access.

mod_console: Ensure that a null byte is printed after sending the banner.

prosody: Modified function metatable for better string representation of functions.

prosody: Lowered log level for a log message.

mod_posix: Don't add a server-starting event handler while the server-starting event is being fired.

net.server_select: Remove some debugging code.

Merge 0.7->trunk

Merge 0.6->0.7

loggingmanager: Enable debug level for default console logging when 'debug' mode is enabled in the config.

loggingmanager: Enable debug level for default console logging when 'debug' mode is enabled in the config.

util.sasl.scram: Fixed global access.

prosodyctl: Use the global events objects for hosts (again) (thanks albert) (sorry albert)

prosodyctl: Give each host an independant events object, because it seems to be the right thing to do

prosodyctl: Relocate global prosody object creation (see fff153f7f4de)

Merge configmanager->trunk

configmanager: Add VirtualHost as an alias for Host (re-applied in trunk due to previous bad merge with 0.7)

Merge 0.7->trunk

mod_console: Make use of the new onconnect callback to initialise session and send banner

net.server_select: Fix typo affecting connections with an onconnect listener that have data pending in the sendbuffer

Merge 0.7->trunk

mod_proxy65: Send error reply to activation stanza if one or both parties were not connected to the proxy

mod_proxy65: Return service-unavailable error when receiving an iq we didn't understand

mod_proxy65: Use new server.link to link proxied connections, now works with either connection backend

net.server_select, net.server_event: Add server.link() to link 2 connections with an intermediate buffer of the specified size

net.server_select, net.server_event: Support for ondrain listener callback for when send buffer is empty

net.server_select, net.server_event: Rename :pattern() method to :set_mode() for select backend, and add :set_mode() to event backend

net.server_select, net.server_event: Support for :pause() and :resume() on connections

usermanager: Give the default auth provider a name, you'll never guess what it is.

Merge Tobias's fancy SASL branch->trunk

Merge with tip.

util.sasl: 2009 -> 2010 in copyright header.

util.sasl.scram: Adjusting authentication backend name to conform with the style already used by the plain module.

util.sasl.plain: Adding plain_hashed authentication backend support.

util.sasl.scram: Adding documentation on SCRAM authentication backend.

util.sasl.anonymous: Adding documentation on anonymous authentication backend.

util.sasl: Moving SASL authentication backends documentation to the mechanism files.

util.sasl: Abstracting out the hash function used since SCRAM is independent of it. Adding scram-{mech} authentication backend support.

Merge 0.7->trunk

net.server_event: Be sure to fire onincoming for backwards-compatibility with pre-onconnect listeners (thanks darkrain/mod_console)

usermanager: Support for pluggable authentication providers

eventmanager, prosody: Adapt eventmanager to use prosody.events, as a step towards removing it entirely

Merge 0.7->trunk (with MUC needing checking, waqas)

(0) -3000 -1000 -300 -100 -60 +60 +100 +300 tip

mercurial