Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | portmanager: Show a friendly error message when initializing SSL fails ↵ | Kim Alvefur | 2012-07-25 | 1 | -18/+17 |
| | | | | (thanks MattJ for the entire patch that I fixed one line in) | ||||
* | Merge with Zash | Matthew Wild | 2012-07-25 | 1 | -4/+3 |
|\ | |||||
| * | mod_admin_telnet: Remove useless call to string.lower() | Kim Alvefur | 2012-07-24 | 1 | -2/+1 |
| | | |||||
| * | mod_admin_telnet: Add missing import of usermanager | Kim Alvefur | 2012-07-24 | 1 | -0/+2 |
| | | |||||
| * | mod_admin_telnet: Remove unused or duplicated locals | Kim Alvefur | 2012-07-24 | 1 | -2/+0 |
| | | |||||
* | | mod_pep: Allow configurable service discovery identity (Fix) | IRON | 2012-07-25 | 1 | -1/+1 |
| | | |||||
* | | Merge with IRON | Matthew Wild | 2012-07-25 | 1 | -6/+4 |
|\| | |||||
| * | loggingmanager: Remove unused variables | Matthew Wild | 2012-07-24 | 1 | -6/+4 |
| | | |||||
* | | mod_pep: Allow configurable service discovery identity | IRON | 2012-07-25 | 1 | -1/+1 |
|/ | |||||
* | mod_auth_cyrus, util.sasl_cyrus: Add new option 'cyrus_server_fqdn' to ↵ | Matthew Wild | 2012-07-24 | 2 | -3/+9 |
| | | | | override the hostname passed to Cyrus (and used in e.g. GSSAPI/Kerberos) - fixes #295 | ||||
* | mod_muc: Fix a couple of cases of 'forbidden' stanza error being sent with ↵ | Matthew Wild | 2012-07-24 | 1 | -2/+2 |
| | | | | type 'cancel' - fixes #303 | ||||
* | mod_bosh: Use new format for headers when checking for proxies to get the ↵ | Kim Alvefur | 2012-07-23 | 1 | -1/+1 |
| | | | | originating IP | ||||
* | mod_s2s: Bump s2s_timeout to 90, to allow for the TCP timeout (in most ↵ | Matthew Wild | 2012-07-23 | 1 | -1/+1 |
| | | | | cases) - this allows us to continue to try other targets | ||||
* | mod_c2s, mod_s2s: Lower 'Disconnecting X' log messages from 'info' to 'debug' | Matthew Wild | 2012-07-23 | 2 | -6/+6 |
| | |||||
* | sessionmanager: Lower 'destroying session' message to 'debug' level (from ↵ | Matthew Wild | 2012-07-23 | 1 | -1/+1 |
| | | | | 'info') | ||||
* | s2smanager: Remove logging of (unknown) in a case where from_host and ↵ | Matthew Wild | 2012-07-23 | 1 | -1/+1 |
| | | | | to_host should always be set | ||||
* | Hopefully inert commit to clean up logging across a number of modules, ↵ | Matthew Wild | 2012-07-23 | 11 | -39/+37 |
| | | | | removing all cases of concatenation when building log messages | ||||
* | certmanager: Remove unused import of setmetatable | Matthew Wild | 2012-07-23 | 1 | -1/+1 |
| | |||||
* | certmanager: Fix for traceback WITH LuaSec... (!) (thanks IRON) | Matthew Wild | 2012-07-23 | 1 | -2/+5 |
| | |||||
* | certmanager: Fix traceback for missing LuaSec (thanks Link Mauve) | Matthew Wild | 2012-07-23 | 1 | -2/+2 |
| | |||||
* | mod_admin_telnet: Always handle commands terminated by line feeds - ensures ↵ | Matthew Wild | 2012-07-23 | 1 | -55/+63 |
| | | | | consistency even when packets are joined or split on the network | ||||
* | mod_s2s: Adjust session:close() in line with mod_c2s's - fixes waiting for ↵ | Matthew Wild | 2012-07-23 | 1 | -6/+6 |
| | | | | </stream:stream> if it has already been sent by the peer | ||||
* | mod_s2s/s2sout.lib: Use %s to insert strings into log messages instead of ↵ | Matthew Wild | 2012-07-23 | 1 | -3/+3 |
| | | | | concatenation | ||||
* | mod_c2s: Change 'reason' parameter of session:close() to take nil to mean ↵ | Matthew Wild | 2012-07-23 | 1 | -6/+6 |
| | | | | 'graceful close initiated by us' and false for 'graceful close initiated by client' | ||||
* | mod_disco: Allow configurable name in disco identity (defaults to 'Prosody') | Matthew Wild | 2012-07-23 | 1 | -1/+1 |
| | |||||
* | net.server_event: Remove unused variables and imports | Matthew Wild | 2012-07-22 | 1 | -9/+1 |
| | |||||
* | net.server_select: Remove unused variables and imports | Matthew Wild | 2012-07-22 | 1 | -5/+0 |
| | |||||
* | net.server_select: Remove extraneous variable | Matthew Wild | 2012-07-22 | 1 | -1/+0 |
| | |||||
* | sessionmanager: Clean up some unused variables and imports | Matthew Wild | 2012-07-22 | 1 | -7/+2 |
| | |||||
* | net.server_select: Never call ondisconnect() directly, go via ↵ | Matthew Wild | 2012-07-22 | 1 | -14/+11 |
| | | | | 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 | Matthew Wild | 2012-07-22 | 1 | -0/+35 |
|\ | |||||
| * | mod_admin_telnet: add s2s:closeall command and relative help entry. | Marco Cirillo | 2012-07-09 | 1 | -0/+35 |
| | | |||||
* | | 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 |