aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | Merge 0.9->0.10Kim Alvefur2014-04-271-3/+9
|\|
| * util.pposix: Fix error reporting from really old Linux fallocate() that did ↵Kim Alvefur2014-04-251-1/+5
| | | | | | | | not use errno for some reason (thanks pro)
| * util.pposix: Fix error reporting from posix_fallocate, it doesn't use errno ↵Kim Alvefur2014-04-251-2/+4
| | | | | | | | (thanks pro)
* | util.x509: Remove unused importsKim Alvefur2014-04-251-3/+0
| |
* | util.x509: And functions for converting between DER and PEMKim Alvefur2014-04-241-0/+20
| |
* | Merge 0.9->0.10Kim Alvefur2014-04-232-1/+10
|\|
| * util.dataforms: Add support for XEP-0221: Data Forms Media ElementKim Alvefur2014-04-221-0/+9
| |
| * tools/jabberd14sql2prosody: Fix package.path (thanks daurnimator)Kim Alvefur2014-04-221-1/+1
| |
* | mod_s2s: Follow XMPP Core on when a stream is to be considered readyKim Alvefur2014-04-221-1/+11
| |
* | certmanager: Move ssl.protocol handling to after ssl.options is a table ↵Kim Alvefur2014-04-211-8/+9
| | | | | | | | (thanks Ralph)
* | certmanager: Fix traceback if no global 'ssl' section set (thanks albert)Kim Alvefur2014-04-201-1/+3
| |
* | mod_http: Update to disable peer verification with the new certmanagerKim Alvefur2014-04-191-1/+7
| |
* | mod_s2s: Replace open_stream() with function that only adds s2s/dialback ↵Kim Alvefur2014-04-181-14/+2
| | | | | | | | attributes to stream header
* | util.xmppstream: Check for callback that may add stream header attributesKim Alvefur2014-04-181-0/+3
| |
* | net.http.server: Fix some typos introduced in 420c0d3b8583.Daurnimator2014-04-151-4/+3
| |
* | 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
* | net.http.server: Add prepare_header() and finish_response() to allow sending ↵Daurnimator2014-04-151-9/+17
| | | | | | | | chunked responses via the API
* | mod_s2s: Revert e626ee2fe106 change, it broke DialbackKim Alvefur2014-04-101-0/+20
| |
* | 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
| |
* | 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.9->0.10Matthew Wild2014-04-02136-2257/+3484
|\ \ | |/ |/|
| * Merge 0.9->0.10Kim Alvefur2014-03-253-3/+8
| |\
| * | 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.9->0.10Kim Alvefur2014-03-092-5/+6
| |\ \
| * \ \ Merge 0.9->0.10Kim Alvefur2014-02-263-4/+9
| |\ \ \
| * | | | mod_proxy65: Use mod_discoFlorian Zeitz2014-02-191-18/+1
| | | | |
| * | | | mod_auth_interal_hashed: Update salt and iteration count when setting a new ↵Florian Zeitz2014-02-121-5/+7
| | | | | | | | | | | | | | | | | | | | password
| * | | | Merge 0.9 -> 0.10Kim Alvefur2014-02-122-2/+4
| |\ \ \ \
| * | | | | mod_saslauth: Make sure sasl handler has add_cb_handler (fixes #392)Kim Alvefur2014-02-121-1/+1
| | | | | |
| * | | | | mod_storage_sql2: archive:delete() with username = true deletes for all usersKim Alvefur2014-02-091-0/+4
| | | | | |
| * | | | | mod_ping: Use type-specific eventKim Alvefur2014-02-091-6/+3
| | | | | |
| * | | | | Merge 0.9->0.10Kim Alvefur2014-02-061-1/+1
| |\ \ \ \ \
| * \ \ \ \ \ Merge 0.9->0.10Kim Alvefur2014-02-031-1/+1
| |\ \ \ \ \ \