aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* mod_admin_telnet: Add xmpp:ping(from, to), useful for initiating s2s connectionsKim Alvefur2012-07-261-0/+14
* net.server_event: Don't emit empty packets, check for errors first. (fixes #287)Kim Alvefur2012-07-251-4/+4
* portmanager: Show a friendly error message when initializing SSL fails (thank...Kim Alvefur2012-07-251-18/+17
* Merge with ZashMatthew Wild2012-07-251-4/+3
|\
| * mod_admin_telnet: Remove useless call to string.lower()Kim Alvefur2012-07-241-2/+1
| * mod_admin_telnet: Add missing import of usermanagerKim Alvefur2012-07-241-0/+2
| * mod_admin_telnet: Remove unused or duplicated localsKim Alvefur2012-07-241-2/+0
* | mod_pep: Allow configurable service discovery identity (Fix)IRON2012-07-251-1/+1
* | Merge with IRONMatthew Wild2012-07-251-6/+4
|\|
| * loggingmanager: Remove unused variablesMatthew Wild2012-07-241-6/+4
* | mod_pep: Allow configurable service discovery identityIRON2012-07-251-1/+1
|/
* mod_auth_cyrus, util.sasl_cyrus: Add new option 'cyrus_server_fqdn' to overri...Matthew Wild2012-07-242-3/+9
* mod_muc: Fix a couple of cases of 'forbidden' stanza error being sent with ty...Matthew Wild2012-07-241-2/+2
* mod_bosh: Use new format for headers when checking for proxies to get the ori...Kim Alvefur2012-07-231-1/+1
* mod_s2s: Bump s2s_timeout to 90, to allow for the TCP timeout (in most cases)...Matthew Wild2012-07-231-1/+1
* 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 'in...Matthew Wild2012-07-231-1/+1
* s2smanager: Remove logging of (unknown) in a case where from_host and to_host...Matthew Wild2012-07-231-1/+1
* Hopefully inert commit to clean up logging across a number of modules, removi...Matthew Wild2012-07-2311-39/+37
* 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 c...Matthew Wild2012-07-231-55/+63
* mod_s2s: Adjust session:close() in line with mod_c2s's - fixes waiting for </...Matthew Wild2012-07-231-6/+6
* mod_s2s/s2sout.lib: Use %s to insert strings into log messages instead of con...Matthew Wild2012-07-231-3/+3
* mod_c2s: Change 'reason' parameter of session:close() to take nil to mean 'gr...Matthew Wild2012-07-231-6/+6
* 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 handler:close()...Matthew Wild2012-07-221-14/+11
* 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
| * | | | 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