Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge 0.9->0.10 | Kim Alvefur | 2014-04-23 | 2 | -1/+10 |
|\ | |||||
| * | util.dataforms: Add support for XEP-0221: Data Forms Media Element | Kim Alvefur | 2014-04-22 | 1 | -0/+9 |
| | | |||||
| * | tools/jabberd14sql2prosody: Fix package.path (thanks daurnimator) | Kim Alvefur | 2014-04-22 | 1 | -1/+1 |
| | | |||||
* | | mod_s2s: Follow XMPP Core on when a stream is to be considered ready | Kim Alvefur | 2014-04-22 | 1 | -1/+11 |
| | | |||||
* | | certmanager: Move ssl.protocol handling to after ssl.options is a table ↵ | Kim Alvefur | 2014-04-21 | 1 | -8/+9 |
| | | | | | | | | (thanks Ralph) | ||||
* | | certmanager: Fix traceback if no global 'ssl' section set (thanks albert) | Kim Alvefur | 2014-04-20 | 1 | -1/+3 |
| | | |||||
* | | mod_http: Update to disable peer verification with the new certmanager | Kim Alvefur | 2014-04-19 | 1 | -1/+7 |
| | | |||||
* | | mod_s2s: Replace open_stream() with function that only adds s2s/dialback ↵ | Kim Alvefur | 2014-04-18 | 1 | -14/+2 |
| | | | | | | | | attributes to stream header | ||||
* | | util.xmppstream: Check for callback that may add stream header attributes | Kim Alvefur | 2014-04-18 | 1 | -0/+3 |
| | | |||||
* | | net.http.server: Fix some typos introduced in 420c0d3b8583. | Daurnimator | 2014-04-15 | 1 | -4/+3 |
| | | |||||
* | | certmanager: Update ssl_compression when config is reloaded | Kim Alvefur | 2014-04-15 | 1 | -0/+3 |
| | | |||||
* | | certmanager: Reformat core ssl defaults | Kim Alvefur | 2014-04-15 | 1 | -9/+9 |
| | | |||||
* | | certmanager: Support ssl.protocol syntax like "tlsv1+" that disables older ↵ | Kim Alvefur | 2014-04-15 | 1 | -2/+13 |
| | | | | | | | | protocols | ||||
* | | certmanager: Merge ssl.options, verify etc from core defaults and global ssl ↵ | Kim Alvefur | 2014-04-15 | 1 | -0/+29 |
| | | | | | | | | settings with inheritance while allowing options to be disabled per virtualhost | ||||
* | | certmanager: Wrap long line and add comment | Kim Alvefur | 2014-04-14 | 1 | -1/+5 |
| | | |||||
* | | certmanager: Concatenate cipher list if given as a table | Kim Alvefur | 2014-04-14 | 1 | -0/+6 |
| | | |||||
* | | certmanager: Allow non-server contexts to be without certificate and key | Kim Alvefur | 2014-04-14 | 1 | -2/+4 |
| | | |||||
* | | certmanager: Check for non-nil values instead of true-ish values, allows ↵ | Kim Alvefur | 2014-04-14 | 1 | -2/+3 |
| | | | | | | | | removing defaults | ||||
* | | net.http.server: Add prepare_header() and finish_response() to allow sending ↵ | Daurnimator | 2014-04-15 | 1 | -9/+17 |
| | | | | | | | | chunked responses via the API | ||||
* | | mod_s2s: Revert e626ee2fe106 change, it broke Dialback | Kim Alvefur | 2014-04-10 | 1 | -0/+20 |
| | | |||||
* | | Merge 0.9->0.10 | Kim Alvefur | 2014-04-10 | 3 | -3/+21 |
|\| | |||||
| * | prosody: Check dependencies later in the startup sequence | Kim Alvefur | 2014-04-09 | 1 | -3/+7 |
| | | |||||
| * | util.dependencies: Check for Lua 5.1. We don't currently support any other ↵ | Waqas Hussain | 2014-04-09 | 1 | -0/+8 |
| | | | | | | | | versions. LuaJIT identifies as 5.1. | ||||
| * | mod_admin_telnet: muc:*: Fix nil index error when a room JID is passed with ↵ | Matthew Wild | 2014-04-05 | 1 | -0/+6 |
| | | | | | | | | a non-existent host | ||||
* | | mod_c2s, mod_s2s, mod_component, util.xmppstream: Move all ↵ | Kim Alvefur | 2014-04-10 | 4 | -37/+17 |
| | | | | | | | | session:open_stream() functions to util.xmppstream | ||||
* | | prosodyctl, util.prosodyctl: Update to reflect that mod_posix gets loaded by ↵ | Kim Alvefur | 2014-04-10 | 2 | -3/+7 |
| | | | | | | | | default on posix platforms | ||||
* | | mod_posix: Remove compat code for 0.5 | Kim Alvefur | 2014-04-10 | 1 | -8/+0 |
| | | |||||
* | | mod_storage_sql2: Build counter query without ORDER BY clause | Kim Alvefur | 2014-04-08 | 1 | -1/+1 |
| | | |||||
* | | mod_compression: Only iterate over correctly named and namespaced child tags ↵ | Kim Alvefur | 2014-04-03 | 1 | -2/+2 |
| | | | | | | | | of compression feature | ||||
* | | mod_compression: Use get_child() and get_child_text() | Kim Alvefur | 2014-04-03 | 1 | -3/+2 |
| | | |||||
* | | mod_compression: Remove checks for impossible conditions | Kim Alvefur | 2014-04-03 | 1 | -3/+3 |
| | | |||||
* | | Merge 0.9->0.10 | Matthew Wild | 2014-04-02 | 136 | -2257/+3484 |
|\ \ | |/ |/| | |||||
| * | Merge 0.9->0.10 | Kim Alvefur | 2014-03-25 | 3 | -3/+8 |
| |\ | |||||
| * | | prosody.cfg.lua.dist: mod_posix is enabled by default on posix platforms now | Kim Alvefur | 2014-03-22 | 1 | -1/+1 |
| | | | |||||
| * | | util.sasl: Fix logic for when mechanisms with channel binding support are ↵ | Kim Alvefur | 2014-03-22 | 1 | -6/+8 |
| | | | | | | | | | | | | offered | ||||
| * | | Merge 0.9->0.10 | Kim Alvefur | 2014-03-09 | 2 | -5/+6 |
| |\ \ | |||||
| * \ \ | Merge 0.9->0.10 | Kim Alvefur | 2014-02-26 | 3 | -4/+9 |
| |\ \ \ | |||||
| * | | | | mod_proxy65: Use mod_disco | Florian Zeitz | 2014-02-19 | 1 | -18/+1 |
| | | | | | |||||
| * | | | | mod_auth_interal_hashed: Update salt and iteration count when setting a new ↵ | Florian Zeitz | 2014-02-12 | 1 | -5/+7 |
| | | | | | | | | | | | | | | | | | | | | password | ||||
| * | | | | Merge 0.9 -> 0.10 | Kim Alvefur | 2014-02-12 | 2 | -2/+4 |
| |\ \ \ \ | |||||
| * | | | | | mod_saslauth: Make sure sasl handler has add_cb_handler (fixes #392) | Kim Alvefur | 2014-02-12 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | mod_storage_sql2: archive:delete() with username = true deletes for all users | Kim Alvefur | 2014-02-09 | 1 | -0/+4 |
| | | | | | | |||||
| * | | | | | mod_ping: Use type-specific event | Kim Alvefur | 2014-02-09 | 1 | -6/+3 |
| | | | | | | |||||
| * | | | | | Merge 0.9->0.10 | Kim Alvefur | 2014-02-06 | 1 | -1/+1 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge 0.9->0.10 | Kim Alvefur | 2014-02-03 | 1 | -1/+1 |
| |\ \ \ \ \ \ | |||||
| * | | | | | | | mod_c2s: Break out stream opening into a separate function | Florian Zeitz | 2014-01-31 | 1 | -6/+16 |
| | | | | | | | | |||||
| * | | | | | | | MUC: Tag PMs with <x>, like presence stanzas | Kim Alvefur | 2014-01-28 | 1 | -0/+1 |
| | | | | | | | | |||||
| * | | | | | | | modulemanager: Always load a platform-specific module, add stub modules for ↵ | Kim Alvefur | 2014-01-26 | 3 | -1/+9 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Windows and unknown platforms | ||||
| * | | | | | | | mod_posix: Daemonize by default only when installed | Kim Alvefur | 2014-01-26 | 1 | -1/+1 |
| | | | | | | | | |||||
| * | | | | | | | Merge 0.9->0.10 | Matthew Wild | 2014-01-21 | 2 | -3/+4 |
| |\ \ \ \ \ \ \ |