Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge 0.10->trunk | Kim Alvefur | 2014-09-23 | 2 | -2/+4 |
|\ | |||||
| * | core.module{manager,api}: Fix for 010b141e91ed (Thanks v1ct0r) | Kim Alvefur | 2014-09-23 | 2 | -2/+4 |
| | | |||||
* | | Merge 0.10->trunk | Kim Alvefur | 2014-09-18 | 2 | -4/+8 |
|\| | |||||
| * | core.modulemanager, core.moduleapi: Hack around dependency loop | Kim Alvefur | 2014-09-17 | 2 | -3/+6 |
| | | |||||
| * | core.moduleapi: Use require instead of global to get storagemanager in ↵ | Kim Alvefur | 2014-09-17 | 1 | -1/+2 |
| | | | | | | | | module:open_store() | ||||
* | | Merge 0.10->trunk | Kim Alvefur | 2014-09-11 | 2 | -6/+59 |
|\ \ | |/ |/| | |||||
| * | Merge 0.10->trunk | Matthew Wild | 2014-08-28 | 1 | -1/+1 |
| |\ | |||||
| * | | storagemanager: Fix map store shim if store is empty | Kim Alvefur | 2014-08-08 | 1 | -1/+1 |
| | | | |||||
| * | | core/storagemanager: When map store isn't available, fallback to keyval store | daurnimator | 2014-08-07 | 1 | -0/+33 |
| | | | |||||
| * | | Merge 0.10->trunk | Matthew Wild | 2014-07-31 | 1 | -0/+5 |
| |\ \ | |||||
| * \ \ | Merge 0.10->trunk | Kim Alvefur | 2014-07-25 | 1 | -1/+1 |
| |\ \ \ | |||||
| * \ \ \ | Merge 0.10->trunk | Kim Alvefur | 2014-07-04 | 3 | -101/+27 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge 0.10->trunk | Kim Alvefur | 2014-05-09 | 3 | -38/+12 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge 0.10->trunk | Kim Alvefur | 2014-04-21 | 1 | -8/+9 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge 0.10->trunk | Kim Alvefur | 2014-04-20 | 1 | -1/+3 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge 0.10->trunk | Kim Alvefur | 2014-04-15 | 1 | -12/+68 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge 0.10->trunk | Matthew Wild | 2014-04-02 | 1 | -1/+3 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | Merge 0.10->trunk | Kim Alvefur | 2014-03-25 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ | Merge 0.10->trunk | Kim Alvefur | 2014-02-03 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ | Merge 0.10->trunk | Matthew Wild | 2013-11-21 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ | Merge 0.10->trunk | Matthew Wild | 2013-11-10 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge 0.10->trunk | Matthew Wild | 2013-11-09 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | core.moduleapi: Fix some global accesses. | Waqas Hussain | 2013-11-06 | 1 | -2/+3 |
| | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | core/moduleapi: Return timer object from module:add_timer | daurnimator | 2013-11-06 | 1 | -5/+24 |
| | | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | core.sessionmanager: Set a fake thread on destroyed sessions, fixes ↵ | Kim Alvefur | 2014-09-11 | 1 | -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 Alvefur | 2014-09-09 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | stanza_router | ||||
* | | | | | | | | | | | | | | | | Merge 0.9->0.10 | Kim Alvefur | 2014-09-09 | 1 | -21/+24 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | core.stanza_router: Stricter validation of stanzas | Kim Alvefur | 2014-09-09 | 1 | -21/+24 |
| | | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | Merge 0.9->0.10 | Matthew Wild | 2014-08-28 | 1 | -1/+1 |
|\| | | | | | | | | | | | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | modulemanager: Reduce warning to debug level message about modules already ↵ | Kim Alvefur | 2014-08-27 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | being loaded, it's probably just module:depends() | ||||
* | | | | | | | | | | | | | | | Merge 0.9->0.10 | Matthew Wild | 2014-07-31 | 1 | -0/+5 |
|\| | | | | | | | | | | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | configmanager: nameprep VirtualHost and Component names | Matthew Wild | 2014-07-31 | 1 | -0/+5 |
| | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | mod_s2s_auth_certs: Split PKIX based certificate checking from mod_s2s into ↵ | Kim Alvefur | 2014-07-25 | 1 | -1/+1 |
| |_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | new plugin | ||||
* | | | | | | | | | | | | | hostmanager, mod_dialback: Move generation of dialback secret out of core | Kim Alvefur | 2014-05-22 | 1 | -1/+0 |
| | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | core.portmanager: Simplify and take advantage of new ssl config merging in ↵ | Kim Alvefur | 2014-07-03 | 1 | -28/+9 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | certmanager | ||||
* | | | | | | | | | | | | | core.certmanager: Make create_context() support an arbitrary number of ↵ | Kim Alvefur | 2014-07-03 | 1 | -3/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | option sets, merging all | ||||
* | | | | | | | | | | | | | core.certmanager: Use util.sslconfig | Kim Alvefur | 2014-07-03 | 1 | -71/+14 |
| |_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | |||||
* | | | | | | | | | | | | Merge 0.9->0.10 | Kim Alvefur | 2014-05-09 | 1 | -1/+5 |
|\| | | | | | | | | | | | |||||
| * | | | | | | | | | | | configmanager: Delay importing LuaFileSystem until needed by an Include line | Kim Alvefur | 2014-05-09 | 1 | -1/+5 |
| | | | | | | | | | | | | |||||
* | | | | | | | | | | | | core.certmanager, core.moduleapi, mod_storage_sql, mod_storage_sql2: Import ↵ | Kim Alvefur | 2014-05-09 | 2 | -2/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | from util.paths | ||||
* | | | | | | | | | | | | core.configmanager: Move path utility functions into util.paths | Kim Alvefur | 2014-05-09 | 1 | -35/+4 |
| |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | |||||
* | | | | | | | | | | | 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 |
| |_|_|_|_|_|_|_|/ |/| | | | | | | | | |||||
* | | | | | | | | | 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 |
| | | | | | | | | |