prosody.git
8 years agoMerge 0.10->trunk
Matthew Wild [Thu, 3 Dec 2015 16:13:33 +0000 (16:13 +0000)]
Merge 0.10->trunk

8 years agoMerge 0.10->trunk
Matthew Wild [Thu, 3 Dec 2015 16:13:12 +0000 (16:13 +0000)]
Merge 0.10->trunk

8 years agonet.http.server: Import util.cache
Matthew Wild [Thu, 3 Dec 2015 16:12:44 +0000 (16:12 +0000)]
net.http.server: Import util.cache

8 years agoMerge...
Kim Alvefur [Thu, 3 Dec 2015 15:46:24 +0000 (16:46 +0100)]
Merge...

8 years agomod_storage_sql2: Remove from trunk (all trunk-only changes backported)
Matthew Wild [Thu, 3 Dec 2015 15:43:29 +0000 (15:43 +0000)]
mod_storage_sql2: Remove from trunk (all trunk-only changes backported)

8 years agoMerge 0.10->trunk
Matthew Wild [Thu, 3 Dec 2015 15:43:02 +0000 (15:43 +0000)]
Merge 0.10->trunk

8 years agoMerge
Kim Alvefur [Thu, 3 Dec 2015 15:17:40 +0000 (16:17 +0100)]
Merge

8 years agoprosodyctl check: Point out that authentication and storage modules should not be...
Kim Alvefur [Thu, 3 Dec 2015 15:17:19 +0000 (16:17 +0100)]
prosodyctl check: Point out that authentication and storage modules should not be added to modules_enabled (fixes #570)

8 years agoprosodyctl check: Point out items in the modules_enabled list that incorrectly includ...
Kim Alvefur [Thu, 3 Dec 2015 15:15:59 +0000 (16:15 +0100)]
prosodyctl check: Point out items in the modules_enabled list that incorrectly include the 'mod_' prefix

8 years agoprosodyctl check: Really store imported LuaSec (must be a leftover from debugging)
Kim Alvefur [Thu, 3 Dec 2015 15:06:09 +0000 (16:06 +0100)]
prosodyctl check: Really store imported LuaSec (must be a leftover from debugging)

8 years agomod_storage_sql: Add map store (backported from trunk)
Matthew Wild [Thu, 3 Dec 2015 15:03:24 +0000 (15:03 +0000)]
mod_storage_sql: Add map store (backported from trunk)

8 years agomod_storage_sql: Whitespace fix (backported from trunk)
Matthew Wild [Thu, 3 Dec 2015 15:02:50 +0000 (15:02 +0000)]
mod_storage_sql: Whitespace fix (backported from trunk)

8 years agoMerge 0.10->trunk
Matthew Wild [Thu, 3 Dec 2015 14:59:55 +0000 (14:59 +0000)]
Merge 0.10->trunk

8 years agostoragemanager, mod_storage_sql, mod_storage_sql2: Rename mod_storage_sql2 -> mod_sto...
Matthew Wild [Thu, 3 Dec 2015 14:57:49 +0000 (14:57 +0000)]
storagemanager, mod_storage_sql, mod_storage_sql2: Rename mod_storage_sql2 -> mod_storage_sql, mod_storage_sql -> mod_storage_sql1 (temporarily), and emit warning for configs using sql2

8 years agonet.http.server: Use new util.cache to remember wildcard event handlers
Matthew Wild [Thu, 3 Dec 2015 14:54:29 +0000 (14:54 +0000)]
net.http.server: Use new util.cache to remember wildcard event handlers

8 years agoprosodyctl check: Include global options when checking "all options"
Kim Alvefur [Thu, 3 Dec 2015 14:51:22 +0000 (15:51 +0100)]
prosodyctl check: Include global options when checking "all options"

8 years agostoragemanager: Split config retrieval into its own function
Matthew Wild [Thu, 3 Dec 2015 14:47:47 +0000 (14:47 +0000)]
storagemanager: Split config retrieval into its own function

8 years agomod_proxy65: Use typed config API (fix issues when options are set to unexpected...
Kim Alvefur [Thu, 3 Dec 2015 14:27:09 +0000 (15:27 +0100)]
mod_proxy65: Use typed config API (fix issues when options are set to unexpected types)

8 years agoMerge 0.10->trunk
Matthew Wild [Thu, 26 Nov 2015 00:19:31 +0000 (00:19 +0000)]
Merge 0.10->trunk

8 years agotests: Add tests for util.cache
Matthew Wild [Thu, 26 Nov 2015 00:12:51 +0000 (00:12 +0000)]
tests: Add tests for util.cache

8 years agoutil.cache: Small update to prefix private fields with an underscore, add a :count...
Matthew Wild [Thu, 26 Nov 2015 00:07:48 +0000 (00:07 +0000)]
util.cache: Small update to prefix private fields with an underscore, add a :count() method (same as util.queue) and add an optional on_evict callback

8 years agomod_blocklist: Use util.cache to manage how many users blocklists are kept in memory
Kim Alvefur [Wed, 25 Nov 2015 20:06:01 +0000 (21:06 +0100)]
mod_blocklist: Use util.cache to manage how many users blocklists are kept in memory

8 years agoutil.cache: Make sure cache size is specified as an integer
Kim Alvefur [Wed, 25 Nov 2015 19:49:41 +0000 (20:49 +0100)]
util.cache: Make sure cache size is specified as an integer

8 years agoutil.pposix: Expose the uname GNU extension field 'domainname'
Kim Alvefur [Wed, 25 Nov 2015 19:43:29 +0000 (20:43 +0100)]
util.pposix: Expose the uname GNU extension field 'domainname'

8 years agomod_admin_telnet: Add timer:info() which shows some basic info about util.timer
Kim Alvefur [Wed, 25 Nov 2015 14:34:54 +0000 (15:34 +0100)]
mod_admin_telnet: Add timer:info() which shows some basic info about util.timer

8 years agoutil.session: How would you even send anything to a session?
Kim Alvefur [Tue, 24 Nov 2015 18:31:37 +0000 (19:31 +0100)]
util.session: How would you even send anything to a session?

8 years agoutil.session: How does a session relate do a connection?
Kim Alvefur [Tue, 24 Nov 2015 18:26:27 +0000 (19:26 +0100)]
util.session: How does a session relate do a connection?

8 years agoutil.session: What does the session say?
Kim Alvefur [Tue, 24 Nov 2015 18:04:54 +0000 (19:04 +0100)]
util.session: What does the session say?

8 years agoutil.session: What is the identity of a session?
Kim Alvefur [Tue, 24 Nov 2015 18:09:51 +0000 (19:09 +0100)]
util.session: What is the identity of a session?

8 years agoutil.session: What is a session?
Kim Alvefur [Tue, 24 Nov 2015 18:00:43 +0000 (19:00 +0100)]
util.session: What is a session?

8 years agoMerge
Matthew Wild [Tue, 24 Nov 2015 10:45:48 +0000 (10:45 +0000)]
Merge

8 years agoMerge 0.10->trunk
Matthew Wild [Tue, 24 Nov 2015 10:45:15 +0000 (10:45 +0000)]
Merge 0.10->trunk

8 years agoutil.cache: Ordered key->value data structure, with size limit (same as pubsub)
Matthew Wild [Tue, 24 Nov 2015 10:44:41 +0000 (10:44 +0000)]
util.cache: Ordered key->value data structure, with size limit (same as pubsub)

8 years agoutil.timer: If possible, close the existing timer handle in order to have only one
Kim Alvefur [Sun, 22 Nov 2015 16:25:44 +0000 (17:25 +0100)]
util.timer: If possible, close the existing timer handle in order to have only one

8 years agoutil.timer: Expire timer instance if another instance is already set to take care...
Kim Alvefur [Sun, 22 Nov 2015 16:20:20 +0000 (17:20 +0100)]
util.timer: Expire timer instance if another instance is already set to take care of the next scheduled event

8 years agoutil.timer: Keep count of how many timer instances are active
Kim Alvefur [Sun, 22 Nov 2015 16:18:29 +0000 (17:18 +0100)]
util.timer: Keep count of how many timer instances are active

8 years agonet.server_event: Return event handle from add_task so it can be closed by eg util...
Kim Alvefur [Sun, 22 Nov 2015 16:00:43 +0000 (17:00 +0100)]
net.server_event: Return event handle from add_task so it can be closed by eg util.timer

8 years agoMerge 0.10->trunk
Matthew Wild [Sun, 22 Nov 2015 15:52:10 +0000 (15:52 +0000)]
Merge 0.10->trunk

8 years agomod_admin_telnet: c2s:show(): Add flag to indicate remote sessions
Matthew Wild [Sun, 22 Nov 2015 15:31:22 +0000 (15:31 +0000)]
mod_admin_telnet: c2s:show(): Add flag to indicate remote sessions

8 years agoutil.ip: Improve comparison, == doesn't necessarily handle IPv6 addresses correctly...
Matthew Wild [Sun, 22 Nov 2015 15:30:27 +0000 (15:30 +0000)]
util.ip: Improve comparison, == doesn't necessarily handle IPv6 addresses correctly if they aren't normalized (case, ::, etc.)

8 years agoMerge 0.10->trunk
Matthew Wild [Tue, 17 Nov 2015 17:12:45 +0000 (17:12 +0000)]
Merge 0.10->trunk

8 years agoMerge 0.9->0.10
Matthew Wild [Tue, 17 Nov 2015 17:04:04 +0000 (17:04 +0000)]
Merge 0.9->0.10

8 years agomuc.lib: Fix pattern so that it doesn't match hashes containing null bytes, causing...
Matthew Wild [Tue, 17 Nov 2015 17:01:25 +0000 (17:01 +0000)]
muc.lib: Fix pattern so that it doesn't match hashes containing null bytes, causing dropped stanzas (thanks Jitsi folk!)

8 years agoprosody: Fix sleep call that relied on the no longer existing socket global
Kim Alvefur [Mon, 16 Nov 2015 14:24:36 +0000 (15:24 +0100)]
prosody: Fix sleep call that relied on the no longer existing socket global

8 years agoMerge 0.10->trunk
Kim Alvefur [Mon, 9 Nov 2015 21:56:32 +0000 (22:56 +0100)]
Merge 0.10->trunk

8 years agocert/openssl.cnf: Split CSR and self-signed extensions into separate sections (see...
Kim Alvefur [Mon, 9 Nov 2015 13:16:39 +0000 (14:16 +0100)]
cert/openssl.cnf: Split CSR and self-signed extensions into separate sections (see d2d7ad2563f9)

8 years agomod_tls: Fix ssl option fallback to a "parent" host if current host does not have...
Kim Alvefur [Mon, 9 Nov 2015 12:40:06 +0000 (13:40 +0100)]
mod_tls: Fix ssl option fallback to a "parent" host if current host does not have ssl options set (thanks 70b1)

8 years agomod_tls: Remove unused reference to global ssl config option (certmanager adds that...
Kim Alvefur [Mon, 9 Nov 2015 12:39:23 +0000 (13:39 +0100)]
mod_tls: Remove unused reference to global ssl config option (certmanager adds that to the context)

8 years agomod_s2s/s2sout: Keep SRV lookup response around even if it's empty
Kim Alvefur [Thu, 5 Nov 2015 12:54:35 +0000 (13:54 +0100)]
mod_s2s/s2sout: Keep SRV lookup response around even if it's empty

8 years agosessionmanager: Demote write error to debug message
Kim Alvefur [Thu, 5 Nov 2015 12:35:16 +0000 (13:35 +0100)]
sessionmanager: Demote write error to debug message

8 years agosessionmanager: Clarify log message when failing to write data to connection
Kim Alvefur [Wed, 4 Nov 2015 11:21:46 +0000 (12:21 +0100)]
sessionmanager: Clarify log message when failing to write data to connection

8 years agoprosodyctl: check: Don't complain about c2s_ssl or s2s_ssl being in VirtualHost secti...
Kim Alvefur [Wed, 21 Oct 2015 11:37:26 +0000 (13:37 +0200)]
prosodyctl: check: Don't complain about c2s_ssl or s2s_ssl being in VirtualHost sections, that's supported

8 years agomod_component: Add config option for deciding what happens if a component connects...
Kim Alvefur [Tue, 20 Oct 2015 23:56:07 +0000 (01:56 +0200)]
mod_component: Add config option for deciding what happens if a component connects while already connected (fixes #525)

8 years agoutil.queue: Add luacheck annotations
Matthew Wild [Sun, 18 Oct 2015 20:54:17 +0000 (21:54 +0100)]
util.queue: Add luacheck annotations

8 years agoutil.queue: Add :items() iterator
Matthew Wild [Sun, 18 Oct 2015 20:42:33 +0000 (21:42 +0100)]
util.queue: Add :items() iterator

8 years agostatsmanager: Add get() method
Matthew Wild [Sun, 18 Oct 2015 20:35:21 +0000 (21:35 +0100)]
statsmanager: Add get() method

8 years agoMUC: Reject muc:admin query with missing <item> child
Kim Alvefur [Sun, 18 Oct 2015 12:00:15 +0000 (14:00 +0200)]
MUC: Reject muc:admin query with missing <item> child

8 years agoMerge 0.10->trunk
Kim Alvefur [Sat, 17 Oct 2015 17:31:43 +0000 (19:31 +0200)]
Merge 0.10->trunk

8 years agoMerge 0.9->0.10
Kim Alvefur [Sat, 17 Oct 2015 17:30:58 +0000 (19:30 +0200)]
Merge 0.9->0.10

8 years agoMakefile: Use more specific globbing for core directory in Makefile (Thanks Robert...
Kim Alvefur [Wed, 14 Oct 2015 18:55:26 +0000 (20:55 +0200)]
Makefile: Use more specific globbing for core directory in Makefile (Thanks Robert Scheck) (fixes #532)

8 years agoMerge 0.10->trunk
Kim Alvefur [Sun, 11 Oct 2015 18:03:00 +0000 (20:03 +0200)]
Merge 0.10->trunk

8 years agoMerge 0.9->0.10
Kim Alvefur [Sun, 11 Oct 2015 18:00:15 +0000 (20:00 +0200)]
Merge 0.9->0.10

8 years agocore.certmanager: Remove non-string filenames (allows setting eg capath to false...
Kim Alvefur [Sun, 11 Oct 2015 17:44:15 +0000 (19:44 +0200)]
core.certmanager: Remove non-string filenames (allows setting eg capath to false to disable the built in default)

8 years agoutil.openssl: Separate extension sections into one for self-signed certs and one...
Kim Alvefur [Sun, 11 Oct 2015 16:49:14 +0000 (18:49 +0200)]
util.openssl: Separate extension sections into one for self-signed certs and one for requests

8 years agomod_s2s: Fire global event for stream features where the remote server has not sent...
Kim Alvefur [Sun, 11 Oct 2015 12:03:53 +0000 (14:03 +0200)]
mod_s2s: Fire global event for stream features where the remote server has not sent the 'to' stream attribute

8 years agonet.websocket.frames: Fix syntax error due to code copy pasting
Kim Alvefur [Tue, 6 Oct 2015 16:08:58 +0000 (18:08 +0200)]
net.websocket.frames: Fix syntax error due to code copy pasting

8 years agonet.websocket.frames: Use struct packing in Lua 5.3 or struct lib if available
Kim Alvefur [Tue, 6 Oct 2015 16:05:27 +0000 (18:05 +0200)]
net.websocket.frames: Use struct packing in Lua 5.3 or struct lib if available

8 years agonet.websocket.frames: Pack and unpack 64bit ints without overflows (lua-bitop/bit32...
Kim Alvefur [Tue, 6 Oct 2015 16:03:04 +0000 (18:03 +0200)]
net.websocket.frames: Pack and unpack 64bit ints without overflows (lua-bitop/bit32 are 32bit)

8 years agonet.websocket.frames: Link to documentation when bitop is missing
Kim Alvefur [Tue, 6 Oct 2015 14:49:01 +0000 (16:49 +0200)]
net.websocket.frames: Link to documentation when bitop is missing

8 years agonet.websocket.frames: Throw an error if no bit lib is found
Kim Alvefur [Tue, 6 Oct 2015 14:26:23 +0000 (16:26 +0200)]
net.websocket.frames: Throw an error if no bit lib is found

8 years agonet.websocket.frames: Simplify import of bitlib
Kim Alvefur [Tue, 6 Oct 2015 14:06:22 +0000 (16:06 +0200)]
net.websocket.frames: Simplify import of bitlib

8 years agomod_websocket: Silence luacheck warnings
Kim Alvefur [Tue, 6 Oct 2015 13:30:25 +0000 (15:30 +0200)]
mod_websocket: Silence luacheck warnings

8 years agomod_websocket: Import util.timer and session close timeout config option (thanks...
Kim Alvefur [Tue, 6 Oct 2015 13:27:39 +0000 (15:27 +0200)]
mod_websocket: Import util.timer and session close timeout config option (thanks fairuz)

8 years agoMerge 0.10->trunk
Kim Alvefur [Fri, 2 Oct 2015 10:17:41 +0000 (12:17 +0200)]
Merge 0.10->trunk

8 years agoutil.jid: Fix backout
Kim Alvefur [Fri, 2 Oct 2015 10:16:47 +0000 (12:16 +0200)]
util.jid: Fix backout

8 years agoMerge 0.10->trunk
Kim Alvefur [Fri, 2 Oct 2015 10:13:32 +0000 (12:13 +0200)]
Merge 0.10->trunk

8 years agoBackout 7e820979fd9b (broke tests)
Kim Alvefur [Fri, 2 Oct 2015 10:12:24 +0000 (12:12 +0200)]
Backout 7e820979fd9b (broke tests)

8 years agoMerge 0.10->trunk
Kim Alvefur [Sat, 26 Sep 2015 22:37:18 +0000 (00:37 +0200)]
Merge 0.10->trunk

8 years agoMerge 0.9->0.10
Kim Alvefur [Sat, 26 Sep 2015 22:36:34 +0000 (00:36 +0200)]
Merge 0.9->0.10

8 years agoconfigure,util-src/Makefile: Make a variable that includes -l for OpenSSL (like with...
Kim Alvefur [Sat, 26 Sep 2015 22:28:46 +0000 (00:28 +0200)]
configure,util-src/Makefile: Make a variable that includes -l for OpenSSL (like with IDNA_LIBS)

8 years agoMakefile: Use hypen to tell Make when to ignore errors
Kim Alvefur [Sat, 26 Sep 2015 22:16:34 +0000 (00:16 +0200)]
Makefile: Use hypen to tell Make when to ignore errors

8 years agoMakefile: Support generating prosody.version from hg archive metadata file
Kim Alvefur [Sat, 26 Sep 2015 22:15:57 +0000 (00:15 +0200)]
Makefile: Support generating prosody.version from hg archive metadata file

8 years agoMakefile: Simplify generation of prosody.version using magic Make magic
Kim Alvefur [Sat, 26 Sep 2015 22:14:18 +0000 (00:14 +0200)]
Makefile: Simplify generation of prosody.version using magic Make magic

8 years agoutil-src/Makefile: Remove redundant variables (set in config.unix already)
Kim Alvefur [Sat, 26 Sep 2015 22:12:07 +0000 (00:12 +0200)]
util-src/Makefile: Remove redundant variables (set in config.unix already)

8 years agoutil-src/Makefile: Don't make exceptions for how to build .so for util.hashes and...
Kim Alvefur [Sat, 26 Sep 2015 22:10:18 +0000 (00:10 +0200)]
util-src/Makefile: Don't make exceptions for how to build .so for util.hashes and util.encodings

8 years agoutil-src/Makefile: Tell Make how to build .so from .o in a modern way (Let built...
Kim Alvefur [Sat, 26 Sep 2015 22:08:46 +0000 (00:08 +0200)]
util-src/Makefile: Tell Make how to build .so from .o in a modern way (Let built-in rules handle .o)

8 years agoutil-src/Makefile: Move Lua include path into CFLAGS variable
Kim Alvefur [Sat, 26 Sep 2015 22:04:14 +0000 (00:04 +0200)]
util-src/Makefile: Move Lua include path into CFLAGS variable

8 years agoconfigure, util-src/Makefile: Move OS X deployment flag to an C compiler argument...
Kim Alvefur [Sat, 26 Sep 2015 21:42:46 +0000 (23:42 +0200)]
configure, util-src/Makefile: Move OS X deployment flag to an C compiler argument set by configure

8 years agoutil-src/Makefile: Use variables for install binary and target directory
Kim Alvefur [Sat, 26 Sep 2015 21:38:09 +0000 (23:38 +0200)]
util-src/Makefile: Use variables for install binary and target directory

8 years agoutil-src/Makefile: Move list of .so files in a variable
Kim Alvefur [Sat, 26 Sep 2015 21:29:50 +0000 (23:29 +0200)]
util-src/Makefile: Move list of .so files in a variable

8 years agomod_posix: Detect failure to load util.signal by first pcall return value not by...
Kim Alvefur [Sat, 26 Sep 2015 19:41:11 +0000 (21:41 +0200)]
mod_posix: Detect failure to load util.signal by first pcall return value not by type of the second

8 years agomod_posix: Normalize indentation
Kim Alvefur [Sat, 26 Sep 2015 19:39:26 +0000 (21:39 +0200)]
mod_posix: Normalize indentation

8 years agomod_http_files: Translate forward slashes to local directory separators
Kim Alvefur [Sat, 26 Sep 2015 17:35:56 +0000 (19:35 +0200)]
mod_http_files: Translate forward slashes to local directory separators

8 years agomod_http_files: Strip trailing directory separator regardless of directionality of...
Kim Alvefur [Sat, 26 Sep 2015 17:34:58 +0000 (19:34 +0200)]
mod_http_files: Strip trailing directory separator regardless of directionality of the slash (fixes #545)

8 years agoMerge 0.10->trunk
Kim Alvefur [Fri, 25 Sep 2015 16:11:45 +0000 (18:11 +0200)]
Merge 0.10->trunk

8 years agoMerge 0.9->0.10
Kim Alvefur [Fri, 25 Sep 2015 16:11:24 +0000 (18:11 +0200)]
Merge 0.9->0.10

8 years agoMerge 0.10->trunk
Kim Alvefur [Fri, 25 Sep 2015 16:08:25 +0000 (18:08 +0200)]
Merge 0.10->trunk

8 years agoMerge
Kim Alvefur [Fri, 25 Sep 2015 16:07:33 +0000 (18:07 +0200)]
Merge

8 years agoserver_event: Remove needless scoping around add_task
Kim Alvefur [Fri, 25 Sep 2015 16:07:08 +0000 (18:07 +0200)]
server_event: Remove needless scoping around add_task

8 years agoMerge 0.10->trunk
Kim Alvefur [Fri, 25 Sep 2015 16:03:44 +0000 (18:03 +0200)]
Merge 0.10->trunk