Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge with Maranda | Matthew Wild | 2012-05-11 | 2 | -3/+21 |
|\ | |||||
| * | Merge with backout | Matthew Wild | 2012-05-11 | 1 | -1/+0 |
| |\ | |||||
| | * | Backed out changeset 661752889535 - obsoleted by 878f75ccc4fb. | Matthew Wild | 2012-05-11 | 1 | -1/+0 |
| | | | |||||
| * | | Merge with backout | Matthew Wild | 2012-05-11 | 1 | -1/+5 |
| |\ \ | |||||
| | * | | Backed out changeset 9f1fb34cd7f8 - obsoleted by 5ef05f32bc42. | Matthew Wild | 2012-05-11 | 1 | -15/+9 |
| | | | | |||||
| * | | | Merge with backout | Matthew Wild | 2012-05-11 | 1 | -3/+1 |
| |\ \ \ | |||||
| | * | | | Backed out changeset 751510cd558d - obsoleted by 5ef05f32bc42. | Matthew Wild | 2012-05-11 | 1 | -3/+0 |
| | | | | | |||||
| * | | | | muc.lib: return feature-not-implemented when a foregoing discovery node is ↵ | Marco Cirillo | 2012-05-10 | 1 | -1/+5 |
| | |_|/ | |/| | | | | | | | | | | specified in a disco#info request. | ||||
| * | | | mod_auth_anonymous: add disallow_s2s to the host object if s2s communication ↵ | Marco Cirillo | 2012-05-10 | 1 | -0/+1 |
| | |/ | |/| | | | | | | | is disallowed. | ||||
| * | | mod_dialback: make change a bit more wide, encompass to and from and reject ↵ | Marco Cirillo | 2012-05-09 | 1 | -9/+15 |
| | | | | | | | | | | | | with proper addressing when neither are there. | ||||
| * | | mod_dialback: add better safe then sorry nameprepping to the from attribute. | Marco Cirillo | 2012-05-09 | 1 | -3/+9 |
| |/ | |||||
| * | mod_dialback: COMPAT reset session.send function for servers (e.g. ejabberd) ↵ | Marco Cirillo | 2012-05-09 | 1 | -0/+3 |
| | | | | | | | | which don't include a from attr when opening the stream. | ||||
* | | mod_s2s, mod_auth_anonymous, hostmanager: Remove disallow_s2s flag, ↵ | Matthew Wild | 2012-05-11 | 3 | -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 Zash | Matthew Wild | 2012-05-10 | 7 | -165/+211 |
|\ \ | |||||
| * | | s2smanager, mod_s2s: Move checking DNS timeout option to mod_s2s | Kim Alvefur | 2012-05-10 | 2 | -5/+2 |
| | | | |||||
| * | | s2smanager: Clean up unused imports. | Kim Alvefur | 2012-05-10 | 1 | -22/+2 |
| | | | |||||
| * | | util.rfc3484: Don't pollute the global scope. | Kim Alvefur | 2012-05-10 | 1 | -2/+2 |
| | | | |||||
| * | | util.hashes: Add sha224, sha384, sha512 | Kim Alvefur | 2012-05-10 | 1 | -0/+6 |
| | | | |||||
| * | | util.hashes: Use defined hash function output lengths. | Kim Alvefur | 2012-05-09 | 1 | -3/+3 |
| | | | |||||
| * | | prosodyctl: Show an error if the user doesn't supply a hostname to the ↵ | Kim Alvefur | 2012-05-09 | 1 | -1/+6 |
| | | | | | | | | | | | | certificate commands | ||||
| * | | prosodyctl: Replace hack with lfs for checking if a file exists | Kim Alvefur | 2012-05-09 | 1 | -12/+12 |
| | | | |||||
| * | | util.x509: Remove logic for generating certificate configs | Kim Alvefur | 2012-05-09 | 1 | -105/+0 |
| | | | |||||
| * | | prosodyctl: Use util.openssl in certificate helpers. Improve feedback | Kim Alvefur | 2012-05-09 | 1 | -21/+28 |
| | | | |||||
| * | | util.openssl: Add wrapper for the openssl cli tool and move certificate ↵ | Kim Alvefur | 2012-05-09 | 1 | -0/+156 |
| |/ | | | | | | | config logic from util.x509 into it. | ||||
* / | mod_s2s, s2smanager, mod_dialback: Move addition of session.send() on s2sin ↵ | Matthew Wild | 2012-05-10 | 3 | -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 Wild | 2012-05-04 | 1 | -5/+7 |
| | |||||
* | mod_s2s: Cache to_host and from_host in local variables, and use these ↵ | Matthew Wild | 2012-05-04 | 1 | -10/+13 |
| | | | | instead of repeated lookups | ||||
* | mod_s2s: Add session.send() only to incoming streams, and fire the ↵ | Matthew Wild | 2012-05-04 | 1 | -1/+5 |
| | | | | route/remote event on the host (not global anymore) | ||||
* | mod_s2s: Become a shared module (yay) | Matthew Wild | 2012-05-04 | 1 | -4/+14 |
| | |||||
* | stanza_router: Fire route/remote per-host | Matthew Wild | 2012-05-04 | 1 | -3/+4 |
| | |||||
* | stanza_router: Allow route/remote handlers to return false to block a stanza | Matthew Wild | 2012-05-04 | 1 | -1/+1 |
| | |||||
* | prosodyctl: Fix import of util.iterators | Kim Alvefur | 2012-05-04 | 1 | -1/+1 |
| | |||||
* | Rename plugins/s2s/ to plugins/mod_s2s/ | Matthew Wild | 2012-05-04 | 2 | -0/+0 |
| | |||||
* | sessionmanager: Remove max_resources config option and check, incorrect ↵ | Matthew Wild | 2012-05-03 | 1 | -4/+0 |
| | | | | anyway (thanks Zash) | ||||
* | util.timer: Remove unnecessary require calls, fixes a traceback (thanks nulani) | Matthew Wild | 2012-05-03 | 1 | -2/+2 |
| | |||||
* | net.server: server_select != server_event (thanks Nulani, Florob) | Matthew Wild | 2012-05-03 | 1 | -1/+1 |
| | |||||
* | Merge with Zash | Matthew Wild | 2012-05-03 | 1 | -1/+1 |
|\ | |||||
| * | portmanager: Import pairs | Kim Alvefur | 2012-05-03 | 1 | -1/+1 |
| | | |||||
* | | net.server, net.timer, net.server_select: Rearrange dependencies between ↵ | Matthew Wild | 2012-05-03 | 3 | -23/+9 |
| | | | | | | | | these three modules. server.addtimer() is no longer a public function (renamed to _addtimer) and is not available at all from server_event (compat code removed to prevent traceback) (thanks Nulani) | ||||
* | | mod_admin_telnet: Add muc:room(jid) command to get the MUC room object | Matthew Wild | 2012-05-02 | 1 | -1/+25 |
|/ | |||||
* | mod_component: Allow unauthenticated components to authenticate (thanks Maranda) | Matthew Wild | 2012-04-30 | 1 | -1/+1 |
| | |||||
* | mod_component: Components start out as component_unauthed until successful ↵ | Matthew Wild | 2012-04-30 | 1 | -1/+2 |
| | | | | authentication (thanks xnyhps) | ||||
* | modulemanager: Pass the module's final host (e.g. '*') to the module-loaded ↵ | Matthew Wild | 2012-04-30 | 1 | -1/+1 |
| | | | | event | ||||
* | mod_component: Send <?xml on initial stream (thanks xnyhps) | Matthew Wild | 2012-04-30 | 1 | -0/+1 |
| | |||||
* | util.xmlrpc: Remove (unused) | Matthew Wild | 2012-04-29 | 1 | -182/+0 |
| | |||||
* | modulemanager: Hide deprecation warning for modules loaded on '*' directly ↵ | Matthew Wild | 2012-04-29 | 1 | -1/+3 |
| | | | | (e.g. prosodyctl mod_<command>) (thanks Zash) | ||||
* | portmanager: Import ipairs (thanks Maranda) | Matthew Wild | 2012-04-29 | 1 | -1/+1 |
| | |||||
* | Merge with Zash | Matthew Wild | 2012-04-29 | 1 | -1/+1 |
|\ | |||||
| * | mod_s2s: Don't try to continue attempting to connect when an s2sin is closed | Kim Alvefur | 2012-04-29 | 1 | -1/+1 |
| | | |||||
* | | Merge 0.9->trunk | Matthew Wild | 2012-04-29 | 81 | -2595/+4065 |
|\| |