Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Backout unintentional commit ed5440a6ef7f | Matthew Wild | 2015-12-03 | 1 | -1/+7 |
| | |||||
* | Merge 0.10->trunk | Matthew Wild | 2015-12-03 | 1 | -7/+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 | 3 | -309/+751 |
|\| | |||||
| * | storagemanager, mod_storage_sql, mod_storage_sql2: Rename mod_storage_sql2 ↵ | Matthew Wild | 2015-12-03 | 3 | -749/+749 |
| | | | | | | | | -> mod_storage_sql, mod_storage_sql -> mod_storage_sql1 (temporarily), and emit warning for configs using sql2 | ||||
| * | 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 | 1 | -7/+13 |
|\| | |||||
| * | mod_blocklist: Use util.cache to manage how many users blocklists are kept ↵ | Kim Alvefur | 2015-11-25 | 1 | -7/+13 |
| | | | | | | | | in memory | ||||
* | | mod_admin_telnet: Add timer:info() which shows some basic info about util.timer | Kim Alvefur | 2015-11-25 | 1 | -0/+32 |
| | | |||||
* | | Merge 0.10->trunk | Matthew Wild | 2015-11-22 | 1 | -0/+3 |
|\| | |||||
| * | mod_admin_telnet: c2s:show(): Add flag to indicate remote sessions | Matthew Wild | 2015-11-22 | 1 | -0/+3 |
| | | |||||
* | | Merge 0.10->trunk | Matthew Wild | 2015-11-17 | 1 | -1/+1 |
|\| | |||||
| * | Merge 0.9->0.10 | Matthew Wild | 2015-11-17 | 1 | -1/+1 |
| |\ | |||||
| | * | muc.lib: Fix pattern so that it doesn't match hashes containing null bytes, ↵ | Matthew Wild | 2015-11-17 | 1 | -1/+1 |
| | | | | | | | | | | | | causing dropped stanzas (thanks Jitsi folk!) | ||||
* | | | Merge 0.10->trunk | Kim Alvefur | 2015-11-09 | 3 | -8/+16 |
|\| | | |||||
| * | | mod_tls: Fix ssl option fallback to a "parent" host if current host does not ↵ | Kim Alvefur | 2015-11-09 | 1 | -2/+2 |
| | | | | | | | | | | | | have ssl options set (thanks 70b1) | ||||
| * | | mod_tls: Remove unused reference to global ssl config option (certmanager ↵ | Kim Alvefur | 2015-11-09 | 1 | -1/+0 |
| | | | | | | | | | | | | adds that to the context) | ||||
| * | | mod_s2s/s2sout: Keep SRV lookup response around even if it's empty | Kim Alvefur | 2015-11-05 | 1 | -2/+3 |
| | | | |||||
| * | | mod_component: Add config option for deciding what happens if a component ↵ | Kim Alvefur | 2015-10-21 | 1 | -3/+11 |
| | | | | | | | | | | | | connects while already connected (fixes #525) | ||||
* | | | MUC: Reject muc:admin query with missing <item> child | Kim Alvefur | 2015-10-18 | 1 | -0/+3 |
| | | | |||||
* | | | Merge 0.10->trunk | Kim Alvefur | 2015-10-11 | 2 | -1/+5 |
|\| | | |||||
| * | | mod_s2s: Fire global event for stream features where the remote server has ↵ | Kim Alvefur | 2015-10-11 | 1 | -0/+1 |
| | | | | | | | | | | | | not sent the 'to' stream attribute | ||||
| * | | mod_websocket: Silence luacheck warnings | Kim Alvefur | 2015-10-06 | 1 | -1/+2 |
| | | | |||||
| * | | mod_websocket: Import util.timer and session close timeout config option ↵ | Kim Alvefur | 2015-10-06 | 1 | -0/+2 |
| | | | | | | | | | | | | (thanks fairuz) | ||||
* | | | Merge 0.10->trunk | Kim Alvefur | 2015-09-27 | 2 | -24/+24 |
|\| | | |||||
| * | | Merge 0.9->0.10 | Kim Alvefur | 2015-09-27 | 1 | -2/+2 |
| |\| | |||||
| | * | mod_http_files: Translate forward slashes to local directory separators | Kim Alvefur | 2015-09-26 | 1 | -1/+1 |
| | | | |||||
| | * | mod_http_files: Strip trailing directory separator regardless of ↵ | Kim Alvefur | 2015-09-26 | 1 | -1/+1 |
| | | | | | | | | | | | | directionality of the slash (fixes #545) | ||||
| * | | mod_posix: Detect failure to load util.signal by first pcall return value ↵ | Kim Alvefur | 2015-09-26 | 1 | -3/+3 |
| | | | | | | | | | | | | not by type of the second | ||||
| * | | mod_posix: Normalize indentation | Kim Alvefur | 2015-09-26 | 1 | -19/+19 |
| | | | |||||
* | | | Merge 0.10->trunk | Kim Alvefur | 2015-09-25 | 1 | -0/+16 |
|\| | | |||||
| * | | Merge 0.9->0.10 | Matthew Wild | 2015-09-25 | 1 | -0/+16 |
| |\| | |||||
| | * | mod_pep: Don't store contacts' subscriptions to a user's nodes when that ↵ | Matthew Wild | 2015-09-25 | 1 | -0/+12 |
| | | | | | | | | | | | | user is offline | ||||
| | * | mod_pep: Document data structures, so I don't have to spend time remembering ↵ | Matthew Wild | 2015-09-04 | 1 | -0/+4 |
| | | | | | | | | | | | | every time I work on this module | ||||
* | | | Merge 0.10->trunk | Kim Alvefur | 2015-09-25 | 1 | -0/+5 |
|\| | | |||||
| * | | mod_s2s: Account for connections that time out in connection count measure | Kim Alvefur | 2015-09-25 | 1 | -0/+5 |
| | | | |||||
* | | | Merge 0.10->trunk | Kim Alvefur | 2015-09-24 | 2 | -3/+13 |
|\| | | |||||
| * | | mod_c2s, mod_s2s: Close incoming connections if there are no features to ↵ | Kim Alvefur | 2015-09-24 | 2 | -3/+13 |
| | | | | | | | | | | | | offer on incomplete streams (fixes #285) | ||||
* | | | Merge 0.10->trunk | Kim Alvefur | 2015-09-22 | 5 | -37/+72 |
|\| | | |||||
| * | | plugins: Explicitly return to halt event propagation (session.send sometimes ↵ | Kim Alvefur | 2015-09-21 | 5 | -37/+74 |
| | | | | | | | | | | | | does not return true) | ||||
* | | | Merge 0.10->trunk | Kim Alvefur | 2015-09-19 | 1 | -5/+5 |
|\| | | |||||
| * | | mod_admin_telnet: Fix indentation | Kim Alvefur | 2015-09-18 | 1 | -5/+5 |
| | | | |||||
* | | | Merge 0.10->trunk | Kim Alvefur | 2015-09-17 | 3 | -18/+26 |
|\| | | |||||
| * | | mod_offline: Decrease priority of event handlers so 3rd party hooks fire ↵ | Kim Alvefur | 2015-09-16 | 1 | -2/+2 |
| | | | | | | | | | | | | first by default | ||||
| * | | mod_blocklist: Explicitly halt event propagation after returning a reply ↵ | Kim Alvefur | 2015-09-16 | 1 | -6/+12 |
| | | | | | | | | | | | | (send returns nil sometimes) | ||||
| * | | mod_tls: Fix inhertinance of 'ssl' option from "parent" host to subdomain ↵ | Kim Alvefur | 2015-09-15 | 1 | -10/+12 |
| | | | | | | | | | | | | (fixes #511) | ||||
| * | | MUC: Break a very long line | Kim Alvefur | 2015-09-12 | 1 | -2/+4 |
| | | |