aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge 0.10->trunkKim Alvefur2013-11-244-37/+25
|\
| * Merge 0.9->0.10Kim Alvefur2013-11-244-37/+25
| |\
| | * Makefile, certs: Generate example certificates on build, remove the old ↵Kim Alvefur2013-11-224-37/+25
| | | | | | | | | | | | static one
* | | 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 ↵Matthew Wild2013-11-211-1/+1
| | | | | | | | | | | | DSA and ECDH certs/keys.
* | | Merge 0.10->trunkKim Alvefur2013-11-131-1/+1
|\| |
| * | util.sql: Fix previous commitKim Alvefur2013-11-121-1/+1
| | |
| * | util.sql: Get character set info from the correct database.Kim Alvefur2013-11-121-1/+1
| | |
* | | Merge 0.10->trunkMatthew Wild2013-11-120-0/+0
|\| |
| * | Merge 0.9->0.10Matthew Wild2013-11-120-0/+0
| |\|
| | * Back out 1b0ac7950129, as SSLv3 appears to still be in moderate use on the ↵Matthew Wild2013-11-121-1/+1
| | | | | | | | | | | | network. Also, although obsolete, SSLv3 isn't documented to have any weaknesses that TLS 1.0 (the most common version used today) doesn't also have. Get your act together clients!
* | | Merge 0.10->trunkKim Alvefur2013-11-112-4/+5
|\| |
| * | mod_storage_sql2: Auto increment columns won't be NULL, so drop nullable=falseKim Alvefur2013-11-111-1/+1
| | |
| * | util.sql: Rewrite auto increment columns to SERIAL for PostgreSQLKim Alvefur2013-11-111-3/+4
| | |
* | | Merge 0.10->trunkMatthew Wild2013-11-101-1/+1
|\| |
| * | util.sql: Fix to call execute on 'self' rather than 'engine' (thanks eisensheng)Matthew Wild2013-11-101-1/+1
| | |
* | | Merge 0.10->trunkMatthew Wild2013-11-102-2/+2
|\| |
| * | Merge 0.9->0.10Matthew Wild2013-11-102-2/+2
| |\|
| | * certmanager: Update default cipher string to prefer forward-secrecy over ↵Matthew Wild2013-11-101-1/+1
| | | | | | | | | | | | cipher strength and to disable triple-DES (weaker and much slower than AES)
| | * util.set: Remove unused variableMatthew Wild2013-11-101-1/+1
| | |
* | | Merge 0.10->trunkMatthew Wild2013-11-092-2/+2
|\| |
| * | Merge 0.9->0.10Matthew Wild2013-11-091-1/+1
| |\|
| | * certmanager: Fix order of options, so that the dynamic option is at the end ↵Matthew Wild2013-11-091-1/+1
| | | | | | | | | | | | of the array
| | * certmanager: Default to using the server's cipher preference order by ↵Matthew Wild2013-11-091-1/+1
| | | | | | | | | | | | default, as clients have been shown to commonly select weak and insecure ciphers even when they support stronger ones
| * | mod_storage_sql2: Fix backwards comparison of timestampKim Alvefur2013-11-071-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
| | |
* | | util/timer: Re-set params when timer is rescheduleddaurnimator2013-11-061-0/+1
| | |
* | | Merge 0.10 -> trunkKim Alvefur2013-10-313-65/+73
|\| |
| * | Merge 0.9 -> 0.10Kim Alvefur2013-10-311-1/+1
| |\|
| | * certmanager: Disable SSLv3 by defaultKim Alvefur2013-10-311-1/+1
| | |
| * | mod_storage_sql2: Switch to the util.sql table definition for the main tableKim Alvefur2013-10-311-21/+1
| | |
| * | mod_storage_sql2: The prosodyarchive_index should be uniqueKim Alvefur2013-10-301-1/+1
| | |
| * | mod_storage_sql2: Use primary_key and auto_increment flags instead of baking ↵Kim Alvefur2013-10-301-1/+1
| | | | | | | | | | | | that into the type
| * | mod_storage_sql2: Use MEDIUMTEXT fields for value columns (ie TEXT on non-MySQL)Kim Alvefur2013-10-301-2/+2
| | |
| * | util.sql: Rewrite MEDIUMTEXT to TEXT for drivers other than MySQLKim Alvefur2013-10-301-1/+5
| | |
| * | util.sql: Check what encoding SQLite3 usesKim Alvefur2013-10-291-1/+7
| | |
| * | util.sql: Find out if MySQL supports utf8mb4 and use thatKim Alvefur2013-10-291-6/+11
| | |
| * | util.sql: Support incrementing columnsKim Alvefur2013-10-281-0/+9
| | |
| * | util.sql: Allow columns to be marked the primary keyKim Alvefur2013-10-281-0/+1
| | |
| * | util.sql: Allow creating unique indicesKim Alvefur2013-10-281-0/+3
| | |
| * | mod_storage_sql2: Move checking of the sql_manage_tables option so it also ↵Kim Alvefur2013-10-281-7/+6
| | | | | | | | | | | | includes table upgrades (again)
| * | mod_storage_sql2, util.sql: Move code for setting encoding to util.sqlKim Alvefur2013-10-282-12/+13
| | |
| * | mod_storage_sql2: Move all schema upgrade code to the same placeKim Alvefur2013-10-281-22/+20
| | |
| * | mod_storage_sql2: Split up setting of encoding and table upgrade codeKim Alvefur2013-10-281-1/+3
| | |
* | | util.timer: Import all require upvalues.Waqas Hussain2013-10-301-1/+4
| | |
* | | util.timer: Fix another variable name typo (thanks again zash).Waqas Hussain2013-10-301-2/+2
| | |
* | | util.timer: Fix variable name typo.Waqas Hussain2013-10-301-2/+2
| | |
* | | util.timer: Updated to use util.indexedbheap to provide a more complete API. ↵Waqas Hussain2013-10-301-1/+57
| | | | | | | | | | | | Timers can now be stopped or rescheduled. Callbacks are now pcall'd. Adding/removing timers from within timer callbacks works better. Optional parameter can be passed when creating timer which gets passed to callback, eliminating the need for closures in various timer uses. Timers are now much more lightweight.