aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge 0.10->trunkKim Alvefur2014-04-151-12/+68
|\
| * certmanager: Update ssl_compression when config is reloadedKim Alvefur2014-04-151-0/+3
| |
| * certmanager: Reformat core ssl defaultsKim Alvefur2014-04-151-9/+9
| |
| * certmanager: Support ssl.protocol syntax like "tlsv1+" that disables older ↵Kim Alvefur2014-04-151-2/+13
| | | | | | | | protocols
| * certmanager: Merge ssl.options, verify etc from core defaults and global ssl ↵Kim Alvefur2014-04-151-0/+29
| | | | | | | | settings with inheritance while allowing options to be disabled per virtualhost
| * certmanager: Wrap long line and add commentKim Alvefur2014-04-141-1/+5
| |
| * certmanager: Concatenate cipher list if given as a tableKim Alvefur2014-04-141-0/+6
| |
| * certmanager: Allow non-server contexts to be without certificate and keyKim Alvefur2014-04-141-2/+4
| |
| * certmanager: Check for non-nil values instead of true-ish values, allows ↵Kim Alvefur2014-04-141-2/+3
| | | | | | | | removing defaults
* | Merge 0.10->trunkMatthew Wild2014-04-151-9/+17
|\|
| * net.http.server: Add prepare_header() and finish_response() to allow sending ↵Daurnimator2014-04-151-9/+17
| | | | | | | | chunked responses via the API
* | Merge 0.10->trunkKim Alvefur2014-04-101-0/+20
|\|
| * mod_s2s: Revert e626ee2fe106 change, it broke DialbackKim Alvefur2014-04-101-0/+20
| |
* | Merge 0.10->trunkKim Alvefur2014-04-1011-52/+46
|\|
| * Merge 0.9->0.10Kim Alvefur2014-04-103-3/+21
| |\
| | * prosody: Check dependencies later in the startup sequenceKim Alvefur2014-04-091-3/+7
| | |
| | * util.dependencies: Check for Lua 5.1. We don't currently support any other ↵Waqas Hussain2014-04-091-0/+8
| | | | | | | | | | | | versions. LuaJIT identifies as 5.1.
| | * mod_admin_telnet: muc:*: Fix nil index error when a room JID is passed with ↵Matthew Wild2014-04-051-0/+6
| | | | | | | | | | | | a non-existent host
| * | mod_c2s, mod_s2s, mod_component, util.xmppstream: Move all ↵Kim Alvefur2014-04-104-37/+17
| | | | | | | | | | | | session:open_stream() functions to util.xmppstream
| * | prosodyctl, util.prosodyctl: Update to reflect that mod_posix gets loaded by ↵Kim Alvefur2014-04-102-3/+7
| | | | | | | | | | | | default on posix platforms
| * | mod_posix: Remove compat code for 0.5Kim Alvefur2014-04-101-8/+0
| | |
| * | mod_storage_sql2: Build counter query without ORDER BY clauseKim Alvefur2014-04-081-1/+1
| | |
* | | Merge 0.10->trunkKim Alvefur2014-04-031-8/+7
|\| |
| * | mod_compression: Only iterate over correctly named and namespaced child tags ↵Kim Alvefur2014-04-031-2/+2
| | | | | | | | | | | | of compression feature
| * | mod_compression: Use get_child() and get_child_text()Kim Alvefur2014-04-031-3/+2
| | |
| * | mod_compression: Remove checks for impossible conditionsKim Alvefur2014-04-031-3/+3
| | |
* | | Merge 0.10->trunkMatthew Wild2014-04-028-15/+101
|\| |
| * | Merge 0.9->0.10Matthew Wild2014-04-02136-2257/+3484
| |\ \ | | |/ | |/|
| * | util.xmppstream: Also disable CharacterData merging after stream restartsMatthew Wild2014-04-021-1/+1
| | |
| * | util.xmppstream: Disable LuaExpat's buffering (if possible)Matthew Wild2014-04-021-3/+3
| | |
| * | Tagging 0.9.4Matthew Wild2014-04-010-0/+0
| | |
| * | Merge0.9.4Matthew Wild2014-04-011-1/+1
| |\ \
| | * | MUC: Fixed traceback when a JID not in a room requested a role change for an ↵Waqas Hussain2014-04-011-1/+1
| | | | | | | | | | | | | | | | occupant.
| * | | MergeMatthew Wild2014-04-012-0/+2
| |\| |
| | * | net.server_{select,event}: Add compat code for supporting the same client ↵Kim Alvefur2014-04-012-0/+2
| | | | | | | | | | | | | | | | port API on connections
| | * | Backed out changeset a5b5bce71a11Kim Alvefur2014-03-311-1/+1
| | | |
| | * | net.server_event: Rename conn:port() -> conn:clientport() to match server_selectKim Alvefur2014-03-271-1/+1
| | | |
| * | | Makefile: Change sed regex to be compatible with FreeBSD's odd sed, and ↵Matthew Wild2014-03-301-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 Wild2014-03-301-1/+9
| | | | | | | | | | | | | | | | stanza size limits
| * | | util.xmppstream: Implement stanza size limiting, default limit 10MBMatthew Wild2014-03-301-6/+80
| | | |
| * | | portmanager: Make maximum read size configurable, and default to 4KBMatthew Wild2014-03-301-1/+3
| | | |
| * | | mod_compression: Only allow compression on authenticated streamsKim Alvefur2014-02-181-2/+2
| |/ /
* | | Merge 0.10->trunkKim Alvefur2014-03-255-10/+17
|\ \ \ | | |/ | |/|
| * | Merge 0.9->0.10Kim Alvefur2014-03-253-3/+8
| |\|
| | * prosodyctl: Show real error if certificate config file can't be openedKim Alvefur2014-03-221-1/+6
| | |
| | * modulemanager: Load mod_saslauth on components by defaultKim Alvefur2014-03-221-1/+1
| | |
| | * mod_saslauth: Only do c2s SASL on normal VirtualHostsKim Alvefur2014-03-221-1/+1
| | |
| * | prosody.cfg.lua.dist: mod_posix is enabled by default on posix platforms nowKim Alvefur2014-03-221-1/+1
| | |
| * | util.sasl: Fix logic for when mechanisms with channel binding support are ↵Kim Alvefur2014-03-221-6/+8
| | | | | | | | | | | | offered
* | | Merge 0.10->trunkKim Alvefur2014-03-092-5/+6
|\| |