Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge 0.10->trunk | Matthew Wild | 2013-11-09 | 2 | -2/+2 |
|\ | |||||
| * | Merge 0.9->0.10 | Matthew Wild | 2013-11-09 | 1 | -1/+1 |
| |\ | |||||
| | * | certmanager: Fix order of options, so that the dynamic option is at the end ↵ | Matthew Wild | 2013-11-09 | 1 | -1/+1 |
| | | | | | | | | | | | | of the array | ||||
| | * | certmanager: Default to using the server's cipher preference order by ↵ | Matthew Wild | 2013-11-09 | 1 | -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 timestamp | Kim Alvefur | 2013-11-07 | 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 |
| | | | |||||
* | | | util/timer: Re-set params when timer is rescheduled | daurnimator | 2013-11-06 | 1 | -0/+1 |
| | | | |||||
* | | | Merge 0.10 -> trunk | Kim Alvefur | 2013-10-31 | 3 | -65/+73 |
|\| | | |||||
| * | | Merge 0.9 -> 0.10 | Kim Alvefur | 2013-10-31 | 1 | -1/+1 |
| |\| | |||||
| | * | certmanager: Disable SSLv3 by default | Kim Alvefur | 2013-10-31 | 1 | -1/+1 |
| | | | |||||
| * | | mod_storage_sql2: Switch to the util.sql table definition for the main table | Kim Alvefur | 2013-10-31 | 1 | -21/+1 |
| | | | |||||
| * | | mod_storage_sql2: The prosodyarchive_index should be unique | Kim Alvefur | 2013-10-30 | 1 | -1/+1 |
| | | | |||||
| * | | mod_storage_sql2: Use primary_key and auto_increment flags instead of baking ↵ | Kim Alvefur | 2013-10-30 | 1 | -1/+1 |
| | | | | | | | | | | | | that into the type | ||||
| * | | mod_storage_sql2: Use MEDIUMTEXT fields for value columns (ie TEXT on non-MySQL) | Kim Alvefur | 2013-10-30 | 1 | -2/+2 |
| | | | |||||
| * | | util.sql: Rewrite MEDIUMTEXT to TEXT for drivers other than MySQL | Kim Alvefur | 2013-10-30 | 1 | -1/+5 |
| | | | |||||
| * | | util.sql: Check what encoding SQLite3 uses | Kim Alvefur | 2013-10-29 | 1 | -1/+7 |
| | | | |||||
| * | | util.sql: Find out if MySQL supports utf8mb4 and use that | Kim Alvefur | 2013-10-29 | 1 | -6/+11 |
| | | | |||||
| * | | util.sql: Support incrementing columns | Kim Alvefur | 2013-10-28 | 1 | -0/+9 |
| | | | |||||
| * | | util.sql: Allow columns to be marked the primary key | Kim Alvefur | 2013-10-28 | 1 | -0/+1 |
| | | | |||||
| * | | util.sql: Allow creating unique indices | Kim Alvefur | 2013-10-28 | 1 | -0/+3 |
| | | | |||||
| * | | mod_storage_sql2: Move checking of the sql_manage_tables option so it also ↵ | Kim Alvefur | 2013-10-28 | 1 | -7/+6 |
| | | | | | | | | | | | | includes table upgrades (again) | ||||
| * | | mod_storage_sql2, util.sql: Move code for setting encoding to util.sql | Kim Alvefur | 2013-10-28 | 2 | -12/+13 |
| | | | |||||
| * | | mod_storage_sql2: Move all schema upgrade code to the same place | Kim Alvefur | 2013-10-28 | 1 | -22/+20 |
| | | | |||||
| * | | mod_storage_sql2: Split up setting of encoding and table upgrade code | Kim Alvefur | 2013-10-28 | 1 | -1/+3 |
| | | | |||||
* | | | util.timer: Import all require upvalues. | Waqas Hussain | 2013-10-30 | 1 | -1/+4 |
| | | | |||||
* | | | util.timer: Fix another variable name typo (thanks again zash). | Waqas Hussain | 2013-10-30 | 1 | -2/+2 |
| | | | |||||
* | | | util.timer: Fix variable name typo. | Waqas Hussain | 2013-10-30 | 1 | -2/+2 |
| | | | |||||
* | | | util.timer: Updated to use util.indexedbheap to provide a more complete API. ↵ | Waqas Hussain | 2013-10-30 | 1 | -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 Hussain | 2013-10-30 | 1 | -0/+153 |
| | | | | | | | | | | | | no per-entry memory allocation. | ||||
* | | | Merge 0.10->trunk | Kim Alvefur | 2013-10-15 | 1 | -2/+2 |
|\| | | |||||
| * | | certmanager: Fix. Again. | Kim Alvefur | 2013-10-15 | 1 | -2/+2 |
| | | | |||||
* | | | Merge 0.10->trunk | Kim Alvefur | 2013-10-15 | 2 | -48/+53 |
|\| | | |||||
| * | | certmanager: Add back single_dh_use and single_ecdh_use to default options ↵ | Kim Alvefur | 2013-10-15 | 1 | -2/+6 |
| | | | | | | | | | | | | (Zash breaks, Zash unbreaks) | ||||
| * | | util.sasl.scram: Rename variable for clarity | Kim Alvefur | 2013-10-13 | 1 | -7/+7 |
| | | | |||||
| * | | util.sasl.scram: Cache profile name instead of concatenating when used | Kim Alvefur | 2013-10-13 | 1 | -2/+3 |
| | | | |||||
| * | | util.sasl.scram: Rewrite patterns and capture client-first-message-bare, ↵ | Kim Alvefur | 2013-10-13 | 1 | -5/+6 |
| | | | | | | | | | | | | client-final-message-without-proof | ||||
| * | | util.sasl.scram: Create the state table as late as possible, keep state in ↵ | Kim Alvefur | 2013-10-13 | 1 | -41/+40 |
| | | | | | | | | | | | | locals for faster access | ||||
| * | | util.sasl.scram: Compare gs2-header to cbind-input (Thanks Tobias) | Kim Alvefur | 2013-10-12 | 1 | -8/+8 |
| | | | |||||
* | | | Merge 0.10->trunk | Matthew Wild | 2013-10-10 | 2 | -3/+2 |
|\| | | |||||
| * | | Merge 0.9->0.10 | Matthew Wild | 2013-10-10 | 1 | -1/+1 |
| |\| | |||||
| | * | util.windows: Incorrect output buffer size passed to ↵ | Waqas Hussain | 2013-10-10 | 1 | -1/+1 |
| | | | | | | | | | | | | ReadConsoleOutputAttribute (fixes issue#362, thanks yanjun). | ||||
| * | | util.sasl: Remove unused print() import. | Waqas Hussain | 2013-10-07 | 1 | -1/+0 |
| | | | |||||
| * | | util.sasl: Make registerMechanism a public function (again) | Waqas Hussain | 2013-10-07 | 1 | -1/+1 |
| | | | |||||
* | | | Merge 0.10->trunk | Kim Alvefur | 2013-10-07 | 4 | -1/+5 |
|\| | | |||||
| * | | mod_saslauth: Collect data for channel binding only if we know for sure that ↵ | Kim Alvefur | 2013-10-07 | 1 | -1/+1 |
| | | | | | | | | | | | | the stream is encrypted | ||||
| * | | mod_c2s, mod_s2s: Set session.encrypted as session.secure does not allways ↵ | Kim Alvefur | 2013-10-07 | 3 | -0/+4 |
| | | | | | | | | | | | | mean encrypted (eg consider_bosh_secure) | ||||
* | | | Merge 0.10->trunk | Kim Alvefur | 2013-10-06 | 2 | -18/+20 |
|\| | | |||||
| * | | util.array: Improve array:reverse() and make it work as both method and ↵ | Kim Alvefur | 2013-10-06 | 1 | -9/+20 |
| | | | | | | | | | | | | non-mutating function | ||||
| * | | util.sasl.scram: Remove unused function and import | Kim Alvefur | 2013-10-06 | 1 | -9/+0 |
| | | |