aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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.
* | | util.indexedbheap: A priority queue implementation with a reverse index with ↵Waqas Hussain2013-10-301-0/+153
| | | | | | | | | | | | no per-entry memory allocation.
* | | Merge 0.10->trunkKim Alvefur2013-10-151-2/+2
|\| |
| * | certmanager: Fix. Again.Kim Alvefur2013-10-151-2/+2
| | |
* | | Merge 0.10->trunkKim Alvefur2013-10-152-48/+53
|\| |
| * | certmanager: Add back single_dh_use and single_ecdh_use to default options ↵Kim Alvefur2013-10-151-2/+6
| | | | | | | | | | | | (Zash breaks, Zash unbreaks)
| * | util.sasl.scram: Rename variable for clarityKim Alvefur2013-10-131-7/+7
| | |
| * | util.sasl.scram: Cache profile name instead of concatenating when usedKim Alvefur2013-10-131-2/+3
| | |
| * | util.sasl.scram: Rewrite patterns and capture client-first-message-bare, ↵Kim Alvefur2013-10-131-5/+6
| | | | | | | | | | | | client-final-message-without-proof
| * | util.sasl.scram: Create the state table as late as possible, keep state in ↵Kim Alvefur2013-10-131-41/+40
| | | | | | | | | | | | locals for faster access
| * | util.sasl.scram: Compare gs2-header to cbind-input (Thanks Tobias)Kim Alvefur2013-10-121-8/+8
| | |
* | | Merge 0.10->trunkMatthew Wild2013-10-102-3/+2
|\| |
| * | Merge 0.9->0.10Matthew Wild2013-10-101-1/+1
| |\|
| | * util.windows: Incorrect output buffer size passed to ↵Waqas Hussain2013-10-101-1/+1
| | | | | | | | | | | | ReadConsoleOutputAttribute (fixes issue#362, thanks yanjun).
| * | util.sasl: Remove unused print() import.Waqas Hussain2013-10-071-1/+0
| | |
| * | util.sasl: Make registerMechanism a public function (again)Waqas Hussain2013-10-071-1/+1
| | |
* | | Merge 0.10->trunkKim Alvefur2013-10-074-1/+5
|\| |
| * | mod_saslauth: Collect data for channel binding only if we know for sure that ↵Kim Alvefur2013-10-071-1/+1
| | | | | | | | | | | | the stream is encrypted
| * | mod_c2s, mod_s2s: Set session.encrypted as session.secure does not allways ↵Kim Alvefur2013-10-073-0/+4
| | | | | | | | | | | | mean encrypted (eg consider_bosh_secure)
* | | Merge 0.10->trunkKim Alvefur2013-10-062-18/+20
|\| |
| * | util.array: Improve array:reverse() and make it work as both method and ↵Kim Alvefur2013-10-061-9/+20
| | | | | | | | | | | | non-mutating function
| * | util.sasl.scram: Remove unused function and importKim Alvefur2013-10-061-9/+0
| | |