aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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 ↵Matthew Wild2012-05-111-2/+2
| | | | | | | | can specify a service name instead ffor SSL)
* | moduleapi: Don't auto-reload self when already reloading (fixes reload of ↵Matthew Wild2012-05-111-1/+1
| | | | | | | | modules with cyclic dependencies)
* | 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
| | | | | | | | to depend on it (-1 line) (thanks Maranda)
* | 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 ↵Marco Cirillo2012-05-101-1/+5
| | |_|/ / | |/| | | | | | | | | | | | | specified in a disco#info request.
| * | | | mod_auth_anonymous: add disallow_s2s to the host object if s2s communication ↵Marco Cirillo2012-05-101-0/+1
| | |/ / | |/| | | | | | | | | | is disallowed.
| * | | mod_dialback: make change a bit more wide, encompass to and from and reject ↵Marco Cirillo2012-05-091-9/+15
| | | | | | | | | | | | | | | | with proper addressing when neither are there.
| * | | 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
| | | | | | | | | | | | which don't include a from attr when opening the stream.
* | | mod_s2s, mod_auth_anonymous, hostmanager: Remove disallow_s2s flag, ↵Matthew Wild2012-05-113-4/+4
| | | | | | | | | | | | deprecate the config option of the same name (disable mod_s2s instead), and add 'allow_anonymous_s2s' to separately control s2s for anonymous users
* | | 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 ↵Kim Alvefur2012-05-091-1/+6
| | | | | | | | | | | | | | | | certificate commands
| * | | prosodyctl: Replace hack with lfs for checking if a file existsKim Alvefur2012-05-091-12/+12
| | | |
| * | | util.x509: Remove logic for generating certificate configsKim Alvefur2012-05-091-105/+0
| | | |
| * | | prosodyctl: Use util.openssl in certificate helpers. Improve feedbackKim Alvefur2012-05-091-21/+28
| | | |
| * | | util.openssl: Add wrapper for the openssl cli tool and move certificate ↵Kim Alvefur2012-05-091-0/+156
| |/ / | | | | | | | | | config logic from util.x509 into it.
* / / mod_s2s, s2smanager, mod_dialback: Move addition of session.send() on s2sin ↵Matthew Wild2012-05-103-21/+22
|/ / | | | | | | to after they are authenticated (thus from mod_s2s to s2smanager). Update mod_dialback to fire route/remote directly, as session.send() is no longer available for s2sin_unauthed. Fixes #291.
* | mod_auth_anonymous: Block s2s when enabled on a host (and disallow_s2s ~= false)Matthew Wild2012-05-041-5/+7
| |
* | mod_s2s: Cache to_host and from_host in local variables, and use these ↵Matthew Wild2012-05-041-10/+13
| | | | | | | | instead of repeated lookups
* | mod_s2s: Add session.send() only to incoming streams, and fire the ↵Matthew Wild2012-05-041-1/+5
| | | | | | | | route/remote event on the host (not global anymore)
* | mod_s2s: Become a shared module (yay)Matthew Wild2012-05-041-4/+14
| |
* | stanza_router: Fire route/remote per-hostMatthew Wild2012-05-041-3/+4
| |
* | stanza_router: Allow route/remote handlers to return false to block a stanzaMatthew Wild2012-05-041-1/+1
| |
* | prosodyctl: Fix import of util.iteratorsKim Alvefur2012-05-041-1/+1
| |
* | Rename plugins/s2s/ to plugins/mod_s2s/Matthew Wild2012-05-042-0/+0
| |
* | sessionmanager: Remove max_resources config option and check, incorrect ↵Matthew Wild2012-05-031-4/+0
| | | | | | | | anyway (thanks Zash)
* | util.timer: Remove unnecessary require calls, fixes a traceback (thanks nulani)Matthew Wild2012-05-031-2/+2
| |
* | net.server: server_select != server_event (thanks Nulani, Florob)Matthew Wild2012-05-031-1/+1
| |
* | Merge with ZashMatthew Wild2012-05-031-1/+1
|\ \