Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge 0.10->trunk | Kim Alvefur | 2014-04-15 | 1 | -12/+68 |
|\ | |||||
| * | 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 | ||||
* | | Merge 0.10->trunk | Matthew Wild | 2014-04-15 | 1 | -9/+17 |
|\| | |||||
| * | net.http.server: Add prepare_header() and finish_response() to allow sending ↵ | Daurnimator | 2014-04-15 | 1 | -9/+17 |
| | | | | | | | | chunked responses via the API | ||||
* | | Merge 0.10->trunk | Kim Alvefur | 2014-04-10 | 1 | -0/+20 |
|\| | |||||
| * | mod_s2s: Revert e626ee2fe106 change, it broke Dialback | Kim Alvefur | 2014-04-10 | 1 | -0/+20 |
| | | |||||
* | | Merge 0.10->trunk | Kim Alvefur | 2014-04-10 | 11 | -52/+46 |
|\| | |||||
| * | 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 |
| | | | |||||
* | | | Merge 0.10->trunk | Kim Alvefur | 2014-04-03 | 1 | -8/+7 |
|\| | | |||||
| * | | 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.10->trunk | Matthew Wild | 2014-04-02 | 8 | -15/+101 |
|\| | | |||||
| * | | Merge 0.9->0.10 | Matthew Wild | 2014-04-02 | 136 | -2257/+3484 |
| |\ \ | | |/ | |/| | |||||
| * | | util.xmppstream: Also disable CharacterData merging after stream restarts | Matthew Wild | 2014-04-02 | 1 | -1/+1 |
| | | | |||||
| * | | util.xmppstream: Disable LuaExpat's buffering (if possible) | Matthew Wild | 2014-04-02 | 1 | -3/+3 |
| | | | |||||
| * | | Tagging 0.9.4 | Matthew Wild | 2014-04-01 | 0 | -0/+0 |
| | | | |||||
| * | | Merge | Matthew Wild | 2014-04-01 | 1 | -1/+1 |
| |\ \ | |||||
| | * | | MUC: Fixed traceback when a JID not in a room requested a role change for an ↵ | Waqas Hussain | 2014-04-01 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | occupant. | ||||
| * | | | Merge | Matthew Wild | 2014-04-01 | 2 | -0/+2 |
| |\| | | |||||
| | * | | net.server_{select,event}: Add compat code for supporting the same client ↵ | Kim Alvefur | 2014-04-01 | 2 | -0/+2 |
| | | | | | | | | | | | | | | | | port API on connections | ||||
| | * | | Backed out changeset a5b5bce71a11 | Kim Alvefur | 2014-03-31 | 1 | -1/+1 |
| | | | | |||||
| | * | | net.server_event: Rename conn:port() -> conn:clientport() to match server_select | Kim Alvefur | 2014-03-27 | 1 | -1/+1 |
| | | | | |||||
| * | | | Makefile: Change sed regex to be compatible with FreeBSD's odd sed, and ↵ | Matthew Wild | 2014-03-30 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | change / to | to allow paths to be used in RUNWITH (thanks Ben) | ||||
| * | | | util.dependencies: Log error when LuaExpat is not capable of enforcing ↵ | Matthew Wild | 2014-03-30 | 1 | -1/+9 |
| | | | | | | | | | | | | | | | | stanza size limits | ||||
| * | | | util.xmppstream: Implement stanza size limiting, default limit 10MB | Matthew Wild | 2014-03-30 | 1 | -6/+80 |
| | | | | |||||
| * | | | portmanager: Make maximum read size configurable, and default to 4KB | Matthew Wild | 2014-03-30 | 1 | -1/+3 |
| | | | | |||||
| * | | | mod_compression: Only allow compression on authenticated streams | Kim Alvefur | 2014-02-18 | 1 | -2/+2 |
| |/ / | |||||
* | | | Merge 0.10->trunk | Kim Alvefur | 2014-03-25 | 5 | -10/+17 |
|\ \ \ | | |/ | |/| | |||||
| * | | Merge 0.9->0.10 | Kim Alvefur | 2014-03-25 | 3 | -3/+8 |
| |\| | |||||
| | * | prosodyctl: Show real error if certificate config file can't be opened | Kim Alvefur | 2014-03-22 | 1 | -1/+6 |
| | | | |||||
| | * | modulemanager: Load mod_saslauth on components by default | Kim Alvefur | 2014-03-22 | 1 | -1/+1 |
| | | | |||||
| | * | mod_saslauth: Only do c2s SASL on normal VirtualHosts | Kim Alvefur | 2014-03-22 | 1 | -1/+1 |
| | | | |||||
| * | | 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.10->trunk | Kim Alvefur | 2014-03-09 | 2 | -5/+6 |
|\| | |