Matthew Wild [Fri, 21 May 2010 18:45:33 +0000 (19:45 +0100)]
Merge with backout
Matthew Wild [Fri, 21 May 2010 18:44:31 +0000 (19:44 +0100)]
Backed out changeset
c75c22c316d6 (the XMPP spec now gives a better way to do this)
Matthew Wild [Fri, 21 May 2010 18:27:06 +0000 (19:27 +0100)]
mod_bosh: Re-layout session object creation to make lines shorter
Matthew Wild [Fri, 21 May 2010 18:24:50 +0000 (19:24 +0100)]
mod_bosh: Add option consider_bosh_secure to treat BOSH sessions as encrypted even if they don't use HTTP (useful for when secure requests are proxied to Prosody over HTTP)
Matthew Wild [Fri, 21 May 2010 18:20:21 +0000 (19:20 +0100)]
mod_privacy: Fix several possible tracebacks when either the contact is a host JID, or the contact isn't in your roster and you have roster group/subscription rules in place
Matthew Wild [Fri, 21 May 2010 18:19:29 +0000 (19:19 +0100)]
mod_privacy: Remove validation that checks a roster group you block actually exists - it would be time-consuming on large rosters, and isn't important (or correct?) anyway.
Matthew Wild [Thu, 20 May 2010 10:52:20 +0000 (11:52 +0100)]
Merge 0.7->trunk
Matthew Wild [Thu, 20 May 2010 10:51:55 +0000 (11:51 +0100)]
mod_saslauth: Split out cyrus SASL config options into locals, and add support for cyrus_application_name (default: 'prosody')
Matthew Wild [Thu, 20 May 2010 10:44:41 +0000 (11:44 +0100)]
Merge 0.7->trunk
Matthew Wild [Thu, 20 May 2010 10:32:24 +0000 (11:32 +0100)]
usermanager, mod_saslauth: Make account provisioning for Cyrus SASL optional (default: not required)
Matthew Wild [Thu, 20 May 2010 10:13:51 +0000 (11:13 +0100)]
util.sasl_cyrus: Support for specifying the application name (to pass to Cyrus SASL's init())
Matthew Wild [Thu, 20 May 2010 10:08:51 +0000 (11:08 +0100)]
mod_saslauth: Add return value and error message to the Cyrus SASL handle_status callback
Matthew Wild [Thu, 20 May 2010 10:05:43 +0000 (11:05 +0100)]
mod_saslauth: Allow the Cyrus SASL realm to be configurable
Matthew Wild [Thu, 20 May 2010 09:48:44 +0000 (10:48 +0100)]
Merge 0.7->trunk
Matthew Wild [Thu, 20 May 2010 09:46:08 +0000 (10:46 +0100)]
net.dns: Remove redundant locals declaration
Matthew Wild [Thu, 20 May 2010 09:46:08 +0000 (10:46 +0100)]
net.dns: Remove redundant locals declaration
Matthew Wild [Thu, 20 May 2010 09:45:29 +0000 (10:45 +0100)]
net.dns: Fix dns.lookup from commit
e54774bd73a7
Matthew Wild [Thu, 20 May 2010 09:45:29 +0000 (10:45 +0100)]
net.dns: Fix dns.lookup from commit
e54774bd73a7
Matthew Wild [Thu, 20 May 2010 08:41:27 +0000 (09:41 +0100)]
Merge 0.7->trunk
Matthew Wild [Thu, 20 May 2010 08:40:33 +0000 (09:40 +0100)]
mod_groups: Remove potentially verbose per-contact logging (thanks Flo)
Waqas Hussain [Wed, 19 May 2010 05:49:27 +0000 (10:49 +0500)]
usermanager: Changed auth provider functions to methods.
Matthew Wild [Tue, 18 May 2010 22:29:44 +0000 (23:29 +0100)]
Merge 0.7->trunk
Matthew Wild [Tue, 18 May 2010 22:29:21 +0000 (23:29 +0100)]
Merge 0.6->0.7
Matthew Wild [Tue, 18 May 2010 22:28:36 +0000 (23:28 +0100)]
configure: Fix to allow option values containing '=' (thanks Jakub)
Matthew Wild [Mon, 17 May 2010 23:47:35 +0000 (00:47 +0100)]
Merge 0.7->trunk
Matthew Wild [Mon, 17 May 2010 23:47:06 +0000 (00:47 +0100)]
Merge 0.6->0.7
Matthew Wild [Mon, 17 May 2010 10:58:00 +0000 (11:58 +0100)]
Merge 0.7->trunk
Matthew Wild [Mon, 17 May 2010 10:57:01 +0000 (11:57 +0100)]
Merge 0.7/MattJ with 0.7
Matthew Wild [Mon, 17 May 2010 10:56:36 +0000 (11:56 +0100)]
Merge with 0.6
Matthew Wild [Mon, 17 May 2010 10:49:24 +0000 (11:49 +0100)]
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.
Matthew Wild [Mon, 17 May 2010 10:46:54 +0000 (11:46 +0100)]
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.
Matthew Wild [Mon, 17 May 2010 10:45:11 +0000 (11:45 +0100)]
mod_bosh: Remove some hacky code for pruning dead requests that hopefully never gets executed - if it does there's a bug anyway.
Matthew Wild [Mon, 17 May 2010 10:42:53 +0000 (11:42 +0100)]
mod_bosh: Remove requests from the session table using table.remove(), prevents the possibility of holes in the array.
Matthew Wild [Sat, 15 May 2010 18:38:40 +0000 (19:38 +0100)]
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)
Matthew Wild [Sat, 15 May 2010 18:31:58 +0000 (19:31 +0100)]
usermanager: Export new_default_provider()
Waqas Hussain [Thu, 13 May 2010 16:18:03 +0000 (21:18 +0500)]
usermanager: Handle auth providers for components.
Matthew Wild [Wed, 12 May 2010 22:06:46 +0000 (23:06 +0100)]
usermanager: Fix logic for per-host admin tables (thanks Maranda)
Matthew Wild [Sun, 9 May 2010 19:48:21 +0000 (20:48 +0100)]
net.xmppclient_listener: Port to util.xmppstream \o/
Matthew Wild [Sun, 9 May 2010 19:46:24 +0000 (20:46 +0100)]
prosody: Load util.xmppstream :(
Matthew Wild [Sun, 9 May 2010 19:45:53 +0000 (20:45 +0100)]
util.xmppstream: Stream objects now just have feed/reset methods
Matthew Wild [Fri, 7 May 2010 20:43:37 +0000 (21:43 +0100)]
usermanager: Bump log level of incorrect config option warnings
Matthew Wild [Fri, 7 May 2010 20:42:45 +0000 (21:42 +0100)]
usermanager: Fix for is_admin to work with the new auth provider architecture
Waqas Hussain [Fri, 7 May 2010 11:21:04 +0000 (16:21 +0500)]
Merge 0.7->trunk
Waqas Hussain [Fri, 7 May 2010 11:17:48 +0000 (16:17 +0500)]
Merge 0.6->0.7
Waqas Hussain [Fri, 7 May 2010 11:13:05 +0000 (16:13 +0500)]
mod_console: Ensure that a null byte is printed after sending the banner.
Waqas Hussain [Fri, 7 May 2010 11:10:04 +0000 (16:10 +0500)]
mod_console: Set a chunk name for loadstring calls (nicer errors).
Waqas Hussain [Fri, 7 May 2010 11:04:45 +0000 (16:04 +0500)]
mod_posix: Fixed a global access.
Waqas Hussain [Fri, 7 May 2010 11:02:29 +0000 (16:02 +0500)]
prosody: Modified function metatable for better string representation of functions.
Waqas Hussain [Fri, 7 May 2010 11:00:33 +0000 (16:00 +0500)]
prosody: Lowered log level for a log message.
Waqas Hussain [Fri, 7 May 2010 02:18:09 +0000 (07:18 +0500)]
mod_posix: Don't add a server-starting event handler while the server-starting event is being fired.
Waqas Hussain [Thu, 6 May 2010 18:16:50 +0000 (23:16 +0500)]
net.server_select: Remove some debugging code.
Waqas Hussain [Thu, 6 May 2010 12:14:11 +0000 (17:14 +0500)]
Merge 0.7->trunk
Waqas Hussain [Thu, 6 May 2010 11:25:40 +0000 (16:25 +0500)]
Merge 0.6->0.7
Waqas Hussain [Thu, 6 May 2010 10:52:47 +0000 (15:52 +0500)]
loggingmanager: Enable debug level for default console logging when 'debug' mode is enabled in the config.
Waqas Hussain [Thu, 6 May 2010 10:38:11 +0000 (15:38 +0500)]
loggingmanager: Enable debug level for default console logging when 'debug' mode is enabled in the config.
Waqas Hussain [Thu, 6 May 2010 10:19:20 +0000 (15:19 +0500)]
util.sasl.scram: Fixed global access.
Matthew Wild [Wed, 5 May 2010 19:35:06 +0000 (20:35 +0100)]
prosodyctl: Use the global events objects for hosts (again) (thanks albert) (sorry albert)
Matthew Wild [Wed, 5 May 2010 19:14:24 +0000 (20:14 +0100)]
prosodyctl: Give each host an independant events object, because it seems to be the right thing to do
Matthew Wild [Wed, 5 May 2010 19:14:03 +0000 (20:14 +0100)]
prosodyctl: Relocate global prosody object creation (see
fff153f7f4de)
Matthew Wild [Wed, 5 May 2010 18:01:14 +0000 (19:01 +0100)]
Merge configmanager->trunk
Matthew Wild [Wed, 5 May 2010 16:22:43 +0000 (17:22 +0100)]
Merge 0.7->trunk
Matthew Wild [Wed, 5 May 2010 16:21:50 +0000 (17:21 +0100)]
mod_console: Make use of the new onconnect callback to initialise session and send banner
Matthew Wild [Wed, 5 May 2010 16:12:32 +0000 (17:12 +0100)]
net.server_select: Fix typo affecting connections with an onconnect listener that have data pending in the sendbuffer
Matthew Wild [Wed, 5 May 2010 14:33:58 +0000 (15:33 +0100)]
Merge 0.7->trunk
Matthew Wild [Wed, 5 May 2010 14:33:29 +0000 (15:33 +0100)]
mod_proxy65: Send error reply to activation stanza if one or both parties were not connected to the proxy
Matthew Wild [Wed, 5 May 2010 14:32:16 +0000 (15:32 +0100)]
mod_proxy65: Return service-unavailable error when receiving an iq we didn't understand
Matthew Wild [Wed, 5 May 2010 14:31:18 +0000 (15:31 +0100)]
mod_proxy65: Use new server.link to link proxied connections, now works with either connection backend
Matthew Wild [Wed, 5 May 2010 14:25:48 +0000 (15:25 +0100)]
net.server_select, net.server_event: Add server.link() to link 2 connections with an intermediate buffer of the specified size
Matthew Wild [Wed, 5 May 2010 14:24:24 +0000 (15:24 +0100)]
net.server_select, net.server_event: Support for ondrain listener callback for when send buffer is empty
Matthew Wild [Wed, 5 May 2010 14:23:17 +0000 (15:23 +0100)]
net.server_select, net.server_event: Rename :pattern() method to :set_mode() for select backend, and add :set_mode() to event backend
Matthew Wild [Wed, 5 May 2010 14:21:17 +0000 (15:21 +0100)]
net.server_select, net.server_event: Support for :pause() and :resume() on connections
Matthew Wild [Wed, 5 May 2010 13:17:01 +0000 (14:17 +0100)]
usermanager: Give the default auth provider a name, you'll never guess what it is.
Matthew Wild [Wed, 5 May 2010 10:29:10 +0000 (11:29 +0100)]
Merge Tobias's fancy SASL branch->trunk
Matthew Wild [Wed, 5 May 2010 10:25:26 +0000 (11:25 +0100)]
Merge 0.7->trunk
Matthew Wild [Wed, 5 May 2010 10:24:45 +0000 (11:24 +0100)]
net.server_event: Be sure to fire onincoming for backwards-compatibility with pre-onconnect listeners (thanks darkrain/mod_console)
Matthew Wild [Wed, 5 May 2010 00:05:58 +0000 (01:05 +0100)]
usermanager: Support for pluggable authentication providers
Matthew Wild [Tue, 4 May 2010 22:43:01 +0000 (23:43 +0100)]
eventmanager, prosody: Adapt eventmanager to use prosody.events, as a step towards removing it entirely
Matthew Wild [Tue, 4 May 2010 22:36:50 +0000 (23:36 +0100)]
Merge 0.7->trunk (with MUC needing checking, waqas)
Matthew Wild [Tue, 4 May 2010 22:11:41 +0000 (23:11 +0100)]
configmanager: Fix very wacky indentation
Matthew Wild [Tue, 4 May 2010 22:07:49 +0000 (23:07 +0100)]
configmanager: Fix some wacky indentation
Waqas Hussain [Sat, 1 May 2010 00:18:38 +0000 (05:18 +0500)]
Merge 0.6 into 0.7.
Brian Cully [Wed, 28 Apr 2010 12:51:26 +0000 (16:51 +0400)]
net/httpserver_listener: Ignore empty strings on incoming data.
Waqas Hussain [Mon, 19 Apr 2010 13:30:59 +0000 (18:30 +0500)]
MUC: Include <status code='100'/> in a message, not in presence. Fixes various issues.
Waqas Hussain [Mon, 19 Apr 2010 13:29:10 +0000 (18:29 +0500)]
modulemanager: Log proper tracebacks on errors during module load/unload.
Waqas Hussain [Mon, 19 Apr 2010 13:28:12 +0000 (18:28 +0500)]
prosody: Set metatable on functions to allow easy access to upvalues.
Matthew Wild [Wed, 14 Apr 2010 12:12:14 +0000 (13:12 +0100)]
Tagging 0.6.2
Matthew Wild [Wed, 14 Apr 2010 12:01:10 +0000 (13:01 +0100)]
prosody.cfg.lua.dist: Refactor the default config file based on feedback from confused users
Matthew Wild [Wed, 14 Apr 2010 12:00:24 +0000 (13:00 +0100)]
hostmanager: Re-word log messages in line with config changes
Matthew Wild [Wed, 14 Apr 2010 11:59:46 +0000 (12:59 +0100)]
configmanager: Add VirtualHost as an alias for Host (re-applied in trunk due to previous bad merge with 0.7)
Matthew Wild [Wed, 14 Apr 2010 11:59:46 +0000 (12:59 +0100)]
configmanager: Add VirtualHost as an alias for Host
Waqas Hussain [Wed, 14 Apr 2010 12:54:33 +0000 (17:54 +0500)]
MUC: Allow moderators which are not owners to change roles.
Matthew Wild [Sun, 11 Apr 2010 00:30:31 +0000 (01:30 +0100)]
Merge 0.7->trunk
Matthew Wild [Sun, 11 Apr 2010 00:29:59 +0000 (01:29 +0100)]
net.server_event: Call listener.onconnect if it exists, otherwise stick to listener.onincoming
Matthew Wild [Sun, 11 Apr 2010 00:20:20 +0000 (01:20 +0100)]
Merge 0.7->trunk
Matthew Wild [Sun, 11 Apr 2010 00:11:42 +0000 (01:11 +0100)]
net.server_select: Support for listener.onconnect
Matthew Wild [Fri, 9 Apr 2010 11:32:25 +0000 (12:32 +0100)]
Merge 0.7->trunk
Matthew Wild [Fri, 9 Apr 2010 11:31:51 +0000 (12:31 +0100)]
Merge 0.6->0.7
Matthew Wild [Fri, 9 Apr 2010 11:25:54 +0000 (12:25 +0100)]
net.server: Fix logic error causing traceback when receiving a non-number port
Matthew Wild [Wed, 7 Apr 2010 20:08:16 +0000 (21:08 +0100)]
loggingmanager: Fix syntax error :)
Matthew Wild [Wed, 7 Apr 2010 20:01:06 +0000 (21:01 +0100)]
Merge 0.7->trunk