aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* muc.lib: room:set_historylength(): Condense code, and don't store length when...Matthew Wild2012-05-131-7/+3
* MUC: Fix check for history length update.Waqas Hussain2012-05-141-2/+2
* muc.lib: Fix for traceback when no history length is set for the roomMatthew Wild2012-05-131-1/+1
* mod_s2s: Only try next target if the stream didn't openMatthew Wild2012-05-131-1/+1
* prosodyctl: Improve help messages for cert commandsKim Alvefur2012-05-131-8/+13
* util.timer: Always pass the current time to timer callbacks.Waqas Hussain2012-05-121-2/+2
* mod_iq: Use "jabber:client" when the stanza payload namespace is nil.Waqas Hussain2012-05-121-6/+9
* Merge with ZashMatthew Wild2012-05-121-2/+9
|\
| * mod_http_files: Respond with a 301 redirect for directories to append a / (fi...Kim Alvefur2012-05-121-2/+9
* | stanza_router: Fix variable nameMatthew Wild2012-05-121-2/+2
* | net.http.parser: Do full URL decoding and parsing (e.g. adds request.url.quer...Matthew Wild2012-05-121-5/+7
* | net.http: Fix urlencode to not encode unreserved characters, so I can guiltle...Matthew Wild2012-05-121-1/+1
* | stanza_router: Close stream for unhandled stanzas from unauthenticated connec...Matthew Wild2012-05-121-2/+2
|/
* stanza_router: Remove FIXME comment and close stream with not-authorized for ...Matthew Wild2012-05-121-1/+2
* stanza_router: Catch s2s stanzas to hosts we don't serve earlier, and close w...Matthew Wild2012-05-121-0/+4
* portmanager: Fix missing variable declarationMatthew Wild2012-05-111-1/+1
* adhoc.lib: Default actions to 'complete' (replacement for rev 52b6901cabb0)Kim Alvefur2012-05-111-0/+1
* Merge with backoutMatthew Wild2012-05-111-9/+2
|\
| * Backed out changeset 52b6901cabb0 (to be replaced)Matthew Wild2012-05-111-9/+2
* | portmanager: Remove unused import of 'package'Matthew Wild2012-05-111-1/+1
* | portmanager: Support for per-port SSL certificatesMatthew Wild2012-05-111-7/+8
* | certmanager: Adjust error messages to be non-specific about 'host' (so we can...Matthew Wild2012-05-111-2/+2
* | moduleapi: Don't auto-reload self when already reloading (fixes reload of mod...Matthew Wild2012-05-111-1/+1
* | modulemanager: Set module.reloading = true when firing module-reloaded eventMatthew Wild2012-05-111-3/+5
* | mod_c2s: Another lurking string.format squashed.Matthew Wild2012-05-111-3/+3
* | mod_dialback: Remove a remaining usage of string.format, ick.Matthew Wild2012-05-111-3/+1
* | mod_http_errors: Fix cyclic dependency - mod_http depends on us now, no need ...Matthew Wild2012-05-111-1/+0
* | mod_s2s: Remove TODO comment for SASL/TLS on s2s (thanks Florob)Matthew Wild2012-05-111-1/+0
* | mod_dialback: Final sweep to get nameprep + error handling in order (hopefully)Matthew Wild2012-05-111-13/+6
* | mod_dialback: Fix logic bug - we should have both a to and from at this pointMatthew Wild2012-05-111-1/+1
* | Merge with MarandaMatthew Wild2012-05-112-3/+21
|\ \
| * \ Merge with backoutMatthew Wild2012-05-111-1/+0
| |\ \
| | * | Backed out changeset 661752889535 - obsoleted by 878f75ccc4fb.Matthew Wild2012-05-111-1/+0
| * | | Merge with backoutMatthew Wild2012-05-111-1/+5
| |\ \ \
| | * | | Backed out changeset 9f1fb34cd7f8 - obsoleted by 5ef05f32bc42.Matthew Wild2012-05-111-15/+9
| * | | | Merge with backoutMatthew Wild2012-05-111-3/+1
| |\ \ \ \
| | * | | | Backed out changeset 751510cd558d - obsoleted by 5ef05f32bc42.Matthew Wild2012-05-111-3/+0
| * | | | | muc.lib: return feature-not-implemented when a foregoing discovery node is sp...Marco Cirillo2012-05-101-1/+5
| | |_|/ / | |/| | |
| * | | | mod_auth_anonymous: add disallow_s2s to the host object if s2s communication ...Marco Cirillo2012-05-101-0/+1
| | |/ / | |/| |
| * | | mod_dialback: make change a bit more wide, encompass to and from and reject w...Marco Cirillo2012-05-091-9/+15
| * | | mod_dialback: add better safe then sorry nameprepping to the from attribute.Marco Cirillo2012-05-091-3/+9
| |/ /
| * | mod_dialback: COMPAT reset session.send function for servers (e.g. ejabberd) ...Marco Cirillo2012-05-091-0/+3
* | | mod_s2s, mod_auth_anonymous, hostmanager: Remove disallow_s2s flag, deprecate...Matthew Wild2012-05-113-4/+4
* | | Merge with ZashMatthew Wild2012-05-107-165/+211
|\ \ \
| * | | s2smanager, mod_s2s: Move checking DNS timeout option to mod_s2sKim Alvefur2012-05-102-5/+2
| * | | s2smanager: Clean up unused imports.Kim Alvefur2012-05-101-22/+2
| * | | util.rfc3484: Don't pollute the global scope.Kim Alvefur2012-05-101-2/+2
| * | | util.hashes: Add sha224, sha384, sha512Kim Alvefur2012-05-101-0/+6
| * | | util.hashes: Use defined hash function output lengths.Kim Alvefur2012-05-091-3/+3
| * | | prosodyctl: Show an error if the user doesn't supply a hostname to the certif...Kim Alvefur2012-05-091-1/+6