prosody.git
13 years agoxmlhandlers: Don't restrict CDATA
Matthew Wild [Wed, 1 Jun 2011 23:23:41 +0000 (00:23 +0100)]
xmlhandlers: Don't restrict CDATA

13 years agoxmlhandlers: Reject XML comments, processing instructions and (if supported by LuaExp...
Matthew Wild [Wed, 1 Jun 2011 22:20:54 +0000 (23:20 +0100)]
xmlhandlers: Reject XML comments, processing instructions and (if supported by LuaExpat) DTDs. If not supported, log a warning. [Backport of 7cc426988bcc in trunk]

14 years agoconfigure: Fix to allow option values containing '=' (thanks Jakub)
Matthew Wild [Tue, 18 May 2010 22:28:36 +0000 (23:28 +0100)]
configure: Fix to allow option values containing '=' (thanks Jakub)

14 years agonet/httpserver_listener: Ignore empty strings on incoming data.
Brian Cully [Wed, 28 Apr 2010 12:51:26 +0000 (16:51 +0400)]
net/httpserver_listener: Ignore empty strings on incoming data.

14 years agoMerge 0.7->trunk
Matthew Wild [Mon, 17 May 2010 10:58:00 +0000 (11:58 +0100)]
Merge 0.7->trunk

14 years agoMerge 0.7/MattJ with 0.7
Matthew Wild [Mon, 17 May 2010 10:57:01 +0000 (11:57 +0100)]
Merge 0.7/MattJ with 0.7

14 years agoMerge with 0.6
Matthew Wild [Mon, 17 May 2010 10:56:36 +0000 (11:56 +0100)]
Merge with 0.6

14 years agomod_bosh: Always give requests a destroy handler, so that the management of each...
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.

14 years agomod_bosh: Fix handling of rids by not dropping requests with repeated rids (assign...
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.

14 years agomod_bosh: Remove some hacky code for pruning dead requests that hopefully never gets...
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.

14 years agomod_bosh: Remove requests from the session table using table.remove(), prevents the...
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.

14 years agoprosodyctl: Support for the new usermanager, refactor host creation and fail if a...
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)

14 years agousermanager: Export new_default_provider()
Matthew Wild [Sat, 15 May 2010 18:31:58 +0000 (19:31 +0100)]
usermanager: Export new_default_provider()

14 years agousermanager: Handle auth providers for components.
Waqas Hussain [Thu, 13 May 2010 16:18:03 +0000 (21:18 +0500)]
usermanager: Handle auth providers for components.

14 years agousermanager: Fix logic for per-host admin tables (thanks Maranda)
Matthew Wild [Wed, 12 May 2010 22:06:46 +0000 (23:06 +0100)]
usermanager: Fix logic for per-host admin tables (thanks Maranda)

14 years agonet.xmppclient_listener: Port to util.xmppstream \o/
Matthew Wild [Sun, 9 May 2010 19:48:21 +0000 (20:48 +0100)]
net.xmppclient_listener: Port to util.xmppstream \o/

14 years agoprosody: Load util.xmppstream :(
Matthew Wild [Sun, 9 May 2010 19:46:24 +0000 (20:46 +0100)]
prosody: Load util.xmppstream :(

14 years agoutil.xmppstream: Stream objects now just have feed/reset methods
Matthew Wild [Sun, 9 May 2010 19:45:53 +0000 (20:45 +0100)]
util.xmppstream: Stream objects now just have feed/reset methods

14 years agousermanager: Bump log level of incorrect config option warnings
Matthew Wild [Fri, 7 May 2010 20:43:37 +0000 (21:43 +0100)]
usermanager: Bump log level of incorrect config option warnings

14 years agousermanager: Fix for is_admin to work with the new auth provider architecture
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

14 years agoMerge 0.7->trunk
Waqas Hussain [Fri, 7 May 2010 11:21:04 +0000 (16:21 +0500)]
Merge 0.7->trunk

14 years agoMerge 0.6->0.7
Waqas Hussain [Fri, 7 May 2010 11:17:48 +0000 (16:17 +0500)]
Merge 0.6->0.7

14 years agomod_console: Ensure that a null byte is printed after sending the banner.
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.

14 years agomod_console: Set a chunk name for loadstring calls (nicer errors).
Waqas Hussain [Fri, 7 May 2010 11:10:04 +0000 (16:10 +0500)]
mod_console: Set a chunk name for loadstring calls (nicer errors).

14 years agomod_posix: Fixed a global access.
Waqas Hussain [Fri, 7 May 2010 11:04:45 +0000 (16:04 +0500)]
mod_posix: Fixed a global access.

14 years agoprosody: Modified function metatable for better string representation of functions.
Waqas Hussain [Fri, 7 May 2010 11:02:29 +0000 (16:02 +0500)]
prosody: Modified function metatable for better string representation of functions.

14 years agoprosody: Lowered log level for a log message.
Waqas Hussain [Fri, 7 May 2010 11:00:33 +0000 (16:00 +0500)]
prosody: Lowered log level for a log message.

14 years agomod_posix: Don't add a server-starting event handler while the server-starting event...
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.

14 years agonet.server_select: Remove some debugging code.
Waqas Hussain [Thu, 6 May 2010 18:16:50 +0000 (23:16 +0500)]
net.server_select: Remove some debugging code.

14 years agoMerge 0.7->trunk
Waqas Hussain [Thu, 6 May 2010 12:14:11 +0000 (17:14 +0500)]
Merge 0.7->trunk

14 years agoMerge 0.6->0.7
Waqas Hussain [Thu, 6 May 2010 11:25:40 +0000 (16:25 +0500)]
Merge 0.6->0.7

14 years agologgingmanager: Enable debug level for default console logging when 'debug' mode...
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.

14 years agologgingmanager: Enable debug level for default console logging when 'debug' mode...
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.

14 years agoutil.sasl.scram: Fixed global access.
Waqas Hussain [Thu, 6 May 2010 10:19:20 +0000 (15:19 +0500)]
util.sasl.scram: Fixed global access.

14 years agoprosodyctl: Use the global events objects for hosts (again) (thanks albert) (sorry...
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)

14 years agoprosodyctl: Give each host an independant events object, because it seems to be the...
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

14 years agoprosodyctl: Relocate global prosody object creation (see fff153f7f4de)
Matthew Wild [Wed, 5 May 2010 19:14:03 +0000 (20:14 +0100)]
prosodyctl: Relocate global prosody object creation (see fff153f7f4de)

14 years agoMerge configmanager->trunk
Matthew Wild [Wed, 5 May 2010 18:01:14 +0000 (19:01 +0100)]
Merge configmanager->trunk

14 years agoMerge 0.7->trunk
Matthew Wild [Wed, 5 May 2010 16:22:43 +0000 (17:22 +0100)]
Merge 0.7->trunk

14 years agomod_console: Make use of the new onconnect callback to initialise session and send...
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

14 years agonet.server_select: Fix typo affecting connections with an onconnect listener that...
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

14 years agoMerge 0.7->trunk
Matthew Wild [Wed, 5 May 2010 14:33:58 +0000 (15:33 +0100)]
Merge 0.7->trunk

14 years agomod_proxy65: Send error reply to activation stanza if one or both parties were not...
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

14 years agomod_proxy65: Return service-unavailable error when receiving an iq we didn't understand
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

14 years agomod_proxy65: Use new server.link to link proxied connections, now works with either...
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

14 years agonet.server_select, net.server_event: Add server.link() to link 2 connections with...
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

14 years agonet.server_select, net.server_event: Support for ondrain listener callback for when...
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

14 years agonet.server_select, net.server_event: Rename :pattern() method to :set_mode() for...
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

14 years agonet.server_select, net.server_event: Support for :pause() and :resume() on connections
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

14 years agousermanager: Give the default auth provider a name, you'll never guess what it is.
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.

14 years agoMerge Tobias's fancy SASL branch->trunk
Matthew Wild [Wed, 5 May 2010 10:29:10 +0000 (11:29 +0100)]
Merge Tobias's fancy SASL branch->trunk

14 years agoMerge 0.7->trunk
Matthew Wild [Wed, 5 May 2010 10:25:26 +0000 (11:25 +0100)]
Merge 0.7->trunk

14 years agonet.server_event: Be sure to fire onincoming for backwards-compatibility with pre...
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)

14 years agousermanager: Support for pluggable authentication providers
Matthew Wild [Wed, 5 May 2010 00:05:58 +0000 (01:05 +0100)]
usermanager: Support for pluggable authentication providers

14 years agoeventmanager, prosody: Adapt eventmanager to use prosody.events, as a step towards...
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

14 years agoMerge 0.7->trunk (with MUC needing checking, waqas)
Matthew Wild [Tue, 4 May 2010 22:36:50 +0000 (23:36 +0100)]
Merge 0.7->trunk (with MUC needing checking, waqas)

14 years agoconfigmanager: Fix very wacky indentation
Matthew Wild [Tue, 4 May 2010 22:11:41 +0000 (23:11 +0100)]
configmanager: Fix very wacky indentation

14 years agoconfigmanager: Fix some wacky indentation
Matthew Wild [Tue, 4 May 2010 22:07:49 +0000 (23:07 +0100)]
configmanager: Fix some wacky indentation

14 years agoMerge 0.6 into 0.7.
Waqas Hussain [Sat, 1 May 2010 00:18:38 +0000 (05:18 +0500)]
Merge 0.6 into 0.7.

14 years agoMUC: Include <status code='100'/> in a message, not in presence. Fixes various issues.
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.

14 years agomodulemanager: Log proper tracebacks on errors during module load/unload.
Waqas Hussain [Mon, 19 Apr 2010 13:29:10 +0000 (18:29 +0500)]
modulemanager: Log proper tracebacks on errors during module load/unload.

14 years agoprosody: Set metatable on functions to allow easy access to upvalues.
Waqas Hussain [Mon, 19 Apr 2010 13:28:12 +0000 (18:28 +0500)]
prosody: Set metatable on functions to allow easy access to upvalues.

14 years agoTagging 0.6.2
Matthew Wild [Wed, 14 Apr 2010 12:12:14 +0000 (13:12 +0100)]
Tagging 0.6.2

14 years agoprosody.cfg.lua.dist: Refactor the default config file based on feedback from confuse...
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

14 years agohostmanager: Re-word log messages in line with config changes
Matthew Wild [Wed, 14 Apr 2010 12:00:24 +0000 (13:00 +0100)]
hostmanager: Re-word log messages in line with config changes

14 years agoconfigmanager: Add VirtualHost as an alias for Host (re-applied in trunk due to previ...
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)

14 years agoconfigmanager: Add VirtualHost as an alias for Host
Matthew Wild [Wed, 14 Apr 2010 11:59:46 +0000 (12:59 +0100)]
configmanager: Add VirtualHost as an alias for Host

14 years agoMUC: Allow moderators which are not owners to change roles.
Waqas Hussain [Wed, 14 Apr 2010 12:54:33 +0000 (17:54 +0500)]
MUC: Allow moderators which are not owners to change roles.

14 years agoMerge 0.7->trunk
Matthew Wild [Sun, 11 Apr 2010 00:30:31 +0000 (01:30 +0100)]
Merge 0.7->trunk

14 years agonet.server_event: Call listener.onconnect if it exists, otherwise stick to listener...
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

14 years agoMerge 0.7->trunk
Matthew Wild [Sun, 11 Apr 2010 00:20:20 +0000 (01:20 +0100)]
Merge 0.7->trunk

14 years agonet.server_select: Support for listener.onconnect
Matthew Wild [Sun, 11 Apr 2010 00:11:42 +0000 (01:11 +0100)]
net.server_select: Support for listener.onconnect

14 years agoMerge 0.7->trunk
Matthew Wild [Fri, 9 Apr 2010 11:32:25 +0000 (12:32 +0100)]
Merge 0.7->trunk

14 years agoMerge 0.6->0.7
Matthew Wild [Fri, 9 Apr 2010 11:31:51 +0000 (12:31 +0100)]
Merge 0.6->0.7

14 years agonet.server: Fix logic error causing traceback when receiving a non-number port
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

14 years agologgingmanager: Fix syntax error :)
Matthew Wild [Wed, 7 Apr 2010 20:08:16 +0000 (21:08 +0100)]
loggingmanager: Fix syntax error :)

14 years agoMerge 0.7->trunk
Matthew Wild [Wed, 7 Apr 2010 20:01:06 +0000 (21:01 +0100)]
Merge 0.7->trunk

14 years agoutil.timer: When using libevent hold onto the event handle to stop it being collected...
Matthew Wild [Wed, 7 Apr 2010 20:00:20 +0000 (21:00 +0100)]
util.timer: When using libevent hold onto the event handle to stop it being collected (and the timer stopping). Fixes BOSH ghosts, thanks Flo, niekie, waqas.

14 years agologgingmanager: Observe 'debug' config setting for console logging too
Matthew Wild [Wed, 7 Apr 2010 16:41:35 +0000 (17:41 +0100)]
loggingmanager: Observe 'debug' config setting for console logging too

14 years agoMerge 0.7->trunk
Matthew Wild [Sat, 3 Apr 2010 22:09:59 +0000 (23:09 +0100)]
Merge 0.7->trunk

14 years agoMerge 0.6->0.7
Matthew Wild [Sat, 3 Apr 2010 22:09:11 +0000 (23:09 +0100)]
Merge 0.6->0.7

14 years agoMerge 0.6/MattJ -> 0.6
Matthew Wild [Sat, 3 Apr 2010 21:26:14 +0000 (22:26 +0100)]
Merge 0.6/MattJ -> 0.6

14 years agomod_bosh: Default stanza namespace should be jabber:client (fixes BOSH to work with...
Matthew Wild [Sat, 3 Apr 2010 21:24:39 +0000 (22:24 +0100)]
mod_bosh: Default stanza namespace should be jabber:client (fixes BOSH to work with recent namespace fix)

14 years agoutil.ztact: Fixed global accesses.
Waqas Hussain [Thu, 1 Apr 2010 14:28:23 +0000 (19:28 +0500)]
util.ztact: Fixed global accesses.

14 years agoutil.uuid: Use a local instead of a global.
Waqas Hussain [Thu, 1 Apr 2010 14:27:26 +0000 (19:27 +0500)]
util.uuid: Use a local instead of a global.

14 years agoutil.stanza: Fixed some more nil global accesses.
Waqas Hussain [Thu, 1 Apr 2010 14:12:08 +0000 (19:12 +0500)]
util.stanza: Fixed some more nil global accesses.

14 years agoutil.stanza: Fixed a nil global access.
Waqas Hussain [Thu, 1 Apr 2010 14:08:25 +0000 (19:08 +0500)]
util.stanza: Fixed a nil global access.

14 years agoMerge 0.7->trunk
Matthew Wild [Tue, 30 Mar 2010 18:48:04 +0000 (19:48 +0100)]
Merge 0.7->trunk

14 years agoMerge 0.7/waqas->0.7/MattJ
Matthew Wild [Tue, 30 Mar 2010 18:46:53 +0000 (19:46 +0100)]
Merge 0.7/waqas->0.7/MattJ

14 years agoMerge 0.6->0.7
Matthew Wild [Tue, 30 Mar 2010 18:45:56 +0000 (19:45 +0100)]
Merge 0.6->0.7

14 years agoxmppserver_listener: Compatibility fix for older Prosodies with the s2s xmlns bug
Matthew Wild [Tue, 30 Mar 2010 18:44:50 +0000 (19:44 +0100)]
xmppserver_listener: Compatibility fix for older Prosodies with the s2s xmlns bug

14 years agostanza_router, s2smanager, modulemanager: Fix for handling of the default namespace...
Matthew Wild [Tue, 30 Mar 2010 18:40:16 +0000 (19:40 +0100)]
stanza_router, s2smanager, modulemanager: Fix for handling of the default namespace on stanzas, causing sometimes jabber:client to be sent over s2s, and accepted

14 years agonet.server_event: Fixed spelling fail.
Waqas Hussain [Fri, 26 Mar 2010 03:24:29 +0000 (08:24 +0500)]
net.server_event: Fixed spelling fail.

14 years agoMerge 0.7->trunk
Matthew Wild [Thu, 25 Mar 2010 19:40:38 +0000 (19:40 +0000)]
Merge 0.7->trunk

14 years agotools/erlparse: Discard erlang PIDs instead of choking on them as a syntax error
Matthew Wild [Thu, 25 Mar 2010 19:34:41 +0000 (19:34 +0000)]
tools/erlparse: Discard erlang PIDs instead of choking on them as a syntax error

14 years agotools/erlparse: Report the line number when showing a syntax error in the input file
Matthew Wild [Thu, 25 Mar 2010 19:34:05 +0000 (19:34 +0000)]
tools/erlparse: Report the line number when showing a syntax error in the input file

14 years agotools/erlparse: Optimisations aplenty for faster processing of large files
Matthew Wild [Thu, 25 Mar 2010 19:32:35 +0000 (19:32 +0000)]
tools/erlparse: Optimisations aplenty for faster processing of large files

14 years agoMerge 0.7->trunk
Matthew Wild [Thu, 25 Mar 2010 18:53:17 +0000 (18:53 +0000)]
Merge 0.7->trunk

14 years agotools/ejabberd2prosody: Create prosody singleton so datamanager can detect the platfo...
Matthew Wild [Thu, 25 Mar 2010 18:52:34 +0000 (18:52 +0000)]
tools/ejabberd2prosody: Create prosody singleton so datamanager can detect the platform (set no platform to use lfs, pposix isn't necessary here)

14 years agoMerge 0.7->trunk
Matthew Wild [Thu, 25 Mar 2010 12:33:45 +0000 (12:33 +0000)]
Merge 0.7->trunk