Kim Alvefur [Sat, 9 Jul 2016 20:33:04 +0000 (22:33 +0200)]
MUC: Hide new MUC room storage format behind an off-by-default option
Kim Alvefur [Fri, 8 Jul 2016 20:01:10 +0000 (22:01 +0200)]
Merge 0.10->trunk
Kim Alvefur [Fri, 8 Jul 2016 17:20:49 +0000 (19:20 +0200)]
luacheckrc: Ignore assert helper functions used in tests/*
Anton Shestakov [Fri, 8 Jul 2016 16:58:16 +0000 (00:58 +0800)]
net.adns: remove unused local variables t_insert and t_remove [luacheck]
Anton Shestakov [Fri, 8 Jul 2016 16:57:17 +0000 (00:57 +0800)]
mod_admin_telnet: remove unused import (util.serialization) [luacheck]
Anton Shestakov [Fri, 8 Jul 2016 16:56:32 +0000 (00:56 +0800)]
test_util_jid: make function test() local [luacheck]
Anton Shestakov [Fri, 8 Jul 2016 16:53:46 +0000 (00:53 +0800)]
test_util_multitable: make mt variable local [luacheck]
Anton Shestakov [Fri, 8 Jul 2016 16:47:55 +0000 (00:47 +0800)]
mod_admin_telnet: rename variable to make it defined (room -> room_name)
Anton Shestakov [Fri, 8 Jul 2016 16:46:28 +0000 (00:46 +0800)]
mod_presence: remove unused one-letter loop variable [luacheck]
Anton Shestakov [Fri, 8 Jul 2016 16:45:59 +0000 (00:45 +0800)]
net.dns: remove unused one-letter loop variables [luacheck]
Anton Shestakov [Fri, 8 Jul 2016 16:37:34 +0000 (00:37 +0800)]
net.server_select: remove unused one-letter loop variables [luacheck]
Kim Alvefur [Fri, 8 Jul 2016 13:12:44 +0000 (15:12 +0200)]
Merge 0.10->trunk
Matthew Wild [Thu, 7 Jul 2016 22:12:25 +0000 (23:12 +0100)]
Merge 0.10->trunk
Matthew Wild [Thu, 7 Jul 2016 22:08:47 +0000 (23:08 +0100)]
net.http: Add log messages for requests, including their id (so "calling callback" and tracebacks can be traced back to their initial request)
Matthew Wild [Thu, 7 Jul 2016 22:07:19 +0000 (23:07 +0100)]
net.http: Add request.id to every request object (can be overridden by providing ex.id)
Kim Alvefur [Thu, 7 Jul 2016 16:48:58 +0000 (18:48 +0200)]
mod_c2s, mod_s2s: Bootstrap connection count statistic on module load
Matthew Wild [Tue, 28 Jun 2016 13:54:43 +0000 (14:54 +0100)]
Merge 0.10->trunk
Matthew Wild [Tue, 28 Jun 2016 13:49:44 +0000 (14:49 +0100)]
util.time: New tiny library to abstract LuaSocket's gettime() function, so we can use other sources in the future
Kim Alvefur [Fri, 24 Jun 2016 13:11:06 +0000 (15:11 +0200)]
Merge 0.9->0.10
Kim Alvefur [Thu, 23 Jun 2016 19:08:51 +0000 (21:08 +0200)]
util.openssl: Handle return value from os.execute being true in Lua 5.2
Kim Alvefur [Thu, 23 Jun 2016 19:07:48 +0000 (21:07 +0200)]
util.prosodyctl: Handle os.execute in Lua 5.2 returning true when command terminates successfully
Kim Alvefur [Wed, 22 Jun 2016 20:22:29 +0000 (22:22 +0200)]
mod_privacy: Fix selecting the top resource (fixes #694)
Kim Alvefur [Sun, 12 Jun 2016 18:06:30 +0000 (20:06 +0200)]
Merge 0.10->trunk
Kim Alvefur [Sun, 12 Jun 2016 17:55:46 +0000 (19:55 +0200)]
prosodyctl: Warn if encryption is required but mod_tls is not enabled (see #617)
Kim Alvefur [Fri, 10 Jun 2016 12:55:05 +0000 (14:55 +0200)]
mod_pep: Use correct field for full JID (thanks Milan*)
Kim Alvefur [Thu, 9 Jun 2016 12:04:50 +0000 (14:04 +0200)]
s2smanager: Include a stub thread on destroyed sessions (thanks Link Mauve)
Kim Alvefur [Thu, 9 Jun 2016 08:30:33 +0000 (10:30 +0200)]
mod_pep: Include the bare user jid in event
Kim Alvefur [Mon, 30 May 2016 11:36:43 +0000 (13:36 +0200)]
mod_s2s: Add util.async support
Kim Alvefur [Mon, 30 May 2016 11:30:53 +0000 (13:30 +0200)]
Merge 0.10->trunk
Kim Alvefur [Mon, 30 May 2016 11:30:32 +0000 (13:30 +0200)]
mod_s2s: Remove compat with namespace issue from Prosody pre-0.6.2
Kim Alvefur [Mon, 30 May 2016 11:29:43 +0000 (13:29 +0200)]
core.stanza_router: Remove compatibility with Jabiru not including id attribute (originally added in
9b352c8a32e6)
Kim Alvefur [Mon, 30 May 2016 11:17:28 +0000 (13:17 +0200)]
Merge 0.10->trunk
Kim Alvefur [Sun, 29 May 2016 13:57:03 +0000 (15:57 +0200)]
util.dataforms: Fix including default value for list-single when given as field.value[].default
Kim Alvefur [Sat, 28 May 2016 11:10:40 +0000 (13:10 +0200)]
prosodyctl: Fix typo (thanks av6)
Kim Alvefur [Sat, 28 May 2016 10:51:12 +0000 (12:51 +0200)]
Merge 0.10->trunk
Kim Alvefur [Sat, 28 May 2016 10:37:51 +0000 (12:37 +0200)]
MUC: Allow members (or above) in members-only non-anonymous rooms to see the member list (fixes #445)
Kim Alvefur [Fri, 27 May 2016 13:44:41 +0000 (15:44 +0200)]
util.dataforms: Allow separation of options from values in list fields
Kim Alvefur [Wed, 25 May 2016 19:35:09 +0000 (21:35 +0200)]
Merge 0.10->trunk
Kim Alvefur [Wed, 25 May 2016 19:34:34 +0000 (21:34 +0200)]
util.pposix: Ask for shared file descriptor table using rfork() on *BSD (fixes #412)
Kim Alvefur [Wed, 25 May 2016 14:54:43 +0000 (16:54 +0200)]
util.crand: Silence compiler warning
Matthew Wild [Sun, 22 May 2016 19:07:20 +0000 (20:07 +0100)]
Merge 0.10->trunk
Matthew Wild [Sun, 22 May 2016 19:06:51 +0000 (20:06 +0100)]
tests: Add initial tests for util.async
Matthew Wild [Sun, 22 May 2016 19:06:12 +0000 (20:06 +0100)]
util.async: Add some more comments for clarity
Matthew Wild [Sun, 22 May 2016 17:18:23 +0000 (18:18 +0100)]
util.cache: Add support for creating a proxy table to a cache, that looks and acts (mostly) like a normal table. No tests yet.
Kim Alvefur [Sun, 22 May 2016 12:39:20 +0000 (14:39 +0200)]
Merge 0.10->trunk
Kim Alvefur [Sun, 22 May 2016 12:39:14 +0000 (14:39 +0200)]
Merge 0.9->0.10
Kim Alvefur [Sun, 22 May 2016 12:38:07 +0000 (14:38 +0200)]
util.datamanager: Import tostring and type (fix global access)
Kim Alvefur [Sun, 22 May 2016 12:37:52 +0000 (14:37 +0200)]
util.sql: Import type too (fix global access)
Matthew Wild [Sun, 22 May 2016 01:16:57 +0000 (02:16 +0100)]
Merge 0.10->trunk
Matthew Wild [Sun, 22 May 2016 01:16:11 +0000 (02:16 +0100)]
util.sql: Import pcall (fixes #677)
Kim Alvefur [Sat, 21 May 2016 17:10:03 +0000 (19:10 +0200)]
mod_presence: Re-probe for contacts presence after outgoing 'subscribed' (fixes #673)
Kim Alvefur [Sun, 15 May 2016 14:55:19 +0000 (16:55 +0200)]
MUC: Send participant list and subject on explicit joins (thanks daurnimator)
Kim Alvefur [Sat, 14 May 2016 20:36:37 +0000 (22:36 +0200)]
Backed out changeset
63141a85beea, broke multi-session nicks
Matthew Wild [Thu, 12 May 2016 17:45:59 +0000 (18:45 +0100)]
Merge 0.10->trunk
Matthew Wild [Thu, 12 May 2016 17:45:30 +0000 (18:45 +0100)]
util.events: Fix comparison of event_name with nil instead of false (fixes #554)
Kim Alvefur [Sat, 7 May 2016 15:22:58 +0000 (17:22 +0200)]
MUC: Treat explicit join presence as join
Kim Alvefur [Wed, 4 May 2016 14:58:25 +0000 (16:58 +0200)]
Merge 0.10->trunk
Kim Alvefur [Wed, 4 May 2016 13:31:32 +0000 (15:31 +0200)]
portmanager: Set default read size back to 4K
Kim Alvefur [Wed, 4 May 2016 13:29:11 +0000 (15:29 +0200)]
net.server_event: Schedule another read callback if there is still data left in buffer after reading (fixes #583 for real)
Kim Alvefur [Wed, 4 May 2016 13:20:33 +0000 (15:20 +0200)]
net.server_event: Collect entire one line function on one line
Kim Alvefur [Wed, 4 May 2016 10:14:15 +0000 (12:14 +0200)]
MUC: Move status text out of <x> element (thanks Tobias)
Kim Alvefur [Wed, 4 May 2016 09:08:51 +0000 (11:08 +0200)]
MUC: Lower priority of hook so plugins hooks run before
Kim Alvefur [Sat, 30 Apr 2016 15:25:06 +0000 (17:25 +0200)]
MUC: Restore last message from state, not room config (missing change from
cbb05b454c13)
Kim Alvefur [Fri, 29 Apr 2016 15:04:05 +0000 (17:04 +0200)]
MUC: Separate config from live state
Kim Alvefur [Fri, 29 Apr 2016 14:54:45 +0000 (16:54 +0200)]
MUC: Separate force-save parameter from save-entire-state flag
Kim Alvefur [Fri, 29 Apr 2016 12:01:01 +0000 (14:01 +0200)]
MUC: Stricter validation of deserialized data
Kim Alvefur [Thu, 28 Apr 2016 21:34:19 +0000 (23:34 +0200)]
MUC: Include the very last message in serialized form to keep it across eviction and restore
Kim Alvefur [Thu, 28 Apr 2016 20:57:53 +0000 (22:57 +0200)]
MUC: Add event for when room is done being created
Kim Alvefur [Thu, 28 Apr 2016 20:57:02 +0000 (22:57 +0200)]
MUC: Split out handling of the room-creating presence into its own method
Kim Alvefur [Thu, 28 Apr 2016 20:53:22 +0000 (22:53 +0200)]
MUC: Split out handling of normal (un)available presence into its own method
Kim Alvefur [Thu, 28 Apr 2016 21:20:41 +0000 (23:20 +0200)]
MUC: Use a timestamp to keep track of when to unlock room instead of a timer (so timer does not unlock an evicted room)
Kim Alvefur [Thu, 28 Apr 2016 21:14:09 +0000 (23:14 +0200)]
MUC: Move the locked flag into persisted data (so not to lose it on eviction)
Kim Alvefur [Thu, 28 Apr 2016 20:03:00 +0000 (22:03 +0200)]
MUC: Log cases of possible room resynchronisation
Kim Alvefur [Wed, 27 Apr 2016 16:55:49 +0000 (18:55 +0200)]
MUC: Be more careful with deserialization of rooms, fix case where a bare jid has joined as multiple participants
Kim Alvefur [Wed, 27 Apr 2016 10:05:51 +0000 (12:05 +0200)]
MUC: Use correct room name variable, fixes traceback (thanks mathieui)
Kim Alvefur [Tue, 26 Apr 2016 11:40:03 +0000 (13:40 +0200)]
MUC: Correctly iterate over suspended rooms while excluding live rooms
Kim Alvefur [Wed, 20 Apr 2016 10:29:31 +0000 (12:29 +0200)]
MUC: Don't force-save rooms where not needed
Kim Alvefur [Tue, 19 Apr 2016 18:31:39 +0000 (20:31 +0200)]
MUC: Assign priorities to config form hooks so they have a consistent order on each start
Kim Alvefur [Tue, 19 Apr 2016 17:00:46 +0000 (19:00 +0200)]
Merge 0.10->trunk
Kim Alvefur [Tue, 19 Apr 2016 17:00:19 +0000 (19:00 +0200)]
Merge 0.9->0.10
Kim Alvefur [Tue, 19 Apr 2016 16:58:30 +0000 (18:58 +0200)]
net.server_event: Check the buffer *length*, not the buffer itself (Fixes 100% cpu usage introduced in
65abd9d7bf88)
Kim Alvefur [Tue, 19 Apr 2016 16:46:07 +0000 (18:46 +0200)]
MUC: Fix logic for when to broadcast unavailable presence (actual fix for
14170d161b39)
Kim Alvefur [Tue, 19 Apr 2016 16:43:15 +0000 (18:43 +0200)]
MUC: Return item-not-found as error when attempting to change role of non-existant occupant
Kim Alvefur [Tue, 19 Apr 2016 16:23:44 +0000 (18:23 +0200)]
Merge 0.10->trunk
Kim Alvefur [Tue, 19 Apr 2016 16:23:02 +0000 (18:23 +0200)]
Merge 0.9->0.10
Kim Alvefur [Tue, 19 Apr 2016 16:20:39 +0000 (18:20 +0200)]
net.server_event: Return the correct value as timeout
Kim Alvefur [Tue, 19 Apr 2016 16:18:57 +0000 (18:18 +0200)]
net.server_event: Fix traceback if event re-added during starttls
Kim Alvefur [Tue, 19 Apr 2016 16:00:04 +0000 (18:00 +0200)]
mod_bosh: Add annotations to ignore unused arguments [luacheck]
Kim Alvefur [Tue, 19 Apr 2016 15:59:49 +0000 (17:59 +0200)]
mod_bosh: Remove unused imports (also mistake in merge)
Kim Alvefur [Tue, 19 Apr 2016 15:59:22 +0000 (17:59 +0200)]
mod_bosh: Fix imports that got lost in merge
Kim Alvefur [Tue, 19 Apr 2016 15:44:11 +0000 (17:44 +0200)]
Merge 0.10->trunk
Kim Alvefur [Tue, 19 Apr 2016 15:44:04 +0000 (17:44 +0200)]
mod_bosh: Don't decrement rid twice (thanks av6)
Kim Alvefur [Tue, 19 Apr 2016 15:32:22 +0000 (17:32 +0200)]
Merge 0.10->trunk
Kim Alvefur [Tue, 19 Apr 2016 15:30:30 +0000 (17:30 +0200)]
Merge 0.9->0.10
Kim Alvefur [Tue, 19 Apr 2016 15:24:00 +0000 (17:24 +0200)]
net.server_event: Re-add write event if writebuffer is non-empty after write (eg due to writes from ondrain callback) (fixes #661)
Kim Alvefur [Tue, 19 Apr 2016 15:20:39 +0000 (17:20 +0200)]
MUC: Accept missing form as "instant room" request (fixes #377)
Kim Alvefur [Tue, 19 Apr 2016 15:10:42 +0000 (17:10 +0200)]
Merge 0.10->trunk
Kim Alvefur [Tue, 19 Apr 2016 10:33:58 +0000 (12:33 +0200)]
mod_bosh: Reject fractional 'wait' (See #343)
Kim Alvefur [Tue, 19 Apr 2016 10:19:15 +0000 (12:19 +0200)]
mod_bosh: Return a proper BOSH error response from XML parse error callback (see #343)
Kim Alvefur [Tue, 19 Apr 2016 10:18:19 +0000 (12:18 +0200)]
mod_bosh: Validate that 'sid' and 'wait' have sane values (fixes #475, also see #343)