net.server_select: Remove extraneous variable

sessionmanager: Clean up some unused variables and imports

net.server_select: Never call ondisconnect() directly, go via handler:close() or handler:force_close() - fixes cases where ondisconnect() could be called multiple times for the same connection, leading to issues with s2sout retry logic.

Merge with Maranda

mod_admin_telnet: add s2s:closeall command and relative help entry.

Merge with Zash

Merge Zash with Zash for Zash

adhoc.lib: Make some globals local

mod_admin_telnet: Add info about user management commands to the help

mod_admin_telnet: Add some user management commands.

net.http: Use base64 from util.encodings instead of luasocket

mod_admin_telnet: Replace anonymous function with loop (saves a closure)

Merge 0.9->trunk

mod_s2s: Don't call ondisconnect manually, don't call conn:close() 3 times (!) and merge its logic and streamdisconnected into session_close - including now waiting for a reply </stream:stream> if there is the chance of further stanzas requiring delivery arriving. session.sends2s() on a half-closed stream returns false.

mod_s2s: Don't treat a stanza as delivered if session.sends2s() returns false

mod_presence: Handle nil disconnection error

mod_iq: Don't treat an iq as handled if session.send() returns false

mod_message: Don't treat a message as delivered ok if session.send() returns false

mod_c2s: Don't call ondisconnect manually on close, it is now called by net.server. Replace with inline code for destroying the session, and also waiting for a reply </stream:stream> if there is a chance of further data sent by the client. session.send() on a half-closed stream returns false (and does not deliver the data).

net.http: Don't call ondisconnect manually, net.server now calls it on close

net.server_select, net.server_event: Change semantics of conn:close() - always call ondisconnect (with err == nil), and never close with data in send buffer (i.e. 'now' parameter removed)

sessionmanager: Have session.send() of a retired session return false to indicate failure

mod_s2s: Make unauthed session timeout a little more aggressive... otherwise it's possible for sessions to slip under the net and never get killed off

mod_s2s/s2sout.lib: Fix indentation

Merge 0.9->trunk

mod_s2s/s2sout.lib: Don't wait for both v4 and v6 DNS responses if we only send one (e.g. because v6 is disabled)

Merge 0.9->trunk

mod_admin_adhoc: Remove unused variable and save a bit of CPU...

moduleapi: Remove unused import of util.multitable

Merge 0.9->trunk

util.throttle: floor() internal balance calculation

Merge 0.9->trunk

util.pposix: Add comments to mallinfo fields we use, so I don't forget tomorrow what they mean

Merge 0.9->trunk

Merge with backout

Backed out changeset 72a2eec4204a (incomplete fix)

util.pposix: Add meminfo() binding to memory allocation stats provided by mallinfo() [compilation tested on Ubuntu...]

Merge 0.9->trunk

mod_auth_anonymous: Attach a fake roster to the session, so the null storage backend can be used

usermanager: Pass session on to auth provider (missing half of commit 0545a574667b) (thanks Zash)

Merge 0.9->trunk

Merge (some of) trunk -> 0.9

Merge 0.9->trunk

mod_saslauth: Pass session to usermanager.get_sasl_handler()

TODO: Add statistics

util.logger: Remove some redundant code

util.stanza: Make stanza:childtags() behave like :get_child()

prosodyctl: Fix typo

util.pposix: Add setenv()

util.sasl: Make registerMechanism a public function

mod_admin_web: Use util.dataforms' own error checking

mod_dialback: Skip an unnecessary nameprep.

s2smanager: Fix a traceback when we close a s2s connection ourselves (thanks for the testing Zash).

Merge 0.9->trunk

util.dataforms: Fix parsing of -multi fields

Merge with trunk

mod_adhoc, mod_admin_adhoc, mod_announce: Use module:provides() to manage Ad-Hoc commands

certmanager: Add quotes around cert file path when logging.

MUC: Handle missing persistent room data.

mod_s2s: Remove check for socket.tcp6()