Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge with Zash | Matthew Wild | 2012-07-22 | 3 | -3/+40 |
|\ | |||||
| * | Merge Zash with Zash for Zash | Matthew Wild | 2012-07-22 | 1 | -2/+2 |
| |\ | |||||
| | * | net.http: Use base64 from util.encodings instead of luasocket | Kim Alvefur | 2012-07-07 | 1 | -2/+2 |
| | | | |||||
| * | | adhoc.lib: Make some globals local | Kim Alvefur | 2012-07-18 | 1 | -1/+2 |
| | | | |||||
| * | | mod_admin_telnet: Add info about user management commands to the help | Kim Alvefur | 2012-07-09 | 1 | -0/+5 |
| | | | |||||
| * | | mod_admin_telnet: Add some user management commands. | Kim Alvefur | 2012-07-09 | 1 | -0/+31 |
| | | | |||||
* | | | mod_admin_telnet: Replace anonymous function with loop (saves a closure) | Matthew Wild | 2012-07-22 | 1 | -11/+11 |
| | | | |||||
* | | | Merge 0.9->trunk | Matthew Wild | 2012-07-22 | 10 | -131/+164 |
|\ \ \ | |||||
| * | | | mod_s2s: Don't call ondisconnect manually, don't call conn:close() 3 times ↵ | Matthew Wild | 2012-07-22 | 1 | -19/+29 |
| | | | | | | | | | | | | | | | | (!) 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 | Matthew Wild | 2012-07-22 | 1 | -3/+4 |
| | | | | |||||
| * | | | mod_presence: Handle nil disconnection error | Matthew Wild | 2012-07-22 | 1 | -4/+6 |
| | | | | |||||
| * | | | mod_iq: Don't treat an iq as handled if session.send() returns false | Matthew Wild | 2012-07-22 | 1 | -4/+1 |
| | | | | |||||
| * | | | mod_message: Don't treat a message as delivered ok if session.send() returns ↵ | Matthew Wild | 2012-07-22 | 1 | -5/+6 |
| | | | | | | | | | | | | | | | | false | ||||
| * | | | mod_c2s: Don't call ondisconnect manually on close, it is now called by ↵ | Matthew Wild | 2012-07-22 | 1 | -4/+23 |
| | | | | | | | | | | | | | | | | 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 | Matthew Wild | 2012-07-22 | 1 | -1/+0 |
| | | | | |||||
| * | | | net.server_select, net.server_event: Change semantics of conn:close() - ↵ | Matthew Wild | 2012-07-22 | 2 | -26/+32 |
| | | | | | | | | | | | | | | | | 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 ↵ | Matthew Wild | 2012-07-22 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | indicate failure | ||||
| * | | | mod_s2s: Make unauthed session timeout a little more aggressive... otherwise ↵ | Matthew Wild | 2012-07-22 | 1 | -4/+2 |
| | | | | | | | | | | | | | | | | it's possible for sessions to slip under the net and never get killed off | ||||
| * | | | mod_s2s/s2sout.lib: Fix indentation | Matthew Wild | 2012-07-22 | 1 | -60/+60 |
| | | | | |||||
* | | | | Merge 0.9->trunk | Matthew Wild | 2012-07-22 | 1 | -8/+7 |
|\| | | | |||||
| * | | | mod_s2s/s2sout.lib: Don't wait for both v4 and v6 DNS responses if we only ↵ | Matthew Wild | 2012-07-22 | 1 | -8/+7 |
| | | | | | | | | | | | | | | | | send one (e.g. because v6 is disabled) | ||||
* | | | | Merge 0.9->trunk | Matthew Wild | 2012-07-19 | 2 | -4/+1 |
|\| | | | |||||
| * | | | mod_admin_adhoc: Remove unused variable and save a bit of CPU... | Matthew Wild | 2012-07-19 | 1 | -1/+0 |
| | | | | |||||
| * | | | moduleapi: Remove unused import of util.multitable | Matthew Wild | 2012-07-19 | 1 | -3/+1 |
| |/ / | |||||
* | | | Merge 0.9->trunk | Matthew Wild | 2012-07-09 | 1 | -1/+2 |
|\| | | |||||
| * | | util.throttle: floor() internal balance calculation | Matthew Wild | 2012-07-09 | 1 | -1/+2 |
| | | | |||||
* | | | Merge 0.9->trunk | Matthew Wild | 2012-07-08 | 1 | -0/+6 |
|\| | | |||||
| * | | util.pposix: Add comments to mallinfo fields we use, so I don't forget ↵ | Matthew Wild | 2012-07-08 | 1 | -0/+6 |
| | | | | | | | | | | | | tomorrow what they mean | ||||
* | | | Merge 0.9->trunk | Matthew Wild | 2012-07-08 | 3 | -36/+52 |
|\ \ \ | |/ / |/| | | |||||
| * | | Merge 0.9->trunk | Matthew Wild | 2012-07-07 | 2 | -3/+4 |
| |\| | |||||
| * | | Merge 0.9->trunk | Matthew Wild | 2012-07-05 | 0 | -0/+0 |
| |\ \ | |||||
| * \ \ | Merge 0.9->trunk | Matthew Wild | 2012-07-05 | 7 | -8/+40 |
| |\ \ \ | |||||
| * | | | | mod_admin_web: Use util.dataforms' own error checking | Florian Zeitz | 2012-07-05 | 1 | -34/+50 |
| | | | | | |||||
| * | | | | mod_dialback: Skip an unnecessary nameprep. | Waqas Hussain | 2012-06-15 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | s2smanager: Fix a traceback when we close a s2s connection ourselves (thanks ↵ | Waqas Hussain | 2012-06-13 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | for the testing Zash). | ||||
* | | | | | Merge with backout | Matthew Wild | 2012-07-08 | 1 | -2/+1 |
|\ \ \ \ \ | |||||
| * | | | | | Backed out changeset 72a2eec4204a (incomplete fix) | Matthew Wild | 2012-07-08 | 1 | -2/+1 |
| | |_|_|/ | |/| | | | |||||
* / | | | | util.pposix: Add meminfo() binding to memory allocation stats provided by ↵ | Matthew Wild | 2012-07-08 | 1 | -0/+28 |
|/ / / / | | | | | | | | | | | | | mallinfo() [compilation tested on Ubuntu...] | ||||
* | | | | mod_auth_anonymous: Attach a fake roster to the session, so the null storage ↵ | Kim Alvefur | 2012-07-07 | 1 | -1/+2 |
| | | | | | | | | | | | | | | | | backend can be used | ||||
* | | | | usermanager: Pass session on to auth provider (missing half of commit ↵ | Matthew Wild | 2012-07-07 | 1 | -2/+2 |
| |_|/ |/| | | | | | | | | 0545a574667b) (thanks Zash) | ||||
* | | | Merge (some of) trunk -> 0.9 | Matthew Wild | 2012-07-05 | 2 | -11/+19 |
|\| | | |/ |/| | |||||
| * | Merge 0.9->trunk | Matthew Wild | 2012-06-12 | 1 | -5/+5 |
| |\ | |||||
| * \ | Merge with trunk | Matthew Wild | 2012-06-12 | 3 | -15/+16 |
| |\ \ | |||||
| * | | | certmanager: Add quotes around cert file path when logging. | Waqas Hussain | 2012-06-12 | 1 | -1/+1 |
| | | | | |||||
| * | | | MUC: Handle missing persistent room data. | Waqas Hussain | 2012-06-12 | 1 | -10/+18 |
| | | | | |||||
* | | | | mod_saslauth: Pass session to usermanager.get_sasl_handler() | Matthew Wild | 2012-07-04 | 1 | -2/+2 |
| | | | | |||||
* | | | | TODO: Add statistics | Matthew Wild | 2012-07-04 | 1 | -0/+1 |
| | | | | |||||
* | | | | util.logger: Remove some redundant code | Matthew Wild | 2012-06-25 | 1 | -2/+0 |
| | | | | |||||
* | | | | util.stanza: Make stanza:childtags() behave like :get_child() | Kim Alvefur | 2012-07-05 | 1 | -2/+2 |
| | | | | |||||
* | | | | prosodyctl: Fix typo | Kim Alvefur | 2012-07-03 | 1 | -1/+1 |
| | | | |