aboutsummaryrefslogtreecommitdiffstats
path: root/core
Commit message (Collapse)AuthorAgeFilesLines
* Merge 0.10->trunkKim Alvefur2014-09-182-4/+8
|\
| * core.modulemanager, core.moduleapi: Hack around dependency loopKim Alvefur2014-09-172-3/+6
| |
| * core.moduleapi: Use require instead of global to get storagemanager in ↵Kim Alvefur2014-09-171-1/+2
| | | | | | | | module:open_store()
* | Merge 0.10->trunkKim Alvefur2014-09-112-6/+59
|\ \ | |/ |/|
| * Merge 0.10->trunkMatthew Wild2014-08-281-1/+1
| |\
| * | storagemanager: Fix map store shim if store is emptyKim Alvefur2014-08-081-1/+1
| | |
| * | core/storagemanager: When map store isn't available, fallback to keyval storedaurnimator2014-08-071-0/+33
| | |
| * | Merge 0.10->trunkMatthew Wild2014-07-311-0/+5
| |\ \
| * \ \ Merge 0.10->trunkKim Alvefur2014-07-251-1/+1
| |\ \ \
| * \ \ \ Merge 0.10->trunkKim Alvefur2014-07-043-101/+27
| |\ \ \ \
| * \ \ \ \ Merge 0.10->trunkKim Alvefur2014-05-093-38/+12
| |\ \ \ \ \
| * \ \ \ \ \ Merge 0.10->trunkKim Alvefur2014-04-211-8/+9
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge 0.10->trunkKim Alvefur2014-04-201-1/+3
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge 0.10->trunkKim Alvefur2014-04-151-12/+68
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge 0.10->trunkMatthew Wild2014-04-021-1/+3
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge 0.10->trunkKim Alvefur2014-03-251-1/+1
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge 0.10->trunkKim Alvefur2014-02-031-1/+1
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge 0.10->trunkMatthew Wild2013-11-211-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge 0.10->trunkMatthew Wild2013-11-101-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge 0.10->trunkMatthew Wild2013-11-091-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | core.moduleapi: Fix some global accesses.Waqas Hussain2013-11-061-2/+3
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | core/moduleapi: Return timer object from module:add_timerdaurnimator2013-11-061-5/+24
| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | core.sessionmanager: Set a fake thread on destroyed sessions, fixes ↵Kim Alvefur2014-09-111-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | traceback if stanzas are emitted after a session is destroyed (thanks Sven Blumenstein)
* | | | | | | | | | | | | | | | core.stanza_router, mod_s2s: Move handling of S2S features to mod_s2s from ↵Kim Alvefur2014-09-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | stanza_router
* | | | | | | | | | | | | | | | Merge 0.9->0.10Kim Alvefur2014-09-091-21/+24
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | core.stanza_router: Stricter validation of stanzasKim Alvefur2014-09-091-21/+24
| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge 0.9->0.10Matthew Wild2014-08-281-1/+1
|\| | | | | | | | | | | | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | modulemanager: Reduce warning to debug level message about modules already ↵Kim Alvefur2014-08-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | being loaded, it's probably just module:depends()
* | | | | | | | | | | | | | | Merge 0.9->0.10Matthew Wild2014-07-311-0/+5
|\| | | | | | | | | | | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | configmanager: nameprep VirtualHost and Component namesMatthew Wild2014-07-311-0/+5
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | mod_s2s_auth_certs: Split PKIX based certificate checking from mod_s2s into ↵Kim Alvefur2014-07-251-1/+1
| |_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | new plugin
* | | | | | | | | | | | | hostmanager, mod_dialback: Move generation of dialback secret out of coreKim Alvefur2014-05-221-1/+0
| | | | | | | | | | | | |
* | | | | | | | | | | | | core.portmanager: Simplify and take advantage of new ssl config merging in ↵Kim Alvefur2014-07-031-28/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | certmanager
* | | | | | | | | | | | | core.certmanager: Make create_context() support an arbitrary number of ↵Kim Alvefur2014-07-031-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | option sets, merging all
* | | | | | | | | | | | | core.certmanager: Use util.sslconfigKim Alvefur2014-07-031-71/+14
| |_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | |
* | | | | | | | | | | | Merge 0.9->0.10Kim Alvefur2014-05-091-1/+5
|\| | | | | | | | | | |
| * | | | | | | | | | | configmanager: Delay importing LuaFileSystem until needed by an Include lineKim Alvefur2014-05-091-1/+5
| | | | | | | | | | | |
* | | | | | | | | | | | core.certmanager, core.moduleapi, mod_storage_sql, mod_storage_sql2: Import ↵Kim Alvefur2014-05-092-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | from util.paths
* | | | | | | | | | | | core.configmanager: Move path utility functions into util.pathsKim Alvefur2014-05-091-35/+4
| |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | |
* | | | | | | | | | | 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
| |_|_|_|_|_|_|_|/ |/| | | | | | | |
* | | | | | | | | 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.9->0.10Matthew Wild2014-04-0213-132/+150
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | / | | |_|_|_|_|/ | |/| | | | |