aboutsummaryrefslogtreecommitdiffstats
path: root/core
Commit message (Expand)AuthorAgeFilesLines
* Merge 0.10->trunkKim Alvefur2014-05-093-38/+12
|\
| * 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 f...Kim Alvefur2014-05-092-2/+3
| * | core.configmanager: Move path utility functions into util.pathsKim Alvefur2014-05-091-35/+4
* | | Merge 0.10->trunkKim Alvefur2014-04-211-8/+9
|\| |
| * | certmanager: Move ssl.protocol handling to after ssl.options is a table (than...Kim Alvefur2014-04-211-8/+9
* | | Merge 0.10->trunkKim Alvefur2014-04-201-1/+3
|\| |
| * | certmanager: Fix traceback if no global 'ssl' section set (thanks albert)Kim Alvefur2014-04-201-1/+3
* | | 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 pr...Kim Alvefur2014-04-151-2/+13
| * | certmanager: Merge ssl.options, verify etc from core defaults and global ssl ...Kim Alvefur2014-04-151-0/+29
| * | 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 remo...Kim Alvefur2014-04-141-2/+3
* | | Merge 0.10->trunkMatthew Wild2014-04-021-1/+3
|\| |
| * | Merge 0.9->0.10Matthew Wild2014-04-0213-132/+150
| |\ \ | | |/ | |/|
| * | portmanager: Make maximum read size configurable, and default to 4KBMatthew Wild2014-03-301-1/+3
* | | Merge 0.10->trunkKim Alvefur2014-03-251-1/+1
|\ \ \ | | |/ | |/|
| * | Merge 0.9->0.10Kim Alvefur2014-03-251-1/+1
| |\|
| | * modulemanager: Load mod_saslauth on components by defaultKim Alvefur2014-03-221-1/+1
* | | Merge 0.10->trunkKim Alvefur2014-02-031-1/+1
|\| |
| * | modulemanager: Always load a platform-specific module, add stub modules for W...Kim Alvefur2014-01-261-1/+1
* | | Merge 0.10->trunkMatthew Wild2013-11-211-1/+1
|\| |
| * | Merge 0.9->0.10Matthew Wild2013-11-211-1/+1
| |\|
| | * certmanager: Further cipher string tweaking. Re-enable ciphers required for D...Matthew Wild2013-11-211-1/+1
| | * Back out 1b0ac7950129, as SSLv3 appears to still be in moderate use on the ne...Matthew Wild2013-11-121-1/+1
* | | Merge 0.10->trunkMatthew Wild2013-11-101-1/+1
|\| |
| * | Merge 0.9->0.10Matthew Wild2013-11-101-1/+1
| |\|
| | * certmanager: Update default cipher string to prefer forward-secrecy over ciph...Matthew Wild2013-11-101-1/+1
* | | Merge 0.10->trunkMatthew Wild2013-11-091-1/+1
|\| |
| * | Merge 0.9->0.10Matthew Wild2013-11-091-1/+1
| |\|
| | * certmanager: Fix order of options, so that the dynamic option is at the end o...Matthew Wild2013-11-091-1/+1
| | * certmanager: Default to using the server's cipher preference order by default...Matthew 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
|/ /
* | Merge 0.9 -> 0.10Kim Alvefur2013-10-311-1/+1
|\|
| * certmanager: Disable SSLv3 by defaultKim Alvefur2013-10-311-1/+1
| * certmanager: Fix dhparam callback, missing imports (Testing, pfft)Kim Alvefur2013-09-031-3/+5
| * certmanager: Allow for specifying the dhparam option as a path to a file inst...Kim Alvefur2013-09-031-0/+11
| * certmanager: Fix for working around a bug with LuaSec 0.4.1 that causes it to...Matthew Wild2013-09-031-4/+4
* | certmanager: Fix. Again.Kim Alvefur2013-10-151-2/+2
* | certmanager: Add back single_dh_use and single_ecdh_use to default options (Z...Kim Alvefur2013-10-151-2/+6
* | moduleapi: Add module:unhook()Matthew Wild2013-09-161-0/+4
* | certmanager: Allow for specifying the dhparam option as a path to a file inst...Kim Alvefur2013-09-031-2/+17
* | Merge 0.9->trunkMatthew Wild2013-09-031-1/+1
|\|
| * configmanager: Fix checking of absolute paths on WindowsKim Alvefur2013-08-301-1/+1