Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge 0.10->trunk | Kim Alvefur | 2015-12-06 | 1 | -25/+64 |
|\ | |||||
| * | mod_blocklist: Update Copyright header | Kim Alvefur | 2015-12-06 | 1 | -1/+1 |
| | | |||||
| * | mod_blocklist: Skip creating some tables and some processing if unblocking | Kim Alvefur | 2015-12-06 | 1 | -8/+9 |
| | | |||||
| * | mod_blocklist: When blocking someone who sent a subscription request, forget ↵ | Kim Alvefur | 2015-12-06 | 1 | -1/+20 |
| | | | | | | | | that request since the user would be unable to deny it while blocked (Fixes #574) | ||||
| * | mod_blocklist: Restructure how we keep track of where to send unavailable ↵ | Kim Alvefur | 2015-12-06 | 1 | -3/+13 |
| | | | | | | | | presence | ||||
| * | mod_blocklist: session[username] can't possibly be unset if that user is ↵ | Kim Alvefur | 2015-12-06 | 1 | -10/+9 |
| | | | | | | | | sending queries | ||||
| * | mod_blocklist: Add comments describing some variables | Kim Alvefur | 2015-12-06 | 1 | -2/+2 |
| | | |||||
| * | mod_blocklist: Expand comments on caching of blocklists | Kim Alvefur | 2015-12-06 | 1 | -3/+9 |
| | | |||||
| * | mod_blocklist: Add comment about compliance issue #575 | Kim Alvefur | 2015-12-06 | 1 | -0/+3 |
| | | |||||
| * | mod_blocklist: Rename variable for clarity | Kim Alvefur | 2015-12-06 | 1 | -5/+5 |
| | | |||||
| * | mod_blocklist: Clear second level cache when user is deleted | Kim Alvefur | 2015-12-05 | 1 | -0/+1 |
| | | |||||
* | | Backout unintentional commit ed5440a6ef7f | Matthew Wild | 2015-12-03 | 1 | -1/+7 |
| | | |||||
* | | Merge 0.10->trunk | Matthew Wild | 2015-12-03 | 1 | -0/+1 |
|\| | |||||
| * | net.http.server: Import util.cache | Matthew Wild | 2015-12-03 | 1 | -0/+1 |
| | | |||||
* | | Merge 0.10->trunk | Matthew Wild | 2015-12-03 | 1 | -7/+1 |
| | | |||||
* | | Merge... | Kim Alvefur | 2015-12-03 | 1 | -2/+25 |
|\| | |||||
| * | Merge | Kim Alvefur | 2015-12-03 | 1 | -1/+35 |
| |\ | |||||
| * | | prosodyctl check: Point out that authentication and storage modules should ↵ | Kim Alvefur | 2015-12-03 | 1 | -0/+14 |
| | | | | | | | | | | | | not be added to modules_enabled (fixes #570) | ||||
| * | | prosodyctl check: Point out items in the modules_enabled list that ↵ | Kim Alvefur | 2015-12-03 | 1 | -0/+9 |
| | | | | | | | | | | | | incorrectly include the 'mod_' prefix | ||||
| * | | prosodyctl check: Really store imported LuaSec (must be a leftover from ↵ | Kim Alvefur | 2015-12-03 | 1 | -1/+1 |
| | | | | | | | | | | | | debugging) | ||||
| * | | prosodyctl check: Include global options when checking "all options" | Kim Alvefur | 2015-12-03 | 1 | -1/+1 |
| | | | |||||
* | | | mod_storage_sql2: Remove from trunk (all trunk-only changes backported) | Matthew Wild | 2015-12-03 | 1 | -476/+0 |
| | | | |||||
* | | | Merge 0.10->trunk | Matthew Wild | 2015-12-03 | 1 | -1/+35 |
|\ \ \ | | |/ | |/| | |||||
| * | | mod_storage_sql: Add map store (backported from trunk) | Matthew Wild | 2015-12-03 | 1 | -0/+34 |
| | | | |||||
| * | | mod_storage_sql: Whitespace fix (backported from trunk) | Matthew Wild | 2015-12-03 | 1 | -1/+1 |
| |/ | |||||
* | | Merge 0.10->trunk | Matthew Wild | 2015-12-03 | 5 | -316/+778 |
|\| | |||||
| * | storagemanager, mod_storage_sql, mod_storage_sql2: Rename mod_storage_sql2 ↵ | Matthew Wild | 2015-12-03 | 4 | -750/+766 |
| | | | | | | | | -> mod_storage_sql, mod_storage_sql -> mod_storage_sql1 (temporarily), and emit warning for configs using sql2 | ||||
| * | net.http.server: Use new util.cache to remember wildcard event handlers | Matthew Wild | 2015-12-03 | 1 | -5/+5 |
| | | |||||
| * | storagemanager: Split config retrieval into its own function | Matthew Wild | 2015-12-03 | 1 | -2/+6 |
| | | |||||
| * | mod_proxy65: Use typed config API (fix issues when options are set to ↵ | Kim Alvefur | 2015-12-03 | 1 | -2/+2 |
| | | | | | | | | unexpected types) | ||||
* | | Merge 0.10->trunk | Matthew Wild | 2015-11-26 | 6 | -37/+300 |
|\| | |||||
| * | tests: Add tests for util.cache | Matthew Wild | 2015-11-26 | 2 | -0/+175 |
| | | |||||
| * | util.cache: Small update to prefix private fields with an underscore, add a ↵ | Matthew Wild | 2015-11-26 | 1 | -32/+43 |
| | | | | | | | | :count() method (same as util.queue) and add an optional on_evict callback | ||||
| * | mod_blocklist: Use util.cache to manage how many users blocklists are kept ↵ | Kim Alvefur | 2015-11-25 | 1 | -7/+13 |
| | | | | | | | | in memory | ||||
| * | util.cache: Make sure cache size is specified as an integer | Kim Alvefur | 2015-11-25 | 1 | -0/+2 |
| | | |||||
| * | util.pposix: Expose the uname GNU extension field 'domainname' | Kim Alvefur | 2015-11-25 | 1 | -0/+4 |
| | | |||||
| * | util.session: How would you even send anything to a session? | Kim Alvefur | 2015-11-24 | 1 | -0/+32 |
| | | |||||
| * | util.session: How does a session relate do a connection? | Kim Alvefur | 2015-11-24 | 1 | -0/+7 |
| | | |||||
| * | util.session: What does the session say? | Kim Alvefur | 2015-11-24 | 1 | -0/+8 |
| | | |||||
| * | util.session: What is the identity of a session? | Kim Alvefur | 2015-11-24 | 1 | -0/+7 |
| | | |||||
| * | util.session: What is a session? | Kim Alvefur | 2015-11-24 | 1 | -0/+11 |
| | | |||||
* | | mod_admin_telnet: Add timer:info() which shows some basic info about util.timer | Kim Alvefur | 2015-11-25 | 1 | -0/+32 |
| | | |||||
* | | Merge | Matthew Wild | 2015-11-24 | 2 | -3/+22 |
|\ \ | |||||
| * | | util.timer: If possible, close the existing timer handle in order to have ↵ | Kim Alvefur | 2015-11-22 | 1 | -2/+8 |
| | | | | | | | | | | | | only one | ||||
| * | | util.timer: Expire timer instance if another instance is already set to take ↵ | Kim Alvefur | 2015-11-22 | 1 | -2/+11 |
| | | | | | | | | | | | | care of the next scheduled event | ||||
| * | | util.timer: Keep count of how many timer instances are active | Kim Alvefur | 2015-11-22 | 1 | -0/+3 |
| | | | |||||
| * | | net.server_event: Return event handle from add_task so it can be closed by ↵ | Kim Alvefur | 2015-11-22 | 1 | -0/+1 |
| | | | | | | | | | | | | eg util.timer | ||||
* | | | Merge 0.10->trunk | Matthew Wild | 2015-11-24 | 1 | -0/+91 |
|\ \ \ | |/ / |/| / | |/ | |||||
| * | util.cache: Ordered key->value data structure, with size limit (same as pubsub) | Matthew Wild | 2015-11-24 | 1 | -0/+91 |
| | | |||||
* | | Merge 0.10->trunk | Matthew Wild | 2015-11-22 | 2 | -4/+4 |
|\| |