prosody.git
8 years agoMerge 0.10->trunk
Matthew Wild [Thu, 17 Mar 2016 19:16:43 +0000 (19:16 +0000)]
Merge 0.10->trunk

8 years agotests: util.cache: Tests for different return values of on_evict
Matthew Wild [Thu, 17 Mar 2016 19:14:58 +0000 (19:14 +0000)]
tests: util.cache: Tests for different return values of on_evict

8 years agoutil.cache: Change behaviour of on_evict (and tests). Now accepts false instead of...
Matthew Wild [Thu, 17 Mar 2016 19:08:42 +0000 (19:08 +0000)]
util.cache: Change behaviour of on_evict (and tests). Now accepts false instead of a function (never evict), or on_evict can return false to prevent eviction.

8 years agoutil.cache: Add head() and tail() methods (and tests)
Matthew Wild [Thu, 17 Mar 2016 19:07:40 +0000 (19:07 +0000)]
util.cache: Add head() and tail() methods (and tests)

8 years agoMerge 0.10->trunk
Kim Alvefur [Thu, 17 Mar 2016 17:08:44 +0000 (18:08 +0100)]
Merge 0.10->trunk

8 years agoCHANGES: Remove mention of async
Kim Alvefur [Thu, 17 Mar 2016 17:08:16 +0000 (18:08 +0100)]
CHANGES: Remove mention of async

8 years agoMerge 0.10->trunk
Kim Alvefur [Thu, 17 Mar 2016 17:04:43 +0000 (18:04 +0100)]
Merge 0.10->trunk

8 years agoutil.async: Remove to prevent blocking a stable release
Kim Alvefur [Thu, 17 Mar 2016 17:00:35 +0000 (18:00 +0100)]
util.async: Remove to prevent blocking a stable release

8 years agomod_c2s: Remove use of util.async
Kim Alvefur [Thu, 17 Mar 2016 11:47:24 +0000 (12:47 +0100)]
mod_c2s: Remove use of util.async

8 years agoBacked out BOSH use of util.async (changeset f0687c313cf1)
Kim Alvefur [Thu, 17 Mar 2016 11:46:52 +0000 (12:46 +0100)]
Backed out BOSH use of util.async (changeset f0687c313cf1)

8 years agoMerge 0.10->trunk
Kim Alvefur [Mon, 14 Mar 2016 17:27:32 +0000 (18:27 +0100)]
Merge 0.10->trunk

8 years agomod_presence: Fix partial rename
Kim Alvefur [Mon, 14 Mar 2016 17:27:16 +0000 (18:27 +0100)]
mod_presence: Fix partial rename

8 years agoMerge 0.10->trunk
Kim Alvefur [Mon, 14 Mar 2016 16:38:50 +0000 (17:38 +0100)]
Merge 0.10->trunk

8 years agomod_presence: Move function for selecting "top resources" into a new util.presence
Kim Alvefur [Mon, 14 Mar 2016 16:26:27 +0000 (17:26 +0100)]
mod_presence: Move function for selecting "top resources" into a new util.presence

8 years agoMerge 0.10->trunk
Kim Alvefur [Mon, 14 Mar 2016 13:20:37 +0000 (14:20 +0100)]
Merge 0.10->trunk

8 years agomod_s2s: Include name of remote server when it's missing the stream ID (thanks Ge0rG)
Kim Alvefur [Mon, 14 Mar 2016 12:27:02 +0000 (13:27 +0100)]
mod_s2s: Include name of remote server when it's missing the stream ID (thanks Ge0rG)

8 years agoutil.sql: Remove unused arguments [luacheck]
Kim Alvefur [Sun, 13 Mar 2016 17:35:00 +0000 (18:35 +0100)]
util.sql: Remove unused arguments [luacheck]

8 years agoutil.sql: Don't break out of result retreival loops
Kim Alvefur [Sun, 13 Mar 2016 17:31:53 +0000 (18:31 +0100)]
util.sql: Don't break out of result retreival loops

8 years agomod_storage_sql: Allow loops over results to end on their own
Kim Alvefur [Sun, 13 Mar 2016 16:43:33 +0000 (17:43 +0100)]
mod_storage_sql: Allow loops over results to end on their own

8 years agomod_storage_sql: Add LIMIT clause to queries where only a single row is expected
Kim Alvefur [Sun, 13 Mar 2016 16:42:22 +0000 (17:42 +0100)]
mod_storage_sql: Add LIMIT clause to queries where only a single row is expected

8 years agoutil.sql: Move per-driver (currenly only PostgreSQL) query transform into its own...
Kim Alvefur [Sun, 13 Mar 2016 16:38:49 +0000 (17:38 +0100)]
util.sql: Move per-driver (currenly only PostgreSQL) query transform into its own method

8 years agorostermanager: Remove FIXME, per XMPP Core 8.1.1.1, we do not need to set the 'to...
Kim Alvefur [Sat, 12 Mar 2016 17:13:24 +0000 (18:13 +0100)]
rostermanager: Remove FIXME, per XMPP Core 8.1.1.1, we do not need to set the 'to' attribute

8 years agoMUC: Use already initialized logger
Kim Alvefur [Fri, 11 Mar 2016 19:35:26 +0000 (20:35 +0100)]
MUC: Use already initialized logger

8 years agoMerge 0.10->trunk
Kim Alvefur [Fri, 11 Mar 2016 12:41:10 +0000 (13:41 +0100)]
Merge 0.10->trunk

8 years agomod_watchregistrations: Use type-specific config API for 'registration_notification'
Kim Alvefur [Fri, 11 Mar 2016 12:37:18 +0000 (13:37 +0100)]
mod_watchregistrations: Use type-specific config API for 'registration_notification'

8 years agoprosodyctl check: Add 'vcard_compatibility' to deprecated options
Kim Alvefur [Fri, 11 Mar 2016 12:36:48 +0000 (13:36 +0100)]
prosodyctl check: Add 'vcard_compatibility' to deprecated options

8 years agoMUC: Use type-specific config API for the 'name' option
Kim Alvefur [Fri, 11 Mar 2016 12:34:32 +0000 (13:34 +0100)]
MUC: Use type-specific config API for the 'name' option

8 years agomod_presence: Use type-specific config API for boolean 'ignore_presence_priority...
Kim Alvefur [Fri, 11 Mar 2016 12:13:20 +0000 (13:13 +0100)]
mod_presence: Use type-specific config API for boolean 'ignore_presence_priority' option

8 years agoMerge 0.10->trunk
Matthew Wild [Thu, 10 Mar 2016 17:55:40 +0000 (17:55 +0000)]
Merge 0.10->trunk

8 years agoutil.prosodyctl: Remove unused variable [luacheck]
Matthew Wild [Thu, 10 Mar 2016 17:53:36 +0000 (17:53 +0000)]
util.prosodyctl: Remove unused variable [luacheck]

8 years agoutil.json: Variable renaming to avoid shadowing [luacheck]
Matthew Wild [Thu, 10 Mar 2016 17:53:17 +0000 (17:53 +0000)]
util.json: Variable renaming to avoid shadowing [luacheck]

8 years agoutil.iterators: Variable renaming to avoid shadowing [luacheck]
Matthew Wild [Thu, 10 Mar 2016 17:52:57 +0000 (17:52 +0000)]
util.iterators: Variable renaming to avoid shadowing [luacheck]

8 years agonet.websocket.frames, util.datetime, util.json, util.prosodyctl, util.rfc6724: Remove...
Matthew Wild [Thu, 10 Mar 2016 17:52:03 +0000 (17:52 +0000)]
net.websocket.frames, util.datetime, util.json, util.prosodyctl, util.rfc6724: Remove unused variables [luacheck]

8 years agoutil.iterators: Return initial var from upstream iterator [luacheck]
Matthew Wild [Thu, 10 Mar 2016 17:49:46 +0000 (17:49 +0000)]
util.iterators: Return initial var from upstream iterator [luacheck]

8 years agoutil.iterators: Don't replace var, as we should preserve var from the original iterat...
Matthew Wild [Thu, 10 Mar 2016 17:48:53 +0000 (17:48 +0000)]
util.iterators: Don't replace var, as we should preserve var from the original iterator [luacheck]

8 years agoutil.dependencies: Show the full error when a symbol is not found (i.e., when running...
Thijs Alkemade [Thu, 10 Mar 2016 09:13:57 +0000 (10:13 +0100)]
util.dependencies: Show the full error when a symbol is not found (i.e., when running Prosody with the wrong version of Lua).

8 years agoMerge 0.10->trunk
Matthew Wild [Wed, 9 Mar 2016 13:19:38 +0000 (13:19 +0000)]
Merge 0.10->trunk

8 years agoprosodyctl: Fix variable typo [luacheck]
Matthew Wild [Wed, 9 Mar 2016 13:01:11 +0000 (13:01 +0000)]
prosodyctl: Fix variable typo [luacheck]

8 years agotests: Expand util.stanza tests
Matthew Wild [Wed, 9 Mar 2016 12:59:43 +0000 (12:59 +0000)]
tests: Expand util.stanza tests

8 years agoutil.stanza: Some code cleanup [luacheck]
Matthew Wild [Wed, 9 Mar 2016 12:37:56 +0000 (12:37 +0000)]
util.stanza: Some code cleanup [luacheck]

8 years agoprosodyctl: Fix typo'd variable name [luacheck]
Matthew Wild [Tue, 8 Mar 2016 17:49:33 +0000 (17:49 +0000)]
prosodyctl: Fix typo'd variable name [luacheck]

8 years agoMerge 0.10->trunk
Kim Alvefur [Mon, 7 Mar 2016 15:48:28 +0000 (16:48 +0100)]
Merge 0.10->trunk

8 years agoMerge
Matthew Wild [Mon, 7 Mar 2016 13:43:05 +0000 (13:43 +0000)]
Merge

8 years agoprosodyctl: Use already sorted array of module names [luacheck]
Kim Alvefur [Mon, 7 Mar 2016 11:15:39 +0000 (12:15 +0100)]
prosodyctl: Use already sorted array of module names [luacheck]

8 years agoprosodyctl: Include libevent version in "about" output if luaevent is available
Kim Alvefur [Mon, 7 Mar 2016 11:13:22 +0000 (12:13 +0100)]
prosodyctl: Include libevent version in "about" output if luaevent is available

8 years agoMUC: Don't reply to error stanzas with more error stanzas (thanks woffs)
Kim Alvefur [Mon, 7 Mar 2016 09:59:37 +0000 (10:59 +0100)]
MUC: Don't reply to error stanzas with more error stanzas (thanks woffs)

8 years agoMerge trunk->0.10
Kim Alvefur [Sun, 6 Mar 2016 17:52:22 +0000 (18:52 +0100)]
Merge trunk->0.10

8 years agostoragemanager: Fix saving data in map shim when no prior data exists
Kim Alvefur [Sun, 6 Mar 2016 17:51:11 +0000 (18:51 +0100)]
storagemanager: Fix saving data in map shim when no prior data exists

8 years agotests: Add namespace/prefix tracking test for util.xml
Matthew Wild [Sat, 5 Mar 2016 23:44:57 +0000 (23:44 +0000)]
tests: Add namespace/prefix tracking test for util.xml

8 years agoMerge 0.10->trunk
Matthew Wild [Sat, 5 Mar 2016 23:44:21 +0000 (23:44 +0000)]
Merge 0.10->trunk

8 years agotests: Add basic tests for util.xml and util.xmppstream
Matthew Wild [Sat, 5 Mar 2016 23:42:01 +0000 (23:42 +0000)]
tests: Add basic tests for util.xml and util.xmppstream

8 years agoutil.xmppstream: Remove namespace tracking, it's broken as implemented
Matthew Wild [Sat, 5 Mar 2016 23:37:56 +0000 (23:37 +0000)]
util.xmppstream: Remove namespace tracking, it's broken as implemented

The code fails to handle namespaces on the initial opening tag (when 'stanza' is nil). Fixing this
seems not worth the effort for a feature that is not being used.

8 years agoutil.xml: Correct stanza.namespaces table construction when duplicate prefix names...
Waqas Hussain [Sat, 5 Mar 2016 22:51:35 +0000 (17:51 -0500)]
util.xml: Correct stanza.namespaces table construction when duplicate prefix names are encountered in the element tree.

8 years agoMerge 0.10->trunk
Matthew Wild [Sat, 5 Mar 2016 20:50:17 +0000 (20:50 +0000)]
Merge 0.10->trunk

8 years agotests: Add extra tests for util.json
Matthew Wild [Sat, 5 Mar 2016 20:48:20 +0000 (20:48 +0000)]
tests: Add extra tests for util.json

8 years agoMerge 0.10->trunk
Matthew Wild [Fri, 4 Mar 2016 22:28:15 +0000 (22:28 +0000)]
Merge 0.10->trunk

8 years agoutil.json: Fix encoding of json.null (bug introduced in bf1f09a5bcf7)
Matthew Wild [Fri, 4 Mar 2016 22:27:04 +0000 (22:27 +0000)]
util.json: Fix encoding of json.null (bug introduced in bf1f09a5bcf7)

8 years agoMakefile: Reduce verbosity of 'make test' so it only shows test failures
Matthew Wild [Fri, 4 Mar 2016 22:17:38 +0000 (22:17 +0000)]
Makefile: Reduce verbosity of 'make test' so it only shows test failures

8 years agoAdd tests for util.json
Matthew Wild [Fri, 4 Mar 2016 22:17:16 +0000 (22:17 +0000)]
Add tests for util.json

8 years agoMerge 0.10->trunk
Kim Alvefur [Thu, 3 Mar 2016 15:06:16 +0000 (16:06 +0100)]
Merge 0.10->trunk

8 years agoMerge 0.9->0.10
Kim Alvefur [Thu, 3 Mar 2016 15:05:34 +0000 (16:05 +0100)]
Merge 0.9->0.10

8 years agomod_http_files: Preserve a trailing / in paths (fixes #639)
Kim Alvefur [Thu, 3 Mar 2016 14:31:46 +0000 (15:31 +0100)]
mod_http_files: Preserve a trailing / in paths (fixes #639)

8 years agomod_http_files: Don't prepend / to path twice, sanitize path does this already
Kim Alvefur [Thu, 3 Mar 2016 14:30:00 +0000 (15:30 +0100)]
mod_http_files: Don't prepend / to path twice, sanitize path does this already

8 years agomod_http_files: Fix traceback when serving a non-wildcard path (fixes #611)
Kim Alvefur [Thu, 3 Mar 2016 14:28:07 +0000 (15:28 +0100)]
mod_http_files: Fix traceback when serving a non-wildcard path (fixes #611)

8 years agomod_welcome: Pass default text to config API as default value
Kim Alvefur [Wed, 2 Mar 2016 15:43:42 +0000 (16:43 +0100)]
mod_welcome: Pass default text to config API as default value

8 years agomod_welcome: Use type-specific config API
Kim Alvefur [Wed, 2 Mar 2016 15:42:59 +0000 (16:42 +0100)]
mod_welcome: Use type-specific config API

8 years agoMerge 0.10->trunk
Kim Alvefur [Wed, 2 Mar 2016 15:34:34 +0000 (16:34 +0100)]
Merge 0.10->trunk

8 years agoMerge 0.9->0.10
Kim Alvefur [Wed, 2 Mar 2016 15:32:37 +0000 (16:32 +0100)]
Merge 0.9->0.10

8 years agonet.server_event: Return true from conn:resume() to indicate success
Kim Alvefur [Wed, 2 Mar 2016 15:30:46 +0000 (16:30 +0100)]
net.server_event: Return true from conn:resume() to indicate success

8 years agonet.server_event: Prevent resuming connections without readcallback, eg closed connec...
Kim Alvefur [Wed, 2 Mar 2016 15:30:05 +0000 (16:30 +0100)]
net.server_event: Prevent resuming connections without readcallback, eg closed connections (fixes #590)

8 years agomod_c2s: Remove connection object from session object when connection disconnected...
Kim Alvefur [Wed, 2 Mar 2016 15:28:11 +0000 (16:28 +0100)]
mod_c2s: Remove connection object from session object when connection disconnected to prevent accidental use (see #590)

8 years agoMerge 0.10->trunk
Kim Alvefur [Sun, 28 Feb 2016 19:05:56 +0000 (20:05 +0100)]
Merge 0.10->trunk

8 years agoutil.sasl.scram: Rename variable in places missed in 65e36b81d56a (thanks mt)
Kim Alvefur [Sun, 28 Feb 2016 19:01:13 +0000 (20:01 +0100)]
util.sasl.scram: Rename variable in places missed in 65e36b81d56a (thanks mt)

8 years agoMerge 0.10->trunk
Kim Alvefur [Sun, 28 Feb 2016 18:27:13 +0000 (19:27 +0100)]
Merge 0.10->trunk

8 years agoutil.sasl.scram: Remove unused initial value [luacheck]
Kim Alvefur [Sun, 28 Feb 2016 18:26:45 +0000 (19:26 +0100)]
util.sasl.scram: Remove unused initial value [luacheck]

8 years agoutil.sasl.scram: Rename variable to avoid name clash [luacheck]
Kim Alvefur [Sun, 28 Feb 2016 18:26:14 +0000 (19:26 +0100)]
util.sasl.scram: Rename variable to avoid name clash [luacheck]

8 years agoutil.sasl.anonymous: Remove unused locals [luacheck]
Kim Alvefur [Sun, 28 Feb 2016 18:25:39 +0000 (19:25 +0100)]
util.sasl.anonymous: Remove unused locals [luacheck]

8 years agoMerge 0.10->trunk
Kim Alvefur [Sun, 28 Feb 2016 17:47:32 +0000 (18:47 +0100)]
Merge 0.10->trunk

8 years agoprosodyctl: One month is 31 days, no 13 (thanks av6)
Kim Alvefur [Sun, 28 Feb 2016 17:47:11 +0000 (18:47 +0100)]
prosodyctl: One month is 31 days, no 13 (thanks av6)

8 years agoprosodyctl: Fix typo (thanks av6)
Kim Alvefur [Sun, 28 Feb 2016 17:45:27 +0000 (18:45 +0100)]
prosodyctl: Fix typo (thanks av6)

8 years agoMerge 0.10->trunk
Kim Alvefur [Sun, 28 Feb 2016 17:25:16 +0000 (18:25 +0100)]
Merge 0.10->trunk

8 years agoprosodyctl: check certs: Warn about certificate expiry in the near future
Kim Alvefur [Sun, 28 Feb 2016 17:24:12 +0000 (18:24 +0100)]
prosodyctl: check certs: Warn about certificate expiry in the near future

8 years agoprosodyctl: check certs: Update messages to account for 'ssl' option maybe not existing
Kim Alvefur [Sun, 28 Feb 2016 17:23:24 +0000 (18:23 +0100)]
prosodyctl: check certs: Update messages to account for 'ssl' option maybe not existing

8 years agoprosodyctl: check certs: Use certmanager to get the final ssl config in order to...
Kim Alvefur [Sun, 28 Feb 2016 17:22:23 +0000 (18:22 +0100)]
prosodyctl: check certs: Use certmanager to get the final ssl config in order to support the new certificate(s) config option

8 years agoMerge 0.10->trunk
Kim Alvefur [Sun, 28 Feb 2016 14:06:56 +0000 (15:06 +0100)]
Merge 0.10->trunk

8 years agoutil.termcolours: Rename loop variable [luacheck]
Kim Alvefur [Sun, 28 Feb 2016 14:03:16 +0000 (15:03 +0100)]
util.termcolours: Rename loop variable [luacheck]

8 years agoutil.termcolours: Validate color codes, fixes traceback
Kim Alvefur [Sun, 28 Feb 2016 14:03:01 +0000 (15:03 +0100)]
util.termcolours: Validate color codes, fixes traceback

8 years agoutil.termcolours: Add some CSS color names
Kim Alvefur [Sat, 27 Feb 2016 15:56:34 +0000 (16:56 +0100)]
util.termcolours: Add some CSS color names

8 years agoutil.termcolours: Add 256 color support
Kim Alvefur [Sat, 27 Feb 2016 15:47:12 +0000 (16:47 +0100)]
util.termcolours: Add 256 color support

8 years agoutil.datamanager: Explicit handling of each error condition (see #632)
Kim Alvefur [Sat, 27 Feb 2016 14:29:56 +0000 (15:29 +0100)]
util.datamanager: Explicit handling of each error condition (see #632)

8 years agoMerge 0.9->0.10
Kim Alvefur [Thu, 25 Feb 2016 21:37:41 +0000 (22:37 +0100)]
Merge 0.9->0.10

8 years agoutil.datamanager: Unreference file handle after closing it to prevent trying to close...
Kim Alvefur [Thu, 25 Feb 2016 21:36:42 +0000 (22:36 +0100)]
util.datamanager: Unreference file handle after closing it to prevent trying to close it again (fixes #632)

8 years agoutil.termcolours: Remove argument from noop function [luacheck]
Kim Alvefur [Thu, 25 Feb 2016 21:33:58 +0000 (22:33 +0100)]
util.termcolours: Remove argument from noop function [luacheck]

8 years agoutil.termcolours: Silence luacheck warning
Kim Alvefur [Thu, 25 Feb 2016 21:33:40 +0000 (22:33 +0100)]
util.termcolours: Silence luacheck warning

8 years agoutil.template: Use separate variables for source and compiled function [luacheck]
Kim Alvefur [Thu, 25 Feb 2016 21:32:13 +0000 (22:32 +0100)]
util.template: Use separate variables for source and compiled function [luacheck]

8 years agoutil.template: Silence luacheck warnings about unused loop vars
Kim Alvefur [Thu, 25 Feb 2016 21:31:13 +0000 (22:31 +0100)]
util.template: Silence luacheck warnings about unused loop vars

8 years agoMerge 0.10->trunk
Kim Alvefur [Thu, 25 Feb 2016 14:40:35 +0000 (15:40 +0100)]
Merge 0.10->trunk

8 years agocerts/Makefile: Add target for generating DH params
Kim Alvefur [Thu, 25 Feb 2016 14:36:12 +0000 (15:36 +0100)]
certs/Makefile: Add target for generating DH params

8 years agoprosodyctl: Allow a DN path to be given to 'cert generate' command (fixes #349)
Kim Alvefur [Thu, 25 Feb 2016 14:35:44 +0000 (15:35 +0100)]
prosodyctl: Allow a DN path to be given to 'cert generate' command (fixes #349)

8 years agoutil.openssl: Allow order of distinguished name fields to be included in config
Kim Alvefur [Thu, 25 Feb 2016 14:34:38 +0000 (15:34 +0100)]
util.openssl: Allow order of distinguished name fields to be included in config