Kim Alvefur [Sun, 26 Apr 2015 22:03:14 +0000 (00:03 +0200)]
Merge 0.10->trunk
Kim Alvefur [Sun, 26 Apr 2015 21:25:47 +0000 (23:25 +0200)]
configure: Set default compiler and linker to cc and ld on *bsd (thanks Tobias)
Kim Alvefur [Sun, 26 Apr 2015 21:23:33 +0000 (23:23 +0200)]
configure: Mention openbsd preset in --help
Kim Alvefur [Sat, 25 Apr 2015 22:07:36 +0000 (00:07 +0200)]
Merge 0.10->trunk
Kim Alvefur [Sat, 25 Apr 2015 22:06:44 +0000 (00:06 +0200)]
Merge 0.9->0.10
Kim Alvefur [Sat, 25 Apr 2015 22:06:11 +0000 (00:06 +0200)]
mod_c2s, mod_s2s: Collect statistics on number of connections
Kim Alvefur [Sat, 25 Apr 2015 12:57:52 +0000 (14:57 +0200)]
mod_blocklist: Some cleanup [luacheck]
Kim Alvefur [Sat, 25 Apr 2015 12:22:59 +0000 (14:22 +0200)]
usermanager: Capitalize log message
Kim Alvefur [Sat, 25 Apr 2015 12:21:40 +0000 (14:21 +0200)]
mod_admin_adhoc: Remove special treatment of the "pending" roster entry
Kim Alvefur [Fri, 24 Apr 2015 12:14:01 +0000 (14:14 +0200)]
net.dns, mod_s2s: Add chasing of CNAMEs to net.dns and remove it from mod_s2s
Kim Alvefur [Sun, 5 Apr 2015 14:47:49 +0000 (16:47 +0200)]
mod_s2s: Catch attempt to close dummy origin of s2s error replies (fixes a top level error)
Kim Alvefur [Sun, 5 Apr 2015 14:24:10 +0000 (16:24 +0200)]
Merge 0.10->trunk
Kim Alvefur [Sun, 5 Apr 2015 14:19:02 +0000 (16:19 +0200)]
rostermanager: Fix roster upgrade code (thanks mva)
Kim Alvefur [Sun, 5 Apr 2015 13:22:33 +0000 (15:22 +0200)]
Merge 0.10->trunk
Florian Zeitz [Fri, 3 Apr 2015 19:42:30 +0000 (21:42 +0200)]
rostermanager: Add missing import of `type()`
Matthew Wild [Fri, 3 Apr 2015 18:34:47 +0000 (19:34 +0100)]
Merge 0.10->trunk
Florian Zeitz [Fri, 3 Apr 2015 18:30:14 +0000 (20:30 +0200)]
util-src/*.c: Per convention call luaL_error() as argument to return
Matthew Wild [Fri, 3 Apr 2015 18:31:05 +0000 (19:31 +0100)]
sessionmanager: Rename parameter to avoid varible name conflict
Matthew Wild [Fri, 3 Apr 2015 18:22:55 +0000 (19:22 +0100)]
hostmanager: Rename variable to avoid shadowing 'type()' function
Matthew Wild [Fri, 3 Apr 2015 18:20:24 +0000 (19:20 +0100)]
loggingmanager: Improve code structure (removes empty if branch)
Matthew Wild [Fri, 3 Apr 2015 18:13:35 +0000 (19:13 +0100)]
rostermanager: Remove unused parameter
Kim Alvefur [Fri, 3 Apr 2015 17:52:48 +0000 (19:52 +0200)]
util-src/*.c: astyle --indent=tab --brackets=attach --indent-switches --break-blocks --pad-oper --unpad-paren --add-brackets --align-pointer=type --lineend=linux
Kim Alvefur [Fri, 3 Apr 2015 04:39:28 +0000 (06:39 +0200)]
Merge 0.10->trunk
Kim Alvefur [Fri, 3 Apr 2015 04:38:22 +0000 (06:38 +0200)]
rostermanager, mod_roster, mod_presence: Move pending roster items to roster metadata field
Kim Alvefur [Thu, 2 Apr 2015 12:31:41 +0000 (14:31 +0200)]
prosodyctl: Use ssl.loadcertificate instead of ssl.x509.load, as the ssl.x509 export dissapears in
97b1974 or
356e03a
Paul Aurich [Wed, 1 Apr 2015 20:30:31 +0000 (13:30 -0700)]
prosodyctl: Document magic commit ID
Matthew Wild [Tue, 31 Mar 2015 10:59:17 +0000 (11:59 +0100)]
util.table, Makefile: New C module that allows pre-allocation of tables to improve performance and decrease memory fragmentation
Matthew Wild [Fri, 27 Mar 2015 22:24:57 +0000 (22:24 +0000)]
Merge 0.10->trunk
Matthew Wild [Fri, 27 Mar 2015 22:19:44 +0000 (22:19 +0000)]
Merge with merge merge merge
Matthew Wild [Fri, 27 Mar 2015 22:11:58 +0000 (22:11 +0000)]
Merge 0.9->0.10 (third time lucky)
Kim Alvefur [Thu, 26 Mar 2015 23:29:35 +0000 (00:29 +0100)]
Merge 0.10->trunk
Kim Alvefur [Thu, 26 Mar 2015 23:28:16 +0000 (00:28 +0100)]
Merge with merge
Kim Alvefur [Thu, 26 Mar 2015 23:27:29 +0000 (00:27 +0100)]
Merge 0.9->0.10 again
Matthew Wild [Thu, 26 Mar 2015 16:49:03 +0000 (16:49 +0000)]
Merge 0.10->trunk
Matthew Wild [Thu, 26 Mar 2015 16:48:39 +0000 (16:48 +0000)]
Merge 0.9->0.10
Matthew Wild [Tue, 24 Mar 2015 19:12:04 +0000 (19:12 +0000)]
Tagging 0.9.8
Matthew Wild [Tue, 24 Mar 2015 16:03:37 +0000 (16:03 +0000)]
mod_s2s: to/from attributes are required on s2s stream headers. Set them to '' when not available. Fixes #468.
Matthew Wild [Tue, 24 Mar 2015 15:57:46 +0000 (15:57 +0000)]
sessionmanager: Return 'not-allowed' error instead of the non-existent 'already-bound' error when client tries to bind a resource twice on the same stream (thanks Flow) fixes issue #484.
Matthew Wild [Tue, 24 Mar 2015 13:41:18 +0000 (13:41 +0000)]
Merge 0.10->trunk
Kim Alvefur [Mon, 23 Mar 2015 17:45:02 +0000 (18:45 +0100)]
mod_http: Return a static string from module:http_url() when no ports are enabled and log a warning
Kim Alvefur [Mon, 23 Mar 2015 17:44:12 +0000 (18:44 +0100)]
mod_http: Log a debug message when adding new http apps and warn if no http ports are enabled
Kim Alvefur [Mon, 23 Mar 2015 17:40:12 +0000 (18:40 +0100)]
Matthew Wild [Mon, 23 Mar 2015 17:23:11 +0000 (17:23 +0000)]
utf8_sequences.txt: Oops
Matthew Wild [Mon, 23 Mar 2015 17:16:54 +0000 (17:16 +0000)]
tests: Add UTF-8 validity tests
Matthew Wild [Mon, 23 Mar 2015 14:05:55 +0000 (14:05 +0000)]
Merge with Zash
Kim Alvefur [Mon, 23 Mar 2015 13:27:30 +0000 (14:27 +0100)]
util.encodings: Expose UTF-8 validation and length checking functions
Kim Alvefur [Mon, 23 Mar 2015 13:26:34 +0000 (14:26 +0100)]
util.encodings: Perform validation of UTF-8 strings before passing to libidn (Based on code from the utf8 library in Lua 5.3)
Matthew Wild [Sat, 14 Mar 2015 22:39:23 +0000 (22:39 +0000)]
mod_http: Log event name when adding a HTTP app's hooks
Matthew Wild [Sat, 14 Mar 2015 22:39:03 +0000 (22:39 +0000)]
net.http.server: Log event name when firing a request event
Matthew Wild [Tue, 24 Feb 2015 15:22:34 +0000 (15:22 +0000)]
Merge 0.10->trunk
Matthew Wild [Tue, 24 Feb 2015 15:22:09 +0000 (15:22 +0000)]
Merge 0.9->0.10
Matthew Wild [Tue, 24 Feb 2015 15:19:20 +0000 (15:19 +0000)]
configure: Fix for commit
cd0088c73daf - update LIBDIR if --prefix is set and --libdir isn't (thanks Medics)
Matthew Wild [Mon, 23 Feb 2015 00:30:01 +0000 (00:30 +0000)]
Merge
Kim Alvefur [Sun, 22 Feb 2015 17:44:48 +0000 (18:44 +0100)]
statsmanager: Perform an initial collection right after startup is completed
Kim Alvefur [Sat, 21 Feb 2015 09:34:56 +0000 (10:34 +0100)]
Merge 0.9->0.10
Matthew Wild [Fri, 20 Feb 2015 22:53:12 +0000 (22:53 +0000)]
mod_admin_telnet: Require util.pposix (fixes #471)
Kim Alvefur [Fri, 20 Feb 2015 18:00:01 +0000 (19:00 +0100)]
util.datamanager: Check that the global 'prosody' exists before using it (fixes nil indexing in use outside of prosody)
Matthew Wild [Fri, 20 Feb 2015 15:51:05 +0000 (15:51 +0000)]
configure, Makefile: Add --libdir option to ./configure, allowing you to override the $PREFIX/lib/ default. Fixes #470.
Kim Alvefur [Sun, 8 Feb 2015 23:48:08 +0000 (00:48 +0100)]
Merge 0.10->trunk
Kim Alvefur [Thu, 5 Feb 2015 16:23:53 +0000 (17:23 +0100)]
certmanager: Fix compat for MattJs old LuaSec fork
Kim Alvefur [Thu, 5 Feb 2015 16:21:05 +0000 (17:21 +0100)]
certmanager: Fix previous commit
Kim Alvefur [Thu, 5 Feb 2015 15:59:34 +0000 (16:59 +0100)]
certmanager: Limit certificate chain depth to 9
Kim Alvefur [Thu, 5 Feb 2015 15:56:28 +0000 (16:56 +0100)]
certmanager: Options that appear to be available since LuaSec 0.2
Kim Alvefur [Thu, 5 Feb 2015 15:20:50 +0000 (16:20 +0100)]
certmanager: Improve "detection" of features that depend on LuaSec version
Kim Alvefur [Thu, 5 Feb 2015 14:14:35 +0000 (15:14 +0100)]
certmanager: Add locals for ssl.context and ssl.x509
Kim Alvefur [Thu, 5 Feb 2015 14:10:23 +0000 (15:10 +0100)]
certmanager: Early return from the entire module if LuaSec is unavailable
Matthew Wild [Sat, 31 Jan 2015 12:25:24 +0000 (12:25 +0000)]
Merge 0.10->trunk
Matthew Wild [Sat, 31 Jan 2015 12:25:00 +0000 (12:25 +0000)]
Merge with 0.10
Kim Alvefur [Fri, 30 Jan 2015 14:38:54 +0000 (15:38 +0100)]
sessionmanager: Add pre-resource-bind event that would let plugins have a say in resource binding
Matthew Wild [Fri, 30 Jan 2015 14:21:51 +0000 (14:21 +0000)]
util.statistics: Return 0 as percentile if data out of range
Kim Alvefur [Mon, 26 Jan 2015 14:27:19 +0000 (15:27 +0100)]
Merge 0.10->trunk
Kim Alvefur [Mon, 26 Jan 2015 14:25:16 +0000 (15:25 +0100)]
Merge 0.9->0.10
Kim Alvefur [Wed, 21 Jan 2015 01:55:27 +0000 (02:55 +0100)]
prosodyctl: Expand plugin paths and attempt to identify prosody-modules checkouts
Kim Alvefur [Wed, 21 Jan 2015 01:55:23 +0000 (02:55 +0100)]
prosodyctl: Use util.mercurial to identify hg repository and revision
Kim Alvefur [Wed, 21 Jan 2015 01:55:18 +0000 (02:55 +0100)]
util.mercurial: Utility functions for Mercurial repositories
Matthew Wild [Wed, 21 Jan 2015 01:29:00 +0000 (01:29 +0000)]
Merge 0.10->trunk
Matthew Wild [Wed, 21 Jan 2015 01:28:12 +0000 (01:28 +0000)]
moduleapi: Module API for statsmanager
Matthew Wild [Wed, 21 Jan 2015 01:26:06 +0000 (01:26 +0000)]
statsmanager, util.statistics: API changes, remove debugging
Matthew Wild [Tue, 20 Jan 2015 12:33:20 +0000 (12:33 +0000)]
statsmanager, prosody: New core module and API for gathering statistics about the running server
Matthew Wild [Tue, 20 Jan 2015 12:31:32 +0000 (12:31 +0000)]
util.statistics: New library for gathering various kinds of statistics
Matthew Wild [Tue, 20 Jan 2015 11:32:14 +0000 (11:32 +0000)]
storagemanager: Remove unused import of error()
Matthew Wild [Tue, 20 Jan 2015 11:31:58 +0000 (11:31 +0000)]
sessionmanager: Access bare_session and full_sessions through 'prosody'
Matthew Wild [Tue, 20 Jan 2015 11:31:30 +0000 (11:31 +0000)]
rostermanager: Access bare_sessions through prosody.bare_sessions
Matthew Wild [Tue, 20 Jan 2015 11:31:04 +0000 (11:31 +0000)]
portmanager: Remove unused import of pairs()
Matthew Wild [Tue, 20 Jan 2015 11:30:07 +0000 (11:30 +0000)]
hostmanager: Remove unused import of util.uuid
Matthew Wild [Tue, 20 Jan 2015 11:29:38 +0000 (11:29 +0000)]
certmanager: Make global variable access explicit
daurnimator [Mon, 19 Jan 2015 19:09:13 +0000 (14:09 -0500)]
net.server_select: Remove unused code
daurnimator [Mon, 19 Jan 2015 19:05:37 +0000 (14:05 -0500)]
net.server_select: Remove socket.sleep call from main loop
It's been there since the start; but should really not be required.
People can remember an issue with FreeBSD that this solved, but this was a hack solution anyway.
If that issue rears it's head again, we will solve it properly.
daurnimator [Mon, 19 Jan 2015 19:01:11 +0000 (14:01 -0500)]
net.server_select: Remove do-nothing os_difftime calls
Kim Alvefur [Fri, 16 Jan 2015 13:02:14 +0000 (14:02 +0100)]
mod_carbons: Import XEP-0280 implementation from prosody-modules (sans compat with older versions of the protocol)
daurnimator [Thu, 15 Jan 2015 14:05:08 +0000 (09:05 -0500)]
net.server_select: In add_task timer callback, use passed in time rather than re-fetching
daurnimator [Thu, 15 Jan 2015 14:03:00 +0000 (09:03 -0500)]
net.server_select: Fix timers not being fired until another timer fixes (or 1 second passes)
daurnimator [Fri, 16 Jan 2015 17:06:42 +0000 (12:06 -0500)]
net.cqueues: Fix incorrect version check
daurnimator [Tue, 13 Jan 2015 23:36:00 +0000 (18:36 -0500)]
net.cqueues: Fixes hardcoded timeout for first iteration
This was originally put in place as a fix for what ended up a cqueues bug: https://github.com/wahern/cqueues/issues/40
A check for a cqueues version with the bug fix is included.
Kim Alvefur [Mon, 12 Jan 2015 14:10:37 +0000 (15:10 +0100)]
util.hex: Pedantic optimization, 1 table lookup per byte instead of 3 function calls makes it go faster
daurnimator [Wed, 7 Jan 2015 01:01:59 +0000 (20:01 -0500)]
net.cqueues: Add workaround for luaevent callback getting collected
Matthew Wild [Tue, 6 Jan 2015 19:33:25 +0000 (19:33 +0000)]
mod_muc: Add muc-add-history event to allow modules to override default history storage
Kim Alvefur [Tue, 6 Jan 2015 16:39:47 +0000 (17:39 +0100)]
stanza_router: Fix routing of 'error' IQs with multiple childs (thanks Pawel)
Kim Alvefur [Sat, 20 Dec 2014 20:34:59 +0000 (21:34 +0100)]
mod_pep: Fire an event when an item is published
Waqas Hussain [Tue, 16 Dec 2014 23:33:54 +0000 (18:33 -0500)]
Merge 0.10 -> trunk