aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
| * | 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 confi...Kim Alvefur2012-05-091-0/+156
| |/
* / mod_s2s, s2smanager, mod_dialback: Move addition of session.send() on s2sin t...Matthew Wild2012-05-103-21/+22
|/
* 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 instea...Matthew Wild2012-05-041-10/+13
* mod_s2s: Add session.send() only to incoming streams, and fire the route/remo...Matthew Wild2012-05-041-1/+5
* 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 anywa...Matthew Wild2012-05-031-4/+0
* 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
|\
| * portmanager: Import pairsKim Alvefur2012-05-031-1/+1
* | net.server, net.timer, net.server_select: Rearrange dependencies between thes...Matthew Wild2012-05-033-23/+9
* | mod_admin_telnet: Add muc:room(jid) command to get the MUC room objectMatthew Wild2012-05-021-1/+25
|/
* mod_component: Allow unauthenticated components to authenticate (thanks Maranda)Matthew Wild2012-04-301-1/+1
* mod_component: Components start out as component_unauthed until successful au...Matthew Wild2012-04-301-1/+2
* modulemanager: Pass the module's final host (e.g. '*') to the module-loaded e...Matthew Wild2012-04-301-1/+1
* mod_component: Send <?xml on initial stream (thanks xnyhps)Matthew Wild2012-04-301-0/+1
* util.xmlrpc: Remove (unused)Matthew Wild2012-04-291-182/+0
* modulemanager: Hide deprecation warning for modules loaded on '*' directly (e...Matthew Wild2012-04-291-1/+3
* portmanager: Import ipairs (thanks Maranda)Matthew Wild2012-04-291-1/+1
* Merge with ZashMatthew Wild2012-04-291-1/+1
|\
| * mod_s2s: Don't try to continue attempting to connect when an s2sin is closedKim Alvefur2012-04-291-1/+1
* | Merge 0.9->trunkMatthew Wild2012-04-2981-2595/+4065
|\|