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
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
Kim Alvefur [Sat, 13 Dec 2014 15:40:55 +0000 (16:40 +0100)]
mod_admin_telnet: Use the session-specific print function
Kim Alvefur [Thu, 11 Dec 2014 08:18:39 +0000 (09:18 +0100)]
mod_storage_sql2, util.sql: Set character encoding on every connect
Kim Alvefur [Tue, 9 Dec 2014 18:36:34 +0000 (19:36 +0100)]
mod_blocklist: Fix import
Kim Alvefur [Mon, 8 Dec 2014 14:49:11 +0000 (15:49 +0100)]
mod_http: Log name and base URL of HTTP apps
Kim Alvefur [Mon, 8 Dec 2014 14:48:36 +0000 (15:48 +0100)]
net.http.server: Log names of the events fired
Kim Alvefur [Sun, 7 Dec 2014 16:56:25 +0000 (17:56 +0100)]
mod_bosh: Use util.async
Kim Alvefur [Sat, 22 Nov 2014 10:53:14 +0000 (11:53 +0100)]
Merge 0.10->trunk
Kim Alvefur [Sat, 22 Nov 2014 10:51:54 +0000 (11:51 +0100)]
certmanager, mod_tls: Return final ssl config as third return value (fix for
c6caaa440e74, portmanager assumes non-falsy second return value is an error) (thanks deoren)
Kim Alvefur [Thu, 20 Nov 2014 14:01:47 +0000 (15:01 +0100)]
Merge 0.10->trunk
Kim Alvefur [Thu, 20 Nov 2014 14:00:52 +0000 (15:00 +0100)]
Merge 0.9->0.10
Matthew Wild [Thu, 20 Nov 2014 09:02:23 +0000 (09:02 +0000)]
Merge 0.10->trunk
Philipp Hancke [Thu, 20 Nov 2014 09:01:45 +0000 (09:01 +0000)]
mod_pubsub: Add support for including the publisher in item broadcasts
Kim Alvefur [Wed, 19 Nov 2014 13:47:49 +0000 (14:47 +0100)]
mod_tls: Keep ssl config around and attach them to sessions
Kim Alvefur [Wed, 19 Nov 2014 13:47:03 +0000 (14:47 +0100)]
certmanager: Return final ssl config along with ssl context on success
Kim Alvefur [Wed, 19 Nov 2014 13:45:20 +0000 (14:45 +0100)]
mod_saslauth: Make it easier to support multiple channel binding methonds
Kim Alvefur [Wed, 19 Nov 2014 13:44:41 +0000 (14:44 +0100)]
mod_saslauth: Break out tls-unique channel binding callback so it is instantiated once
Kim Alvefur [Wed, 19 Nov 2014 13:37:45 +0000 (14:37 +0100)]
mod_saslauth: Keep sasl_handler in a local variable
daurnimator [Tue, 18 Nov 2014 19:14:41 +0000 (14:14 -0500)]
net.cqueues: Add module that allows use of cqueues while still using net.server as main loop
Matthew Wild [Tue, 18 Nov 2014 17:40:37 +0000 (17:40 +0000)]
net.http.parser: Fix whitespace/indentation
daurnimator [Fri, 14 Nov 2014 22:37:47 +0000 (17:37 -0500)]
plugins/muc/muc.lib: Allow muc-broadcast-presence event listeners to modify nick, actor, reason
daurnimator [Tue, 11 Nov 2014 18:08:34 +0000 (13:08 -0500)]
plugins/muc/muc.lib: Don't expose actor jids to users when anonymous
* * *
plugins/muc/muc.lib: Allow event listeners to modify actor
daurnimator [Mon, 10 Nov 2014 19:47:33 +0000 (14:47 -0500)]
net.http.parser: Fix chunked encoding parsing across packet boundaries.
Kim Alvefur [Sun, 9 Nov 2014 19:32:33 +0000 (20:32 +0100)]
Merge 0.10->trunk
Kim Alvefur [Sun, 9 Nov 2014 19:30:04 +0000 (20:30 +0100)]
Merge 0.9 -> 0.10
Kim Alvefur [Sat, 8 Nov 2014 11:28:49 +0000 (12:28 +0100)]
util.paths: Add function for joining path segments
Kim Alvefur [Tue, 4 Nov 2014 16:48:17 +0000 (17:48 +0100)]
mod_http: For URLs that end with / or wildcard handlers, add a low-priority redirect from without to with slash
Kim Alvefur [Thu, 30 Oct 2014 11:28:07 +0000 (12:28 +0100)]
net.dns: Try next server if peer name can not be set (thanks wirehack7)
Kim Alvefur [Thu, 30 Oct 2014 11:10:15 +0000 (12:10 +0100)]
net.dns: Return new socket from servfail
Kim Alvefur [Thu, 30 Oct 2014 11:08:05 +0000 (12:08 +0100)]
net.adns: Log peername recorded from wrapped setpeername instead of calling sock:getpeername, it exists and throws an error on unconnected sockets (thanks wirehack7)
Kim Alvefur [Thu, 30 Oct 2014 11:05:24 +0000 (12:05 +0100)]
net.adns: Preserve error from setpeername
Kim Alvefur [Mon, 27 Oct 2014 10:12:08 +0000 (11:12 +0100)]
mod_admin_telnet: Soft-reqire util.pposix for server:memory()
Kim Alvefur [Sun, 26 Oct 2014 19:58:02 +0000 (20:58 +0100)]
Merge 0.10->trunk
Kim Alvefur [Sun, 26 Oct 2014 19:57:06 +0000 (20:57 +0100)]
Merge 0.9->0.10
Kim Alvefur [Sun, 26 Oct 2014 15:29:50 +0000 (16:29 +0100)]
mod_blocklist: Don't send unavailable presence from unavailable sessions when blocking a contact
Kim Alvefur [Sat, 25 Oct 2014 12:45:11 +0000 (14:45 +0200)]
mod_blocklist: Only log message about migrating from mod_privacy when there is data to migrate
Matthew Wild [Fri, 24 Oct 2014 22:23:02 +0000 (23:23 +0100)]
Tagging 0.9.7
Matthew Wild [Fri, 24 Oct 2014 22:20:06 +0000 (23:20 +0100)]
Backout changeset
6e67c73f730c: not a major fix and it breaks interop with at least Isode M-Link, and possibly standards, while it's not clear it actually fixes the original problem either.
daurnimator [Wed, 22 Oct 2014 20:00:40 +0000 (16:00 -0400)]
net/server: Handle lack of util.signal correctly
daurnimator [Wed, 22 Oct 2014 19:59:51 +0000 (15:59 -0400)]
net/server: Remove print
Matthew Wild [Wed, 22 Oct 2014 11:56:41 +0000 (12:56 +0100)]
net.server: Rename 'server' config option to 'network_backend' (to select which net.server implementation to use)
daurnimator [Tue, 21 Oct 2014 21:26:48 +0000 (17:26 -0400)]
net/server: If server.hook_signal exists, overwrite signal.signal; else make server.hook_signal == signal.signal
No longer server_event specific
server.hook_signal will always exist
Kim Alvefur [Tue, 21 Oct 2014 14:41:28 +0000 (16:41 +0200)]
mod_saslauth: Better name for config option
Kim Alvefur [Tue, 21 Oct 2014 12:38:40 +0000 (14:38 +0200)]
mod_saslauth: Make it possible to disable certain mechanisms
Kim Alvefur [Tue, 21 Oct 2014 12:37:05 +0000 (14:37 +0200)]
mod_saslauth: Add LOGIN to mechanisms not allowed over unencrypted connections as it may be offered by 3rd party authentication plugins
Kim Alvefur [Tue, 21 Oct 2014 12:35:32 +0000 (14:35 +0200)]
mod_saslauth: Use a configurable set of mechanisms to not allow over unencrypted connections
Kim Alvefur [Tue, 21 Oct 2014 10:57:56 +0000 (12:57 +0200)]
mod_saslauth: Log warning if no SASL mechanisms were offered
Kim Alvefur [Tue, 21 Oct 2014 10:56:19 +0000 (12:56 +0200)]
mod_saslauth: Use type-specific config option getters
Kim Alvefur [Tue, 21 Oct 2014 10:49:03 +0000 (12:49 +0200)]
mod_legacyauth, mod_saslauth, mod_tls: Pass require_encryption as default option to s2s_require_encryption so the later overrides the former
Kim Alvefur [Tue, 21 Oct 2014 10:47:53 +0000 (12:47 +0200)]
prosodyctl: Add 'require_encryption' to list of deprecated options pointed out by the check command
daurnimator [Mon, 20 Oct 2014 20:13:24 +0000 (16:13 -0400)]
Move timer code out of util.timer and into relevant net.server backends
Waqas Hussain [Sun, 19 Oct 2014 07:05:49 +0000 (03:05 -0400)]
prosodyctl: Fix nil global access traceback in `prosodyctl about` (luarocks 2.2.0 no longer uses module())
daurnimator [Fri, 17 Oct 2014 21:30:21 +0000 (17:30 -0400)]
net/server: Split up different backends in a nicer way. Add global config option 'server'