mod_tls: Fixed an extra :up() in s2s stream feature generation.

Merge with trunk.

mod_tls: Remove origin type check when TLS is requested (thanks MattJ).

mod_tls: Respond with proper error when TLS cannot be negotiated.

mod_tls: Inlined some code.

net.server_event: Fixes for traceback with no LuaSec

net.server_select: Small indentation fix

net.server_select: Fix traceback with no LuaSec available (thanks Nolan)

mod_tls: Merged duplicate code.

mod_tls: Switched to new events API.

mod_tls: Slight refactoring.

mod_presence: Don't depend on user being online when calculating top resources.

mod_presence: Don't depend on sessions array existing for a user when handling outgoing presence broadcast.

sessionmanager: Fire resource-unbind event after removing session from sessions table

mod_privacy: Remove use of to identify unspecified privacy list

mod_privacy: Fix potential traceback in stanza validation, and fix some zero-based indexing :)

mod_privacy: Don't store the privacy lists as an array, but as a map... faster and less code

prosody, prosodyctl: Re-jiggle load order again, fixes logging config not being obeyed (thanks darkrain)

loggingmanager: Trailing whitespace

modulemanager: Load plugin libraries in the same environment as the plugins.

modulemanager: Make the plugin environment available directly (module.environment within plugins).

util.datamanager: Added support for hooks to override behavior.

net.server_select: Only allow starttls if luasec is available (thanks Nolan)

net.server_select: *Major* whitespace refactoring to meet Prosody's coding style guidelines, we now have tabs

sessionmanager: Whitespace fix

mod_privacy: Rename from_user/to_user flags to is_from_user/is_to_user for clarity

net.dns, net.adns: Changed dns:socket_wrapper_set to dns.socket_wrapper_set for consistency.

util.sasl_cyrus: Add text message from cyrussasl to <not-authorized/> errors.

mod_tls: Don't advertise TLS after authentication.

net.dns: Fixed whitespace/indentation.

net.dns: Removed unused function.

net.dns: Removed some useless indirection to improve readability.

util.encodings: Use STD3 ASCII rules for idna.to_ascii.

net.httpserver: Make request.conn be the server.lua conn instead of the underlying socket (more useful this way)

net.httpserver: Trailing whitespace

Merge with backout

util.sasl.digest-md5: Revert changeset 6094a4e2b6f3 as it breaks some clients, re-visit some time down the line

prosody: Add a catch-all friendly message for when any port is in use we want to use

prosodyctl: Initialize logging before checking dependencies

prosody: Initialize logging before checking dependencies (fixes another traceback with no LuaSec)

certmanager: Fix traceback with no LuaSec

certmanager: Tabs not spaces!

util.dependencies: Don't query the config (it isn't really necessary)

net.server_event: Update for compatibility with new server API

net.xmppserver_listener: status -> onstatus for consistency

net.server_select: listener.status -> listener.onstatus for consistency

net.adns: Use different flavour of voodoo to make UDP sockets work smoothly with libevent (no packet merging)

util.stanza: stanza.error_reply(): Fix to put the correct namespace on <text>

net.adns: Trailing whitespace

hostmanager: Use certmanager for obtaining SSL contexts

certmanager: Hello world, I'm come to manage your SSL contexts

prosody: Show friendly error when no config present for legacy SSL ports

configmanager: Trailing whitespace

net.connlisteners: Return an error if no SSL context is supplied for a connection of type 'ssl'

prosody: Log error message when failing to open ports

net.server_select: Report whether a new listener uses SSL or not in the log message

prosody: Only set the ssl_ctx for 'ssl' connections

net.connlisteners: Remove redundant variable declaration

net.connlisteners: Update for new server API, type == 'tls' now means little - all connections support TLS

s2smanager: Update for new server SSL API (don't pass a sslctx)

(0) -1000 -300 -100 -60 +60 +100 +300 +1000 tip

mercurial