prosody.git
13 years agoMUC: Add option to allow participants to change the subject.
Kim Alvefur [Fri, 14 Jan 2011 14:52:36 +0000 (15:52 +0100)]
MUC: Add option to allow participants to change the subject.

13 years agoMerge with waqas
Matthew Wild [Thu, 24 Feb 2011 01:40:47 +0000 (01:40 +0000)]
Merge with waqas

13 years agoutil.stanza: Clean up matching_tags() and replace :childtags() with it
Matthew Wild [Sat, 19 Feb 2011 02:31:06 +0000 (02:31 +0000)]
util.stanza: Clean up matching_tags() and replace :childtags() with it

13 years agoMUC: Add option to allow participants to change the subject.
Kim Alvefur [Fri, 14 Jan 2011 14:52:36 +0000 (15:52 +0100)]
MUC: Add option to allow participants to change the subject.

13 years agologgingmanager: Fix reading configuration of timestamps for console output.
Waqas Hussain [Wed, 12 Jan 2011 21:33:50 +0000 (02:33 +0500)]
loggingmanager: Fix reading configuration of timestamps for console output.

13 years agologgingmanager: Re-read 'debug' option on reload.
Waqas Hussain [Wed, 12 Jan 2011 21:31:10 +0000 (02:31 +0500)]
loggingmanager: Re-read 'debug' option on reload.

13 years agoMerge 0.8->trunk
Matthew Wild [Tue, 11 Jan 2011 22:40:41 +0000 (22:40 +0000)]
Merge 0.8->trunk

13 years agologgingmanager: Remove event hook that never fired anyway, and held logfiles open...
Matthew Wild [Tue, 11 Jan 2011 22:40:09 +0000 (22:40 +0000)]
loggingmanager: Remove event hook that never fired anyway, and held logfiles open - leave the GC to close them now.

13 years agoMerge 0.8->trunk
Matthew Wild [Tue, 11 Jan 2011 06:18:51 +0000 (06:18 +0000)]
Merge 0.8->trunk

13 years agostoragemanager: Export load_driver() function so it can be used from e.g. migrators
Matthew Wild [Tue, 11 Jan 2011 06:18:24 +0000 (06:18 +0000)]
storagemanager: Export load_driver() function so it can be used from e.g. migrators

13 years agoMerge 0.8->trunk
Matthew Wild [Tue, 11 Jan 2011 05:31:29 +0000 (05:31 +0000)]
Merge 0.8->trunk

13 years agoutil.sasl.*: Add 'sasl.' prefix to module names
Matthew Wild [Tue, 11 Jan 2011 05:30:55 +0000 (05:30 +0000)]
util.sasl.*: Add 'sasl.' prefix to module names

13 years agoutil.datamanager: Change from 'Failed to load' to 'Assuming empty' for data store...
Matthew Wild [Tue, 11 Jan 2011 05:28:07 +0000 (05:28 +0000)]
util.datamanager: Change from 'Failed to load' to 'Assuming empty' for data store files that do not seem to exist

13 years agonet.server_select, net.server_event: Silence 'error during ssl handshake' for wantrea...
Matthew Wild [Tue, 11 Jan 2011 05:04:08 +0000 (05:04 +0000)]
net.server_select, net.server_event: Silence 'error during ssl handshake' for wantread and wantwrite

13 years agoMerge 0.8->trunk
Matthew Wild [Tue, 11 Jan 2011 04:22:45 +0000 (04:22 +0000)]
Merge 0.8->trunk

13 years agomod_storage_sql: Create index when creating a new table
Matthew Wild [Tue, 11 Jan 2011 04:19:26 +0000 (04:19 +0000)]
mod_storage_sql: Create index when creating a new table

13 years agoutil.datamanager: Handle gracefully the lack of prosody.paths.data
Matthew Wild [Tue, 11 Jan 2011 04:19:03 +0000 (04:19 +0000)]
util.datamanager: Handle gracefully the lack of prosody.paths.data

13 years agoMerge 0.8->trunk
Matthew Wild [Mon, 10 Jan 2011 16:55:14 +0000 (16:55 +0000)]
Merge 0.8->trunk

13 years agos2smanager: Don't bounce error replies for error and result stanzas.
Waqas Hussain [Mon, 10 Jan 2011 16:11:06 +0000 (21:11 +0500)]
s2smanager: Don't bounce error replies for error and result stanzas.

13 years agomod_storage_sql: Reconnect in all cases, and rollback on error.
Waqas Hussain [Mon, 10 Jan 2011 16:07:59 +0000 (21:07 +0500)]
mod_storage_sql: Reconnect in all cases, and rollback on error.

13 years agoMerge 0.8->trunk
Matthew Wild [Sat, 8 Jan 2011 23:21:28 +0000 (23:21 +0000)]
Merge 0.8->trunk

13 years agonet.adns: Fix logging to handle unconnected UDP sockets
Matthew Wild [Sat, 8 Jan 2011 23:20:36 +0000 (23:20 +0000)]
net.adns: Fix logging to handle unconnected UDP sockets

13 years agomod_bosh: Return true from send()
Matthew Wild [Sat, 8 Jan 2011 23:20:16 +0000 (23:20 +0000)]
mod_bosh: Return true from send()

13 years agoutil.pubsub: Pass true instead of nil as the actor in a bunch of places, and fix...
Matthew Wild [Sat, 8 Jan 2011 23:17:17 +0000 (23:17 +0000)]
util.pubsub: Pass true instead of nil as the actor in a bunch of places, and fix a bunch of methods to not traceback on this (those with *_other capability checking).

13 years agoutil.pubsub: Some tidying/optimisation to service:may()
Matthew Wild [Sat, 8 Jan 2011 23:15:27 +0000 (23:15 +0000)]
util.pubsub: Some tidying/optimisation to service:may()

13 years agomod_storage_sql: Create table automatically for all databases now, not just SQLite...
Matthew Wild [Sat, 8 Jan 2011 23:09:21 +0000 (23:09 +0000)]
mod_storage_sql: Create table automatically for all databases now, not just SQLite. Also rename table from Prosody -> prosody.

13 years agocerts/openssl.cnf: Specify output encoding.
Kim Alvefur [Sat, 8 Jan 2011 08:09:19 +0000 (09:09 +0100)]
certs/openssl.cnf: Specify output encoding.

13 years agoMerge 0.8->trunk
Matthew Wild [Fri, 7 Jan 2011 11:59:05 +0000 (11:59 +0000)]
Merge 0.8->trunk

13 years agomod_storage_sql: Make the 'database' value for the SQLite3 driver relative to the...
Matthew Wild [Fri, 7 Jan 2011 11:57:48 +0000 (11:57 +0000)]
mod_storage_sql: Make the 'database' value for the SQLite3 driver relative to the data path

13 years agoprosodyctl: Instead of calling datamanager.set_path(), just ensure prosody.paths...
Matthew Wild [Fri, 7 Jan 2011 11:56:52 +0000 (11:56 +0000)]
prosodyctl: Instead of calling  datamanager.set_path(), just ensure prosody.paths.data always contains the correct value (including config)

13 years agoprosody: Instead of calling datamanager.set_path(), just ensure prosody.paths.data...
Matthew Wild [Fri, 7 Jan 2011 11:56:15 +0000 (11:56 +0000)]
prosody: Instead of calling  datamanager.set_path(), just ensure prosody.paths.data always contains the correct value (including config)

13 years agoutil.datamanager: Use prosody.paths.data as the initial value for data_path
Matthew Wild [Fri, 7 Jan 2011 11:55:19 +0000 (11:55 +0000)]
util.datamanager: Use prosody.paths.data as the initial value for data_path

13 years agoMerge 0.8->trunk
Matthew Wild [Fri, 7 Jan 2011 05:11:17 +0000 (05:11 +0000)]
Merge 0.8->trunk

13 years agoprosody.cfg.lua: Give example for logging to console
Matthew Wild [Fri, 7 Jan 2011 05:11:00 +0000 (05:11 +0000)]
prosody.cfg.lua: Give example for logging to console

13 years agoprosody.cfg.lua: Improve comment about enabling debug logging
Matthew Wild [Fri, 7 Jan 2011 05:09:25 +0000 (05:09 +0000)]
prosody.cfg.lua: Improve comment about enabling debug logging

13 years agoprosody.cfg.lua: Add mod_offline to the list of modules that can be disabled, and...
Matthew Wild [Fri, 7 Jan 2011 05:08:09 +0000 (05:08 +0000)]
prosody.cfg.lua: Add mod_offline to the list of modules that can be disabled, and add comments for all auto-loaded modules

13 years agoMerge 0.8->trunk
Matthew Wild [Fri, 7 Jan 2011 04:42:01 +0000 (04:42 +0000)]
Merge 0.8->trunk

13 years agoprosody.cfg.lua.dist: Update to include storage configuration and examples for SQL
Matthew Wild [Fri, 7 Jan 2011 04:41:34 +0000 (04:41 +0000)]
prosody.cfg.lua.dist: Update to include storage configuration and examples for SQL

13 years agoprosody.cfg.lua.dist: Add note about the require_encryption options
Matthew Wild [Fri, 7 Jan 2011 04:32:27 +0000 (04:32 +0000)]
prosody.cfg.lua.dist: Add note about the require_encryption options

13 years agostoragemanager, mod_storage_internal: Split out default driver to mod_storage_interna...
Matthew Wild [Fri, 7 Jan 2011 04:22:28 +0000 (04:22 +0000)]
storagemanager, mod_storage_internal: Split out default driver to mod_storage_internal, and greatly simplify storagemanager's error handling and fallback code

13 years agoprosody.cfg.lua.dist: Add motd plugin
Matthew Wild [Fri, 7 Jan 2011 03:47:15 +0000 (03:47 +0000)]
prosody.cfg.lua.dist: Add motd plugin

13 years agomod_motd: Process value to strip any indentation from the config
Matthew Wild [Fri, 7 Jan 2011 03:46:10 +0000 (03:46 +0000)]
mod_motd: Process value to strip any indentation from the config

13 years agoMerge 0.8->trunk
Matthew Wild [Fri, 7 Jan 2011 03:18:40 +0000 (03:18 +0000)]
Merge 0.8->trunk

13 years agoejabberdstore.lib.lua: Remove now needless library
Matthew Wild [Fri, 7 Jan 2011 03:17:36 +0000 (03:17 +0000)]
ejabberdstore.lib.lua: Remove now needless library

13 years agoejabberd_init.lib.lua: Remove now needless library
Matthew Wild [Fri, 7 Jan 2011 03:16:39 +0000 (03:16 +0000)]
ejabberd_init.lib.lua: Remove now needless library

13 years agomod_storage_sql_ejabberd: Remove (moving to prosody-modules)
Matthew Wild [Fri, 7 Jan 2011 03:12:26 +0000 (03:12 +0000)]
mod_storage_sql_ejabberd: Remove (moving to prosody-modules)

13 years agoMerge 0.8->trunk
Matthew Wild [Thu, 6 Jan 2011 14:46:59 +0000 (14:46 +0000)]
Merge 0.8->trunk

13 years agostoragemanager: Fix log message (s/internal/null/)
Matthew Wild [Thu, 6 Jan 2011 14:01:57 +0000 (14:01 +0000)]
storagemanager: Fix log message (s/internal/null/)

13 years agostoragemanager: Fix log message (s/internal/null/)
Matthew Wild [Thu, 6 Jan 2011 14:01:57 +0000 (14:01 +0000)]
storagemanager: Fix log message (s/internal/null/)

13 years agostoragemanager: Add new "null" provider to get used when loading a driver or opening...
Matthew Wild [Thu, 6 Jan 2011 13:56:39 +0000 (13:56 +0000)]
storagemanager: Add new "null" provider to get used when loading a driver or opening a store fails, instead of falling back to the default driver

13 years agostoragemanager: Add new "null" provider to get used when loading a driver or opening...
Matthew Wild [Thu, 6 Jan 2011 13:56:39 +0000 (13:56 +0000)]
storagemanager: Add new "null" provider to get used when loading a driver or opening a store fails, instead of falling back to the default driver

13 years agostoragemanager: Log host in message when loading storage provider fails
Matthew Wild [Thu, 6 Jan 2011 13:54:37 +0000 (13:54 +0000)]
storagemanager: Log host in message when loading storage provider fails

13 years agostoragemanager: Log host in message when loading storage provider fails
Matthew Wild [Thu, 6 Jan 2011 13:54:37 +0000 (13:54 +0000)]
storagemanager: Log host in message when loading storage provider fails

13 years agonet.server_event: Log interface and port number when binding fails
Matthew Wild [Thu, 6 Jan 2011 13:47:20 +0000 (13:47 +0000)]
net.server_event: Log interface and port number when binding fails

13 years agonet.server_event: Log interface and port number when binding fails
Matthew Wild [Thu, 6 Jan 2011 13:47:20 +0000 (13:47 +0000)]
net.server_event: Log interface and port number when binding fails

13 years agomod_storage_sql: Catch Lua errors during SQL transactions, and rollback.
Waqas Hussain [Wed, 5 Jan 2011 01:56:36 +0000 (06:56 +0500)]
mod_storage_sql: Catch Lua errors during SQL transactions, and rollback.

13 years agomod_storage_sql: Catch Lua errors during SQL transactions, and rollback.
Waqas Hussain [Wed, 5 Jan 2011 01:56:36 +0000 (06:56 +0500)]
mod_storage_sql: Catch Lua errors during SQL transactions, and rollback.

13 years agonet.httpserver: Removed unused import and variables.
Waqas Hussain [Wed, 5 Jan 2011 01:34:23 +0000 (06:34 +0500)]
net.httpserver: Removed unused import and variables.

13 years agonet.httpserver: Removed unused import and variables.
Waqas Hussain [Wed, 5 Jan 2011 01:34:23 +0000 (06:34 +0500)]
net.httpserver: Removed unused import and variables.

13 years agonet.httpserver: Changed an unnecessary global access.
Waqas Hussain [Wed, 5 Jan 2011 01:26:49 +0000 (06:26 +0500)]
net.httpserver: Changed an unnecessary global access.

13 years agonet.httpserver: Changed an unnecessary global access.
Waqas Hussain [Wed, 5 Jan 2011 01:26:49 +0000 (06:26 +0500)]
net.httpserver: Changed an unnecessary global access.

13 years agomod_storage_sql: Removed unnecessary initialization of a variable.
Waqas Hussain [Wed, 5 Jan 2011 01:23:58 +0000 (06:23 +0500)]
mod_storage_sql: Removed unnecessary initialization of a variable.

13 years agomod_storage_sql: Removed unnecessary initialization of a variable.
Waqas Hussain [Wed, 5 Jan 2011 01:23:58 +0000 (06:23 +0500)]
mod_storage_sql: Removed unnecessary initialization of a variable.

13 years agonet.httpserver: Decode percent-encoded characters in URL path.
Waqas Hussain [Wed, 5 Jan 2011 01:23:17 +0000 (06:23 +0500)]
net.httpserver: Decode percent-encoded characters in URL path.

13 years agonet.httpserver: Decode percent-encoded characters in URL path.
Waqas Hussain [Wed, 5 Jan 2011 01:23:17 +0000 (06:23 +0500)]
net.httpserver: Decode percent-encoded characters in URL path.

13 years agomodulemanager: Removed an unused variable.
Waqas Hussain [Wed, 5 Jan 2011 01:16:27 +0000 (06:16 +0500)]
modulemanager: Removed an unused variable.

13 years agomodulemanager: Removed an unused variable.
Waqas Hussain [Wed, 5 Jan 2011 01:16:27 +0000 (06:16 +0500)]
modulemanager: Removed an unused variable.

13 years agoconfigmanager: Added rawget().
Waqas Hussain [Wed, 5 Jan 2011 01:16:07 +0000 (06:16 +0500)]
configmanager: Added rawget().

13 years agoconfigmanager: Added rawget().
Waqas Hussain [Wed, 5 Jan 2011 01:16:07 +0000 (06:16 +0500)]
configmanager: Added rawget().

13 years agomod_bosh: Fix for miscalculating inactivity, causing disconnects under a steady strea...
Matthew Wild [Tue, 4 Jan 2011 21:38:14 +0000 (21:38 +0000)]
mod_bosh: Fix for miscalculating inactivity, causing disconnects under a steady stream of traffic

13 years agomod_bosh: Fix for miscalculating inactivity, causing disconnects under a steady strea...
Matthew Wild [Tue, 4 Jan 2011 21:38:14 +0000 (21:38 +0000)]
mod_bosh: Fix for miscalculating inactivity, causing disconnects under a steady stream of traffic

13 years agoprosody, prosodyctl: Filter out relative paths from package.(c)path when installed
Matthew Wild [Tue, 4 Jan 2011 21:19:28 +0000 (21:19 +0000)]
prosody, prosodyctl: Filter out relative paths from package.(c)path when installed

13 years agoprosody, prosodyctl: Filter out relative paths from package.(c)path when installed
Matthew Wild [Tue, 4 Jan 2011 21:19:28 +0000 (21:19 +0000)]
prosody, prosodyctl: Filter out relative paths from package.(c)path when installed

13 years agoprosody, prosodyctl: Create prosody object as a local before exporting as a global
Matthew Wild [Tue, 4 Jan 2011 21:18:35 +0000 (21:18 +0000)]
prosody, prosodyctl: Create prosody object as a local before exporting as a global

13 years agoprosody, prosodyctl: Create prosody object as a local before exporting as a global
Matthew Wild [Tue, 4 Jan 2011 21:18:35 +0000 (21:18 +0000)]
prosody, prosodyctl: Create prosody object as a local before exporting as a global

13 years agomod_register: Small code cleanup
Matthew Wild [Tue, 4 Jan 2011 17:21:58 +0000 (17:21 +0000)]
mod_register: Small code cleanup

13 years agomod_register: Small code cleanup
Matthew Wild [Tue, 4 Jan 2011 17:21:58 +0000 (17:21 +0000)]
mod_register: Small code cleanup

13 years agomod_register: Change to use new delete_user auth provider method
Matthew Wild [Tue, 4 Jan 2011 17:19:39 +0000 (17:19 +0000)]
mod_register: Change to use new delete_user auth provider method

13 years agomod_register: Change to use new delete_user auth provider method
Matthew Wild [Tue, 4 Jan 2011 17:19:39 +0000 (17:19 +0000)]
mod_register: Change to use new delete_user auth provider method

13 years agomod_register: Add registration_compat config option to allow account remove requests...
Matthew Wild [Tue, 4 Jan 2011 17:15:47 +0000 (17:15 +0000)]
mod_register: Add registration_compat config option to allow account remove requests addressed to='host' (defaults to true)

13 years agomod_register: Add registration_compat config option to allow account remove requests...
Matthew Wild [Tue, 4 Jan 2011 17:15:47 +0000 (17:15 +0000)]
mod_register: Add registration_compat config option to allow account remove requests addressed to='host' (defaults to true)

13 years agomod_auth_internal_*: Support for delete_user method
Matthew Wild [Tue, 4 Jan 2011 17:12:28 +0000 (17:12 +0000)]
mod_auth_internal_*: Support for delete_user method

13 years agomod_auth_internal_*: Support for delete_user method
Matthew Wild [Tue, 4 Jan 2011 17:12:28 +0000 (17:12 +0000)]
mod_auth_internal_*: Support for delete_user method

13 years agousermanager: Add delete_user method
Matthew Wild [Tue, 4 Jan 2011 17:11:51 +0000 (17:11 +0000)]
usermanager: Add delete_user method

13 years agousermanager: Add delete_user method
Matthew Wild [Tue, 4 Jan 2011 17:11:51 +0000 (17:11 +0000)]
usermanager: Add delete_user method

13 years agousermanager: Have methods not implemented in the active provider fall back to the...
Matthew Wild [Tue, 4 Jan 2011 17:11:37 +0000 (17:11 +0000)]
usermanager: Have methods not implemented in the active provider fall back to the null provider (later we can add support for chains of providers)

13 years agousermanager: Have methods not implemented in the active provider fall back to the...
Matthew Wild [Tue, 4 Jan 2011 17:11:37 +0000 (17:11 +0000)]
usermanager: Have methods not implemented in the active provider fall back to the null provider (later we can add support for chains of providers)

13 years agousermanager: Change dummy provider method to return an error string also (method...
Matthew Wild [Tue, 4 Jan 2011 17:10:56 +0000 (17:10 +0000)]
usermanager: Change dummy provider method to return an error string also (method not implemented)

13 years agousermanager: Change dummy provider method to return an error string also (method...
Matthew Wild [Tue, 4 Jan 2011 17:10:56 +0000 (17:10 +0000)]
usermanager: Change dummy provider method to return an error string also (method not implemented)

13 years agonet.adns: Log the DNS server that a query is sent to
Matthew Wild [Tue, 4 Jan 2011 16:37:57 +0000 (16:37 +0000)]
net.adns: Log the DNS server that a query is sent to

13 years agonet.adns: Log the DNS server that a query is sent to
Matthew Wild [Tue, 4 Jan 2011 16:37:57 +0000 (16:37 +0000)]
net.adns: Log the DNS server that a query is sent to

13 years agoMUC: Fix a pair of missing :up()
Kim Alvefur [Mon, 3 Jan 2011 08:40:45 +0000 (09:40 +0100)]
MUC: Fix a pair of missing :up()

13 years agoMUC: Fix a pair of missing :up()
Kim Alvefur [Mon, 3 Jan 2011 08:40:45 +0000 (09:40 +0100)]
MUC: Fix a pair of missing :up()

13 years agomod_pubsub: Correctly wrap the list of subscriptions in a pubsub element
Kim Alvefur [Wed, 29 Dec 2010 18:24:19 +0000 (19:24 +0100)]
mod_pubsub: Correctly wrap the list of subscriptions in a pubsub element

13 years agoutil.xmppstream: Optimized stanza building by bypassing the stanza API.
Waqas Hussain [Wed, 29 Dec 2010 13:49:59 +0000 (18:49 +0500)]
util.xmppstream: Optimized stanza building by bypassing the stanza API.

13 years agoutil.sasl: Cache the calculated mechanisms set for SASL profiles (profile.mechanisms...
Waqas Hussain [Wed, 29 Dec 2010 13:45:31 +0000 (18:45 +0500)]
util.sasl: Cache the calculated mechanisms set for SASL profiles (profile.mechanisms table).

13 years agoutil.sasl: Cache the calculated mechanisms set for SASL profiles (profile.mechanisms...
Waqas Hussain [Wed, 29 Dec 2010 13:45:31 +0000 (18:45 +0500)]
util.sasl: Cache the calculated mechanisms set for SASL profiles (profile.mechanisms table).

13 years agoprosody: Don't add a datamanager callback when anonymous_login=true (mod_auth_anonymo...
Waqas Hussain [Tue, 28 Dec 2010 04:59:27 +0000 (09:59 +0500)]
prosody: Don't add a datamanager callback when anonymous_login=true (mod_auth_anonymous does this now).

13 years agoprosody: Don't add a datamanager callback when anonymous_login=true (mod_auth_anonymo...
Waqas Hussain [Tue, 28 Dec 2010 04:59:27 +0000 (09:59 +0500)]
prosody: Don't add a datamanager callback when anonymous_login=true (mod_auth_anonymous does this now).

13 years agohostmanager: Don't set host.disallow_s2s when anonymous_login=true (mod_auth_anonymou...
Waqas Hussain [Tue, 28 Dec 2010 04:58:40 +0000 (09:58 +0500)]
hostmanager: Don't set host.disallow_s2s when anonymous_login=true (mod_auth_anonymous does this now).