aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* loggingmanager: Remove unused variablesMatthew Wild2012-07-241-6/+4
|
* mod_auth_cyrus, util.sasl_cyrus: Add new option 'cyrus_server_fqdn' to ↵Matthew Wild2012-07-242-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 Wild2012-07-241-2/+2
| | | | type 'cancel' - fixes #303
* mod_bosh: Use new format for headers when checking for proxies to get the ↵Kim Alvefur2012-07-231-1/+1
| | | | originating IP
* mod_s2s: Bump s2s_timeout to 90, to allow for the TCP timeout (in most ↵Matthew Wild2012-07-231-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 Wild2012-07-232-6/+6
|
* sessionmanager: Lower 'destroying session' message to 'debug' level (from ↵Matthew Wild2012-07-231-1/+1
| | | | 'info')
* s2smanager: Remove logging of (unknown) in a case where from_host and ↵Matthew Wild2012-07-231-1/+1
| | | | to_host should always be set
* Hopefully inert commit to clean up logging across a number of modules, ↵Matthew Wild2012-07-2311-39/+37
| | | | removing all cases of concatenation when building log messages
* certmanager: Remove unused import of setmetatableMatthew Wild2012-07-231-1/+1
|
* certmanager: Fix for traceback WITH LuaSec... (!) (thanks IRON)Matthew Wild2012-07-231-2/+5
|
* certmanager: Fix traceback for missing LuaSec (thanks Link Mauve)Matthew Wild2012-07-231-2/+2
|
* mod_admin_telnet: Always handle commands terminated by line feeds - ensures ↵Matthew Wild2012-07-231-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 Wild2012-07-231-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 Wild2012-07-231-3/+3
| | | | concatenation
* mod_c2s: Change 'reason' parameter of session:close() to take nil to mean ↵Matthew Wild2012-07-231-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 Wild2012-07-231-1/+1
|
* net.server_event: Remove unused variables and importsMatthew Wild2012-07-221-9/+1
|
* net.server_select: Remove unused variables and importsMatthew Wild2012-07-221-5/+0
|
* net.server_select: Remove extraneous variableMatthew Wild2012-07-221-1/+0
|
* sessionmanager: Clean up some unused variables and importsMatthew Wild2012-07-221-7/+2
|
* net.server_select: Never call ondisconnect() directly, go via ↵Matthew Wild2012-07-221-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 MarandaMatthew Wild2012-07-221-0/+35
|\
| * mod_admin_telnet: add s2s:closeall command and relative help entry.Marco Cirillo2012-07-091-0/+35
| |
* | Merge with ZashMatthew Wild2012-07-223-3/+40
|\ \
| * \ Merge Zash with Zash for ZashMatthew Wild2012-07-221-2/+2
| |\ \
| | * | net.http: Use base64 from util.encodings instead of luasocketKim Alvefur2012-07-071-2/+2
| | | |
| * | | adhoc.lib: Make some globals localKim Alvefur2012-07-181-1/+2
| | | |
| * | | mod_admin_telnet: Add info about user management commands to the helpKim Alvefur2012-07-091-0/+5
| | | |
| * | | mod_admin_telnet: Add some user management commands.Kim Alvefur2012-07-091-0/+31
| | | |
* | | | mod_admin_telnet: Replace anonymous function with loop (saves a closure)Matthew Wild2012-07-221-11/+11
| | | |
* | | | 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
| | | | | | | | | | | | | | | | | | | | (!) 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 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
| | | | | | | | | | | | | | | | | | | | false
| * | | | mod_c2s: Don't call ondisconnect manually on close, it is now called by ↵Matthew Wild2012-07-221-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 closeMatthew Wild2012-07-221-1/+0
| | | | |
| * | | | net.server_select, net.server_event: Change semantics of conn:close() - ↵Matthew Wild2012-07-222-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 Wild2012-07-221-1/+1
| | | | | | | | | | | | | | | | | | | | indicate failure
| * | | | mod_s2s: Make unauthed session timeout a little more aggressive... otherwise ↵Matthew Wild2012-07-221-4/+2
| | | | | | | | | | | | | | | | | | | | it's possible for sessions to slip under the net and never get killed off
| * | | | 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 ↵Matthew Wild2012-07-221-8/+7
| | | | | | | | | | | | | | | | | | | | send one (e.g. because v6 is disabled)
* | | | | 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
| | |