mod_console: Added support for multiple arguments to print().

storagemanager: Fixed a nil access.

prosody.resolve_relative_path: Updated to take a parent path to resolve against.

storagemanager: Initial commit.

Merge 0.7->trunk

certmanager: Don't disable LuaSec and future cert loading on failure, and add error messages to the no LuaSec/config cases (thanks Jakob)

net.server_select: Remove 'now' parameter from starttls(), and base it on whether the sendbuffer is empty instead

mod_tls: Remove extraneous flag to starttls() for s2sout connecections

net.server_event: Fix to not call onconnect a second time after the SSL handshake for starttls connections (thanks Flo)

usermanager, mod_auth_internal_hashed, mod_legacyauth: New order of parameters for usermanager.test_password - username, host, password

mod_register: Drop useless depencency on datamanager.

MUC: Store the nick (full room JID) which set the subject, and send subject to occupants from that JID.

util.iterators: Add skip() to skip the first n items of an iterator

mod_saslauth: Got rid of undocumented and useless 'sasl_realm' config option (was only used for anonymous auth, and that didn't make sense).

Merge with trunk.

mod_auth_internal_hashed: Fixed SCRAM-SHA-1 mechanism to not traceback on non-existent users.

MUC: No need to call is_admin twice now, global admins are admins on hosts

net.server_event: Remove debug logging from dummy onstatus handler

mod_saslauth: Cleaned up unused requires.

mod_saslauth: A little cleanup for anonymous_login.

configmanager: Remove dependency on eventmanager, and global 'prosody' object

s2smanager: Handle disallow_s2s for incoming streams as well as outgoing

net.server_select: Ensure that onconnect is called for server sockets as well as clients, rather than onincoming. Fixes mod_console traceback, issue #197

Merge Florob->trunk

util.dataforms: Add list-multi support

util.dataforms: Capability to set default for list-single

Merge Zash->trunk

mod_proxy65: Use util.jid.compare() and remove some clutter

Merge Zash->trunk

util.jid: compare() added, with some tests.

util.sasl.scram: Reference actual RFC instead of the draft.

util.sasl, util.sasl_cyrus: s/self.mechanisms()/self:mechanisms()/ in method:select().

Merge with backout

Backed out changeset 598c33a99a31 (already fixed a better way)

certmanager: Fix to handle the case of no SSL configuration at all

certmanager: Added copyright header.

certmanager: Defined default_capath to prevent a global nil access.

certmanager: Use an empty table as the default ssl config when a global 'ssl' config option isn't specified (fixes a top-level traceback on startup).

util.sasl, util.sasl_cyrus: Use method:mechanisms() in method:select(), instead of using the mechanisms list directly (fixes a traceback).

util.sasl, util.sasl_cyrus: Updated method:mechanisms() to cache and re-use list of mechanisms.

util.sasl: Use the proper session-specific table of mechanisms when selecting a mechanism, and not the global table.

SASL: Simplified sasl_handler:mechanisms() to return a set, and not an array.

usermanager: Return a non-nil SASL handler from the null auth provider (fixes a traceback).

MUC: Fixed a traceback introduced in hg:bdc325ce9fbc.

net.dns: Call :cancel() on the current resolver instead of the prototype

util.roster: Initial skeleton commit

loggingmanager: Add reload_logging() method, which gets called on any config reload, to reset util.logger and remove and re-add all sink types to perform a full reload of the logging system without a restart.

util.logger: Add reset() method to clear all sinks

certmanager: Remove debug logging accidentally committed

certmanager: Adjust paths of SSL key/certs to be relative to the config file, fixes #147

prosody: Add prosody.resolve_relative_path() helper to change relative paths to be relative to the config file

mod_httpserver: Serve index.html if a request is made for a directory and it contains one (thanks Brian Cully)

configure: Make it possible to override ostype presets with values specified later on the command-line

configure: Fix ostype=freebsd for ./configure (thanks dersd for reporting and n0nsense for testing the fix!)

mod_saslauth: Rename variable 'aret' to 'ok' as per convention

mod_disco: Reflect requested 'node' attribute in the disco#info reply.

mod_disco: Respond to disco#info to the correct caps hash node ("node#ver").

mod_disco: Cache disco#info reply and caps hash for host, return correct caps hash, and respond to disco#info to the caps hash node.

mod_adhoc: Add capability to pass data to forms

xmpp{client,server}_listener: Convert some calls to tail calls for efficiency

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

mercurial