Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge 0.10->trunk | Kim Alvefur | 2014-11-22 | 2 | -10/+8 |
|\ | |||||
| * | certmanager, mod_tls: Return final ssl config as third return value (fix for ↵ | Kim Alvefur | 2014-11-22 | 2 | -10/+8 |
| | | | | | | | | c6caaa440e74, portmanager assumes non-falsy second return value is an error) (thanks deoren) | ||||
* | | Merge 0.10->trunk | Kim Alvefur | 2014-11-20 | 4 | -20/+36 |
|\| | |||||
| * | Merge 0.9->0.10 | Kim Alvefur | 2014-11-20 | 1 | -6/+6 |
| |\ | |||||
| | * | net.http.parser: Fix whitespace/indentation | Matthew Wild | 2014-11-18 | 1 | -5/+5 |
| | | | |||||
| | * | net.http.parser: Fix chunked encoding parsing across packet boundaries. | daurnimator | 2014-11-10 | 1 | -1/+1 |
| | | | |||||
| * | | mod_tls: Keep ssl config around and attach them to sessions | Kim Alvefur | 2014-11-19 | 1 | -6/+12 |
| | | | |||||
| * | | certmanager: Return final ssl config along with ssl context on success | Kim Alvefur | 2014-11-19 | 1 | -1/+3 |
| | | | |||||
| * | | mod_saslauth: Make it easier to support multiple channel binding methonds | Kim Alvefur | 2014-11-19 | 1 | -2/+4 |
| | | | |||||
| * | | mod_saslauth: Break out tls-unique channel binding callback so it is ↵ | Kim Alvefur | 2014-11-19 | 1 | -5/+10 |
| | | | | | | | | | | | | instantiated once | ||||
| * | | mod_saslauth: Keep sasl_handler in a local variable | Kim Alvefur | 2014-11-19 | 1 | -5/+6 |
| | | | |||||
* | | | Merge 0.10->trunk | Matthew Wild | 2014-11-20 | 2 | -2/+6 |
|\| | | |||||
| * | | mod_pubsub: Add support for including the publisher in item broadcasts | Philipp Hancke | 2014-11-20 | 2 | -2/+6 |
| | | | |||||
* | | | net.cqueues: Add module that allows use of cqueues while still using ↵ | daurnimator | 2014-11-18 | 1 | -0/+65 |
| | | | | | | | | | | | | net.server as main loop | ||||
* | | | plugins/muc/muc.lib: Allow muc-broadcast-presence event listeners to modify ↵ | daurnimator | 2014-11-14 | 1 | -2/+9 |
| | | | | | | | | | | | | nick, actor, reason | ||||
* | | | plugins/muc/muc.lib: Don't expose actor jids to users when anonymous | daurnimator | 2014-11-11 | 1 | -27/+39 |
| | | | | | | | | | | | | | | | * * * plugins/muc/muc.lib: Allow event listeners to modify actor | ||||
* | | | Merge 0.10->trunk | Kim Alvefur | 2014-11-09 | 5 | -11/+30 |
|\| | | |||||
| * | | Merge 0.9 -> 0.10 | Kim Alvefur | 2014-11-09 | 2 | -10/+14 |
| |\| | |||||
| | * | net.dns: Try next server if peer name can not be set (thanks wirehack7) | Kim Alvefur | 2014-10-30 | 1 | -6/+10 |
| | | | |||||
| | * | net.dns: Return new socket from servfail | Kim Alvefur | 2014-10-30 | 1 | -3/+4 |
| | | | |||||
| | * | net.adns: Log peername recorded from wrapped setpeername instead of calling ↵ | Kim Alvefur | 2014-10-30 | 1 | -2/+1 |
| | | | | | | | | | | | | sock:getpeername, it exists and throws an error on unconnected sockets (thanks wirehack7) | ||||
| | * | net.adns: Preserve error from setpeername | Kim Alvefur | 2014-10-30 | 1 | -1/+1 |
| | | | |||||
| * | | util.paths: Add function for joining path segments | Kim Alvefur | 2014-11-08 | 1 | -0/+6 |
| | | | |||||
| * | | mod_http: For URLs that end with / or wildcard handlers, add a low-priority ↵ | Kim Alvefur | 2014-11-04 | 1 | -0/+8 |
| | | | | | | | | | | | | redirect from without to with slash | ||||
| * | | mod_admin_telnet: Soft-reqire util.pposix for server:memory() | Kim Alvefur | 2014-10-27 | 1 | -1/+2 |
| | | | |||||
* | | | Merge 0.10->trunk | Kim Alvefur | 2014-10-26 | 7 | -26/+26 |
|\| | | |||||
| * | | Merge 0.9->0.10 | Kim Alvefur | 2014-10-26 | 3 | -15/+4 |
| |\| | |||||
| | * | Tagging 0.9.7 | Matthew Wild | 2014-10-24 | 0 | -0/+0 |
| | | | |||||
| | * | Backout changeset 6e67c73f730c: not a major fix and it breaks interop with ↵ | Matthew Wild | 2014-10-24 | 1 | -13/+2 |
| | | | | | | | | | | | | at least Isode M-Link, and possibly standards, while it's not clear it actually fixes the original problem either. | ||||
| | * | prosodyctl: Fix nil global access traceback in `prosodyctl about` (luarocks ↵ | Waqas Hussain | 2014-10-19 | 1 | -1/+1 |
| | | | | | | | | | | | | 2.2.0 no longer uses module()) | ||||
| | * | Tagging 0.9.6 | Matthew Wild | 2014-10-15 | 0 | -0/+0 |
| | | | |||||
| | * | certmanager, net.http: Disable SSLv3 by default | Matthew Wild | 2014-10-14 | 2 | -2/+2 |
| | | | |||||
| * | | mod_blocklist: Don't send unavailable presence from unavailable sessions ↵ | Kim Alvefur | 2014-10-26 | 1 | -1/+3 |
| | | | | | | | | | | | | when blocking a contact | ||||
| * | | mod_blocklist: Only log message about migrating from mod_privacy when there ↵ | Kim Alvefur | 2014-10-25 | 1 | -1/+1 |
| | | | | | | | | | | | | is data to migrate | ||||
| * | | mod_saslauth: Better name for config option | Kim Alvefur | 2014-10-21 | 1 | -1/+1 |
| | | | |||||
| * | | mod_saslauth: Make it possible to disable certain mechanisms | Kim Alvefur | 2014-10-21 | 1 | -1/+5 |
| | | | |||||
| * | | mod_saslauth: Add LOGIN to mechanisms not allowed over unencrypted ↵ | Kim Alvefur | 2014-10-21 | 1 | -1/+1 |
| | | | | | | | | | | | | connections as it may be offered by 3rd party authentication plugins | ||||
| * | | mod_saslauth: Use a configurable set of mechanisms to not allow over ↵ | Kim Alvefur | 2014-10-21 | 1 | -2/+3 |
| | | | | | | | | | | | | unencrypted connections | ||||
| * | | mod_saslauth: Log warning if no SASL mechanisms were offered | Kim Alvefur | 2014-10-21 | 1 | -1/+5 |
| | | | |||||
| * | | mod_saslauth: Use type-specific config option getters | Kim Alvefur | 2014-10-21 | 1 | -2/+2 |
| | | | |||||
| * | | mod_legacyauth, mod_saslauth, mod_tls: Pass require_encryption as default ↵ | Kim Alvefur | 2014-10-21 | 3 | -4/+4 |
| | | | | | | | | | | | | option to s2s_require_encryption so the later overrides the former | ||||
| * | | prosodyctl: Add 'require_encryption' to list of deprecated options pointed ↵ | Kim Alvefur | 2014-10-21 | 1 | -1/+1 |
| | | | | | | | | | | | | out by the check command | ||||
* | | | net/server: Handle lack of util.signal correctly | daurnimator | 2014-10-22 | 1 | -4/+10 |
| | | | |||||
* | | | net/server: Remove print | daurnimator | 2014-10-22 | 1 | -1/+0 |
| | | | |||||
* | | | net.server: Rename 'server' config option to 'network_backend' (to select ↵ | Matthew Wild | 2014-10-22 | 1 | -1/+1 |
| | | | | | | | | | | | | which net.server implementation to use) | ||||
* | | | net/server: If server.hook_signal exists, overwrite signal.signal; else make ↵ | daurnimator | 2014-10-21 | 1 | -16/+18 |
| | | | | | | | | | | | | | | | | | | | | | server.hook_signal == signal.signal No longer server_event specific server.hook_signal will always exist | ||||
* | | | Move timer code out of util.timer and into relevant net.server backends | daurnimator | 2014-10-20 | 3 | -66/+65 |
| | | | |||||
* | | | net/server: Split up different backends in a nicer way. Add global config ↵ | daurnimator | 2014-10-17 | 1 | -38/+51 |
| | | | | | | | | | | | | option 'server' | ||||
* | | | plugins/muc/mod_muc: Add 'local_only' flag to mod_muc, so rooms don't get ↵ | daurnimator | 2014-10-17 | 1 | -7/+9 |
| | | | | | | | | | | | | restored on shutdown | ||||
* | | | plugins/muc/muc.lib: Add :each_affiliation() iterator | daurnimator | 2014-10-15 | 1 | -5/+20 |
| | | |