aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge 0.9->trunkMatthew Wild2012-07-2210-131/+164
|\
| * mod_s2s: Don't call ondisconnect manually, don't call conn:close() 3 times (!...Matthew Wild2012-07-221-19/+29
| * mod_s2s: Don't treat a stanza as delivered if session.sends2s() returns falseMatthew Wild2012-07-221-3/+4
| * mod_presence: Handle nil disconnection errorMatthew Wild2012-07-221-4/+6
| * mod_iq: Don't treat an iq as handled if session.send() returns falseMatthew Wild2012-07-221-4/+1
| * mod_message: Don't treat a message as delivered ok if session.send() returns ...Matthew Wild2012-07-221-5/+6
| * mod_c2s: Don't call ondisconnect manually on close, it is now called by net.s...Matthew Wild2012-07-221-4/+23
| * net.http: Don't call ondisconnect manually, net.server now calls it on closeMatthew Wild2012-07-221-1/+0
| * net.server_select, net.server_event: Change semantics of conn:close() - alway...Matthew Wild2012-07-222-26/+32
| * sessionmanager: Have session.send() of a retired session return false to indi...Matthew Wild2012-07-221-1/+1
| * mod_s2s: Make unauthed session timeout a little more aggressive... otherwise ...Matthew Wild2012-07-221-4/+2
| * mod_s2s/s2sout.lib: Fix indentationMatthew Wild2012-07-221-60/+60
* | Merge 0.9->trunkMatthew Wild2012-07-221-8/+7
|\|
| * mod_s2s/s2sout.lib: Don't wait for both v4 and v6 DNS responses if we only se...Matthew Wild2012-07-221-8/+7
* | Merge 0.9->trunkMatthew Wild2012-07-192-4/+1
|\|
| * mod_admin_adhoc: Remove unused variable and save a bit of CPU...Matthew Wild2012-07-191-1/+0
| * moduleapi: Remove unused import of util.multitableMatthew Wild2012-07-191-3/+1
* | Merge 0.9->trunkMatthew Wild2012-07-091-1/+2
|\|
| * util.throttle: floor() internal balance calculationMatthew Wild2012-07-091-1/+2
* | Merge 0.9->trunkMatthew Wild2012-07-081-0/+6
|\|
| * util.pposix: Add comments to mallinfo fields we use, so I don't forget tomorr...Matthew Wild2012-07-081-0/+6
* | Merge 0.9->trunkMatthew Wild2012-07-083-36/+52
|\ \ | |/ |/|
| * Merge 0.9->trunkMatthew Wild2012-07-072-3/+4
| |\
| * \ Merge 0.9->trunkMatthew Wild2012-07-050-0/+0
| |\ \
| * \ \ Merge 0.9->trunkMatthew Wild2012-07-057-8/+40
| |\ \ \
| * | | | mod_admin_web: Use util.dataforms' own error checkingFlorian Zeitz2012-07-051-34/+50
| * | | | mod_dialback: Skip an unnecessary nameprep.Waqas Hussain2012-06-151-1/+1
| * | | | s2smanager: Fix a traceback when we close a s2s connection ourselves (thanks ...Waqas Hussain2012-06-131-1/+1
* | | | | Merge with backoutMatthew Wild2012-07-081-2/+1
|\ \ \ \ \
| * | | | | Backed out changeset 72a2eec4204a (incomplete fix)Matthew Wild2012-07-081-2/+1
| | |_|_|/ | |/| | |
* / | | | util.pposix: Add meminfo() binding to memory allocation stats provided by mal...Matthew Wild2012-07-081-0/+28
|/ / / /
* | | | mod_auth_anonymous: Attach a fake roster to the session, so the null storage ...Kim Alvefur2012-07-071-1/+2
* | | | usermanager: Pass session on to auth provider (missing half of commit 0545a57...Matthew Wild2012-07-071-2/+2
| |_|/ |/| |
* | | Merge (some of) trunk -> 0.9Matthew Wild2012-07-052-11/+19
|\| | | |/ |/|
| * Merge 0.9->trunkMatthew Wild2012-06-121-5/+5
| |\
| * \ Merge with trunkMatthew Wild2012-06-123-15/+16
| |\ \
| * | | certmanager: Add quotes around cert file path when logging.Waqas Hussain2012-06-121-1/+1
| * | | MUC: Handle missing persistent room data.Waqas Hussain2012-06-121-10/+18
* | | | mod_saslauth: Pass session to usermanager.get_sasl_handler()Matthew Wild2012-07-041-2/+2
* | | | TODO: Add statisticsMatthew Wild2012-07-041-0/+1
* | | | util.logger: Remove some redundant codeMatthew Wild2012-06-251-2/+0
* | | | util.stanza: Make stanza:childtags() behave like :get_child()Kim Alvefur2012-07-051-2/+2
* | | | prosodyctl: Fix typoKim Alvefur2012-07-031-1/+1
* | | | util.pposix: Add setenv()Kim Alvefur2012-07-031-0/+33
* | | | util.sasl: Make registerMechanism a public functionMatthew Wild2012-06-181-1/+1
| |_|/ |/| |
* | | util.dataforms: Fix parsing of -multi fieldsFlorian Zeitz2012-06-121-5/+5
| |/ |/|
* | mod_adhoc, mod_admin_adhoc, mod_announce: Use module:provides() to manage Ad-...Florian Zeitz2012-06-123-15/+16
|/
* mod_s2s: Remove check for socket.tcp6()Kim Alvefur2012-05-291-4/+0
* mod_s2s: Only do AAAA lookup if IPv6 is available, and A if IPv4 is available.Kim Alvefur2012-05-291-1/+17
* mod_proxy65: Fix ACLKim Alvefur2012-05-291-1/+3