aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* mod_admin_telnet: Import portmanager and s2smanager, as they are both usedMatthew Wild2012-07-281-0/+2
* mod_admin_telnet: Fix broken indentationMatthew Wild2012-07-281-14/+14
* mod_admin_telnet: Use module:get_option() instead of configmanager directlyMatthew Wild2012-07-281-1/+1
* Merge with FlorobMatthew Wild2012-07-2850-428/+641
|\
| * mod_dialback: Ignore <db:verify/> with a 'type' attribute on incoming connect...Matthew Wild2012-07-271-0/+5
| * net.server_event: Replace usage of string.len() with # operatorMatthew Wild2012-07-261-2/+1
| * mod_vcard: Remove vcard_compatibility COMPAT (moved to mod_compat_vcard in pr...Matthew Wild2012-07-261-9/+4
| * mod_muc: Remove unused variable and pull hosts into a localKim Alvefur2012-07-261-3/+3
| * mod_muc: Use module:send() instead of core_*_stanza()Kim Alvefur2012-07-261-2/+2
| * mod_announce, mod_motd, mod_pubsub, mod_register, mod_watchregistrations, mod...Kim Alvefur2012-07-266-7/+7
| * mod_admin_adhoc, mod_admin_telnet, mod_bosh, mod_c2s, mod_component, mod_pep,...Kim Alvefur2012-07-269-5/+10
| * stanza_router: Warn if the global core_*_stanza() functions are calledKim Alvefur2012-07-261-0/+12
| * 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