prosody.git
11 years agosessionmanager: Log the actual error message when roster loading fails.
Waqas Hussain [Fri, 30 Nov 2012 04:05:51 +0000 (09:05 +0500)]
sessionmanager: Log the actual error message when roster loading fails.

11 years agoMUC: Expose create_room(jid).
Waqas Hussain [Fri, 30 Nov 2012 03:57:58 +0000 (08:57 +0500)]
MUC: Expose create_room(jid).

11 years agomod_storage_sql: Return actual error string on commit failure.
Waqas Hussain [Fri, 30 Nov 2012 03:50:03 +0000 (08:50 +0500)]
mod_storage_sql: Return actual error string on commit failure.

11 years agoMerge 0.9->trunk
Matthew Wild [Thu, 29 Nov 2012 02:38:24 +0000 (07:38 +0500)]
Merge 0.9->trunk

11 years agonet.http.parser: Collapse multiple consecutive slashes in a path to a single slash
Matthew Wild [Thu, 29 Nov 2012 02:38:00 +0000 (07:38 +0500)]
net.http.parser: Collapse multiple consecutive slashes in a path to a single slash

11 years agoMerge
Matthew Wild [Thu, 29 Nov 2012 02:17:31 +0000 (07:17 +0500)]
Merge

11 years agoMerge 0.9->trunk
Matthew Wild [Thu, 29 Nov 2012 02:16:45 +0000 (07:16 +0500)]
Merge 0.9->trunk

11 years agomod_http: Fix pattern and slightly improve efficiency and memory usage of wildcard...
Matthew Wild [Thu, 29 Nov 2012 02:15:04 +0000 (07:15 +0500)]
mod_http: Fix pattern and slightly improve efficiency and memory usage of wildcard HTTP handlers

11 years agoMerge 0.9->trunk
Kim Alvefur [Sun, 25 Nov 2012 04:12:46 +0000 (05:12 +0100)]
Merge 0.9->trunk

11 years agomod_admin_adhoc: Remove unused form
Kim Alvefur [Sun, 25 Nov 2012 04:12:13 +0000 (05:12 +0100)]
mod_admin_adhoc: Remove unused form

11 years agoMerge 0.9->trunk
Kim Alvefur [Fri, 23 Nov 2012 16:17:02 +0000 (17:17 +0100)]
Merge 0.9->trunk

11 years agonet.server: Fix when no network_settings set and using libevent
Kim Alvefur [Fri, 23 Nov 2012 16:16:22 +0000 (17:16 +0100)]
net.server: Fix when no network_settings set and using libevent

11 years agoMerge 0.9->trunk
Kim Alvefur [Fri, 23 Nov 2012 00:51:53 +0000 (01:51 +0100)]
Merge 0.9->trunk

11 years agonet.server: Make server_* configurable in the config file.
Kim Alvefur [Fri, 23 Nov 2012 00:51:30 +0000 (01:51 +0100)]
net.server: Make server_* configurable in the config file.

11 years agonet.server_select: Better names for config options (thanks MattJ)
Kim Alvefur [Fri, 23 Nov 2012 00:51:30 +0000 (01:51 +0100)]
net.server_select: Better names for config options (thanks MattJ)

11 years agoMerge 0.9->trunk
Matthew Wild [Thu, 22 Nov 2012 21:57:35 +0000 (21:57 +0000)]
Merge 0.9->trunk

11 years agomuc: Make max_history_messages simply a service-wide config option, and don't store...
Matthew Wild [Thu, 22 Nov 2012 21:57:06 +0000 (21:57 +0000)]
muc: Make max_history_messages simply a service-wide config option, and don't store it per-room (rooms still have their own history_message, but this is a global limit)

11 years agoMerge with a merge (or something)
Matthew Wild [Thu, 22 Nov 2012 21:02:27 +0000 (21:02 +0000)]
Merge with a merge (or something)

11 years agoMerge 0.9->trunk
Matthew Wild [Thu, 22 Nov 2012 21:01:00 +0000 (21:01 +0000)]
Merge 0.9->trunk

11 years agomodulemanager: Set module.reloading when a module is reloading, and when loading...
Matthew Wild [Thu, 22 Nov 2012 20:59:20 +0000 (20:59 +0000)]
modulemanager: Set module.reloading when a module is reloading, and when loading make the saved state available in module.saved_state (if any)

11 years agoMerge 0.9->trunk
Kim Alvefur [Thu, 22 Nov 2012 19:42:12 +0000 (20:42 +0100)]
Merge 0.9->trunk

11 years agomod_http: Make module:http_url() aware of http_host
Kim Alvefur [Thu, 22 Nov 2012 19:40:06 +0000 (20:40 +0100)]
mod_http: Make module:http_url() aware of http_host

11 years agoMerge 0.9->trunk
Matthew Wild [Thu, 22 Nov 2012 19:38:42 +0000 (19:38 +0000)]
Merge 0.9->trunk

11 years agomod_bosh: Add 'Connection: keep-alive' header
Matthew Wild [Thu, 22 Nov 2012 19:37:30 +0000 (19:37 +0000)]
mod_bosh: Add 'Connection: keep-alive' header

11 years agomod_bosh: Add support for stanza filters to BOSH sessions (needed by some plugins)
Matthew Wild [Thu, 22 Nov 2012 19:35:50 +0000 (19:35 +0000)]
mod_bosh: Add support for stanza filters to BOSH sessions (needed by some plugins)

11 years agomod_admin_telnet: Refactor so that command processing is performed in a separate...
Matthew Wild [Thu, 22 Nov 2012 18:32:27 +0000 (18:32 +0000)]
mod_admin_telnet: Refactor so that command processing is performed in a separate function (usable from other modules)

11 years agomod_bosh: Add bosh_max_wait config option, to limit the amount of time a client can...
Matthew Wild [Thu, 22 Nov 2012 18:24:09 +0000 (18:24 +0000)]
mod_bosh: Add bosh_max_wait config option, to limit the amount of time a client can request for the server to hold open requests

11 years agoMerge 0.9->trunk
Matthew Wild [Thu, 22 Nov 2012 17:42:14 +0000 (17:42 +0000)]
Merge 0.9->trunk

11 years agomod_http: Rename variable for clarity
Matthew Wild [Thu, 22 Nov 2012 17:38:53 +0000 (17:38 +0000)]
mod_http: Rename variable for clarity

11 years agoMerge 0.9->trunk
Matthew Wild [Thu, 15 Nov 2012 19:07:53 +0000 (14:07 -0500)]
Merge 0.9->trunk

11 years agoutil.pubsub: Add item-published event
Matthew Wild [Thu, 15 Nov 2012 18:24:44 +0000 (13:24 -0500)]
util.pubsub: Add item-published event

11 years agomod_http: Add 'http_host' option to change the HTTP virtual host that this host is...
Matthew Wild [Thu, 15 Nov 2012 18:24:10 +0000 (13:24 -0500)]
mod_http: Add 'http_host' option to change the HTTP virtual host that this host is accessible at (e.g. allows mapping a host to '127.0.0.1')

11 years agomod_bosh: Share sessions and inactive_sessions tables
Matthew Wild [Thu, 15 Nov 2012 18:18:41 +0000 (13:18 -0500)]
mod_bosh: Share sessions and inactive_sessions tables

11 years agoMerge 0.9 -> trunk
Kim Alvefur [Sun, 11 Nov 2012 22:48:38 +0000 (23:48 +0100)]
Merge 0.9 -> trunk

11 years agomod_posix: Log a message explaining that we are detaching from the console
Kim Alvefur [Sun, 11 Nov 2012 22:44:56 +0000 (23:44 +0100)]
mod_posix: Log a message explaining that we are detaching from the console

11 years agoutil.pposix: Prevent FDs 0, 1 and 2 from being assigned to connections
Kim Alvefur [Sat, 10 Nov 2012 22:41:53 +0000 (23:41 +0100)]
util.pposix: Prevent FDs 0, 1 and 2 from being assigned to connections

11 years agomod_posix: Remove console and stdout logging sinks before daemonizing
Kim Alvefur [Sat, 10 Nov 2012 22:39:22 +0000 (23:39 +0100)]
mod_posix: Remove console and stdout logging sinks before daemonizing

11 years agoMerge 0.9 -> trunk
Kim Alvefur [Wed, 24 Oct 2012 17:56:22 +0000 (19:56 +0200)]
Merge 0.9 -> trunk

11 years agomod_s2s: Detect TLS compression
Kim Alvefur [Wed, 24 Oct 2012 17:05:56 +0000 (19:05 +0200)]
mod_s2s: Detect TLS compression

11 years agoMerge 0.9 -> trunk
Kim Alvefur [Sun, 14 Oct 2012 20:53:41 +0000 (22:53 +0200)]
Merge 0.9 -> trunk

11 years agomod_presence: Fix indentation
Kim Alvefur [Sun, 14 Oct 2012 19:04:46 +0000 (21:04 +0200)]
mod_presence: Fix indentation

11 years agomod_pep: Remove unused imports
Kim Alvefur [Sun, 14 Oct 2012 19:03:52 +0000 (21:03 +0200)]
mod_pep: Remove unused imports

11 years agomod_motd: Don't trigger on directed presence or stanzas from s2s.
Kim Alvefur [Sat, 13 Oct 2012 13:21:59 +0000 (15:21 +0200)]
mod_motd: Don't trigger on directed presence or stanzas from s2s.

11 years agomod_admin_telnet: user:list(): Allow filtering the set of users
Kim Alvefur [Fri, 12 Oct 2012 16:49:22 +0000 (18:49 +0200)]
mod_admin_telnet: user:list(): Allow filtering the set of users

11 years agomod_admin_telnet: user:list() check that the given host exists
Kim Alvefur [Fri, 12 Oct 2012 16:33:24 +0000 (18:33 +0200)]
mod_admin_telnet: user:list() check that the given host exists

11 years agoMerge 0.9->trunk
Matthew Wild [Mon, 1 Oct 2012 19:15:39 +0000 (20:15 +0100)]
Merge 0.9->trunk

11 years agomod_register: Fire event to allow blocking user registration
Florian Zeitz [Mon, 1 Oct 2012 19:07:20 +0000 (21:07 +0200)]
mod_register: Fire event to allow blocking user registration

11 years agoMerge 0.9->trunk
Matthew Wild [Sat, 29 Sep 2012 16:07:50 +0000 (17:07 +0100)]
Merge 0.9->trunk

11 years agomoduleapi: Revert previous commit and add comment, it's meant to be this way
Matthew Wild [Sat, 29 Sep 2012 16:07:08 +0000 (17:07 +0100)]
moduleapi: Revert previous commit and add comment, it's meant to be this way

11 years agoMerge 0.9->trunk
Matthew Wild [Sat, 29 Sep 2012 09:47:37 +0000 (10:47 +0100)]
Merge 0.9->trunk

11 years agomoduleapi: Fix require of modulemanager (thanks mva!)
Matthew Wild [Sat, 29 Sep 2012 09:46:03 +0000 (10:46 +0100)]
moduleapi: Fix require of modulemanager (thanks mva!)

11 years agoMerge 0.9 -> trunk (like this?)
Kim Alvefur [Fri, 28 Sep 2012 23:05:17 +0000 (01:05 +0200)]
Merge 0.9 -> trunk (like this?)

11 years agomod_admin_telnet: Fix copypaste error in user section of help
Kim Alvefur [Fri, 28 Sep 2012 09:59:37 +0000 (11:59 +0200)]
mod_admin_telnet: Fix copypaste error in user section of help

11 years agoMerge 0.9->trunk
Waqas Hussain [Sat, 22 Sep 2012 20:13:08 +0000 (01:13 +0500)]
Merge 0.9->trunk

11 years agoprosodyctl: Make sure hosts[*].modules always exists.
Waqas Hussain [Sat, 22 Sep 2012 20:11:20 +0000 (01:11 +0500)]
prosodyctl: Make sure hosts[*].modules always exists.

11 years agomod_admin_telnet: Add support for listing users
Kim Alvefur [Fri, 21 Sep 2012 15:26:54 +0000 (17:26 +0200)]
mod_admin_telnet: Add support for listing users

11 years agousermanager: Add support for iterating over accounts
Kim Alvefur [Fri, 21 Sep 2012 15:26:25 +0000 (17:26 +0200)]
usermanager: Add support for iterating over accounts

11 years agomod_auth_internal_{plain,hashed}: Add support for iterating over accounts
Kim Alvefur [Fri, 21 Sep 2012 15:26:12 +0000 (17:26 +0200)]
mod_auth_internal_{plain,hashed}: Add support for iterating over accounts

11 years agostoragemanager: Support for iterating over users
Kim Alvefur [Fri, 21 Sep 2012 15:24:44 +0000 (17:24 +0200)]
storagemanager: Support for iterating over users

11 years agomod_storage_sql: Add support for iterating over users with data in a store
Kim Alvefur [Fri, 21 Sep 2012 15:24:06 +0000 (17:24 +0200)]
mod_storage_sql: Add support for iterating over users with data in a store

11 years agomod_storage_internal, datamanager: Add support for iterating over users with data...
Kim Alvefur [Fri, 21 Sep 2012 15:23:08 +0000 (17:23 +0200)]
mod_storage_internal, datamanager: Add support for iterating over users with data in a store

11 years agoprosodyctl: Fix copypaste error
Kim Alvefur [Wed, 19 Sep 2012 21:29:25 +0000 (23:29 +0200)]
prosodyctl: Fix copypaste error

11 years agoprosodyctl: Fix copypaste error
Kim Alvefur [Wed, 19 Sep 2012 21:29:25 +0000 (23:29 +0200)]
prosodyctl: Fix copypaste error

11 years agoprosodyctl: Set stricter umask while generating key (thanks darkrain)
Kim Alvefur [Wed, 19 Sep 2012 21:26:38 +0000 (23:26 +0200)]
prosodyctl: Set stricter umask while generating key (thanks darkrain)

11 years agoprosodyctl: Set stricter umask while generating key (thanks darkrain)
Kim Alvefur [Wed, 19 Sep 2012 21:26:38 +0000 (23:26 +0200)]
prosodyctl: Set stricter umask while generating key (thanks darkrain)

11 years agoprosodyctl: Abort if unable to load util.pposix
Kim Alvefur [Wed, 19 Sep 2012 21:25:10 +0000 (23:25 +0200)]
prosodyctl: Abort if unable to load util.pposix

11 years agoprosodyctl: Abort if unable to load util.pposix
Kim Alvefur [Wed, 19 Sep 2012 21:25:10 +0000 (23:25 +0200)]
prosodyctl: Abort if unable to load util.pposix

11 years agoprosodyctl: Set $HOME to data path. Fixes issue with openssl and random state (Thanks...
Kim Alvefur [Wed, 19 Sep 2012 21:24:40 +0000 (23:24 +0200)]
prosodyctl: Set $HOME to data path. Fixes issue with openssl and random state (Thanks Florob)

11 years agoprosodyctl: Set $HOME to data path. Fixes issue with openssl and random state (Thanks...
Kim Alvefur [Wed, 19 Sep 2012 21:24:40 +0000 (23:24 +0200)]
prosodyctl: Set $HOME to data path. Fixes issue with openssl and random state (Thanks Florob)

11 years agostoragemanager: Remove unused variable
Kim Alvefur [Wed, 19 Sep 2012 14:40:38 +0000 (16:40 +0200)]
storagemanager: Remove unused variable

11 years agostoragemanager: Remove unused variable
Kim Alvefur [Wed, 19 Sep 2012 14:40:38 +0000 (16:40 +0200)]
storagemanager: Remove unused variable

11 years agostoragemanager: Fix argument (Thanks Maranda)
Kim Alvefur [Wed, 19 Sep 2012 14:39:19 +0000 (16:39 +0200)]
storagemanager: Fix argument (Thanks Maranda)

11 years agostoragemanager: Fix argument (Thanks Maranda)
Kim Alvefur [Wed, 19 Sep 2012 14:39:19 +0000 (16:39 +0200)]
storagemanager: Fix argument (Thanks Maranda)

11 years agomod_admin_adhoc: Add commands for activating and deactivating hosts
Kim Alvefur [Wed, 19 Sep 2012 13:12:18 +0000 (15:12 +0200)]
mod_admin_adhoc: Add commands for activating and deactivating hosts

11 years agomod_admin_adhoc: Add commands for activating and deactivating hosts
Kim Alvefur [Wed, 19 Sep 2012 13:12:18 +0000 (15:12 +0200)]
mod_admin_adhoc: Add commands for activating and deactivating hosts

11 years agoconfigure, Makefile: Allow runtime to be overridden.
Kim Alvefur [Fri, 28 Sep 2012 10:04:07 +0000 (12:04 +0200)]
configure, Makefile: Allow runtime to be overridden.

11 years agoMUC: Fix traceback caused by faulty logic precedence. (thanks waqas, nulani)
Kim Alvefur [Tue, 25 Sep 2012 20:03:35 +0000 (22:03 +0200)]
MUC: Fix traceback caused by faulty logic precedence. (thanks waqas, nulani)

11 years agoprosody, prosodyctl: chdir() to data directory on startup
Matthew Wild [Wed, 19 Sep 2012 11:39:21 +0000 (12:39 +0100)]
prosody, prosodyctl: chdir() to data directory on startup

11 years agoMerge 0.9->trunk
Matthew Wild [Wed, 19 Sep 2012 11:14:08 +0000 (12:14 +0100)]
Merge 0.9->trunk

11 years agomod_storage_sql: Remove obsolete comment
Matthew Wild [Wed, 19 Sep 2012 11:09:27 +0000 (12:09 +0100)]
mod_storage_sql: Remove obsolete comment

11 years agostoragemanager: Remove usage of 'core' when calling configmanager.get()
Matthew Wild [Wed, 19 Sep 2012 11:08:33 +0000 (12:08 +0100)]
storagemanager: Remove usage of 'core' when calling configmanager.get()

11 years agostoragemanager, datamanager, mod_storage_{internal,sql}: Replace list_stores() with...
Kim Alvefur [Mon, 17 Sep 2012 03:42:10 +0000 (05:42 +0200)]
storagemanager, datamanager, mod_storage_{internal,sql}: Replace list_stores() with an iterator version

11 years agostoragemanager: Add purge() for purging user data from all backends in use
Kim Alvefur [Sun, 16 Sep 2012 00:18:07 +0000 (02:18 +0200)]
storagemanager: Add purge() for purging user data from all backends in use

11 years agomod_admin_telnet: Fix user:*, correct names, docs, do validation
Kim Alvefur [Sat, 15 Sep 2012 21:00:59 +0000 (23:00 +0200)]
mod_admin_telnet: Fix user:*, correct names, docs, do validation

11 years agoMerge 0.9->trunk
Matthew Wild [Thu, 13 Sep 2012 17:49:25 +0000 (18:49 +0100)]
Merge 0.9->trunk

11 years agomod_legacyauth: Fix for sending error response to unauthed s2s connections
Matthew Wild [Thu, 13 Sep 2012 17:48:35 +0000 (18:48 +0100)]
mod_legacyauth: Fix for sending error response to unauthed s2s connections

11 years agoMerge 0.9->trunk
Matthew Wild [Thu, 13 Sep 2012 17:32:24 +0000 (18:32 +0100)]
Merge 0.9->trunk

11 years agoconfigmanager: Fix include of relative files via Include directive in config
Matthew Wild [Thu, 13 Sep 2012 17:31:34 +0000 (18:31 +0100)]
configmanager: Fix include of relative files via Include directive in config

11 years agohostmanager, modulemanager: Ensure hosts[*].modules always exists.
Waqas Hussain [Wed, 12 Sep 2012 19:32:12 +0000 (00:32 +0500)]
hostmanager, modulemanager: Ensure hosts[*].modules always exists.

11 years agomod_storage_*: Don't explicitly set driver name, to ease copying/renaming modules.
Waqas Hussain [Wed, 12 Sep 2012 18:46:10 +0000 (23:46 +0500)]
mod_storage_*: Don't explicitly set driver name, to ease copying/renaming modules.

11 years agocore.storagemanager, mod_storage_*: "data-driver" -> "storage-provider", to allow...
Waqas Hussain [Wed, 12 Sep 2012 18:41:28 +0000 (23:41 +0500)]
core.storagemanager, mod_storage_*: "data-driver" -> "storage-provider", to allow using module:provides().

11 years agomod_{admin_telnet,c2s,component,http,net_multiplex,s2s}: Use module:provides() instea...
Waqas Hussain [Wed, 12 Sep 2012 17:22:31 +0000 (22:22 +0500)]
mod_{admin_telnet,c2s,component,http,net_multiplex,s2s}: Use module:provides() instead of module:add_item().

11 years agoMerge 0.9->trunk
Waqas Hussain [Wed, 12 Sep 2012 17:03:57 +0000 (22:03 +0500)]
Merge 0.9->trunk

11 years agoutil.datamanager: Make the util.pposix dependency optional.
Waqas Hussain [Wed, 12 Sep 2012 17:03:06 +0000 (22:03 +0500)]
util.datamanager: Make the util.pposix dependency optional.

11 years agomod_auth_*: Use module:provides().
Waqas Hussain [Wed, 12 Sep 2012 16:41:51 +0000 (21:41 +0500)]
mod_auth_*: Use module:provides().

11 years agomod_auth_internal_hashed: Get rid of useless wrapper function new_hashpass_provider.
Waqas Hussain [Wed, 12 Sep 2012 16:40:00 +0000 (21:40 +0500)]
mod_auth_internal_hashed: Get rid of useless wrapper function new_hashpass_provider.

11 years agomod_auth_{internal_plain,cyrus,anonymous}: Get rid of useless wrapper function new_de...
Waqas Hussain [Wed, 12 Sep 2012 16:32:12 +0000 (21:32 +0500)]
mod_auth_{internal_plain,cyrus,anonymous}: Get rid of useless wrapper function new_default_provider.

11 years agoMerge 0.9->trunk
Matthew Wild [Mon, 10 Sep 2012 22:17:06 +0000 (23:17 +0100)]
Merge 0.9->trunk

11 years agomod_dialback: Correctly check if a connection was destroyed (thanks iron)
Kim Alvefur [Wed, 5 Sep 2012 14:51:16 +0000 (16:51 +0200)]
mod_dialback: Correctly check if a connection was destroyed (thanks iron)

11 years agomod_s2s: Check that an SRV reply isn't empty.
Kim Alvefur [Mon, 3 Sep 2012 02:22:40 +0000 (04:22 +0200)]
mod_s2s: Check that an SRV reply isn't empty.