Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge 0.8->trunk | Matthew Wild | 2011-06-12 | 0 | -0/+0 |
|\ | |||||
| * | Tagging 0.8.2 | Matthew Wild | 2011-06-12 | 0 | -0/+0 |
| | | |||||
* | | Merge 0.8->trunk | Matthew Wild | 2011-06-11 | 1 | -4/+14 |
|\| | |||||
| * | mod_storage_sql: Add extra logging and error handling around table creationvault/0.8.20.8.2 | Matthew Wild | 2011-06-11 | 1 | -4/+11 |
| | | |||||
| * | mod_storage_sql: Add sql_manage_tables to disable table creation/updating. | Matthew Wild | 2011-06-11 | 1 | -0/+3 |
| | | |||||
* | | Merge 0.8->trunk | Matthew Wild | 2011-06-07 | 4 | -11/+11 |
|\| | |||||
| * | Backout bcdff2b1d3ec from 0.8 - going to commit a slightly cleaner patch for ↵ | Matthew Wild | 2011-06-07 | 1 | -1/+1 |
| | | | | | | | | the same issue to trunk | ||||
| * | mod_dialback: More robust handling of multiple outstanding dialback requests ↵ | Matthew Wild | 2011-06-06 | 1 | -4/+4 |
| | | | | | | | | for the same domain, fixes intermittent s2s with some (patched?) ejabberds | ||||
| * | Backout commit d6366294f618 which I was testing and didn't mean to push to 0.8 | Matthew Wild | 2011-06-05 | 1 | -20/+10 |
| | | |||||
| * | mod_groups: Persist changes to mod_groups contacts (e.g. moving groups) | Christian Haase | 2011-06-05 | 1 | -1/+1 |
| | | |||||
| * | mod_bosh: Fix terminate logic - process any stanzas in a terminating ↵ | Matthew Wild | 2011-03-04 | 1 | -10/+20 |
| | | | | | | | | request, and add type='terminate' to any responses generated by those stanzas. Finally, close all remaining open requests with type='terminate' and close the session. Fixes #211 (thanks Maranda + waqas). | ||||
| * | migrator/prosody_sql.lua: Fix for compatibility with non-MySQL databases | Matthew Wild | 2011-06-05 | 1 | -1/+1 |
| | | |||||
| * | mod_storage_sql: Fix commit c806a599224a for compatibility with non-MySQL ↵ | Matthew Wild | 2011-06-05 | 1 | -1/+1 |
| | | | | | | | | databases (thanks Ognyan Kulev) | ||||
| * | mod_bosh: Mark a session as active when a request comes in, even if we don't ↵ | Matthew Wild | 2011-06-05 | 1 | -5/+5 |
| | | | | | | | | end up holding that request, fixes BOSH ghosts (thanks smoku) | ||||
* | | s2smanager: Fix letter case in log message (thanks darkrain) | Matthew Wild | 2011-06-05 | 1 | -1/+1 |
| | | |||||
* | | Merge 0.8->trunk | Matthew Wild | 2011-06-05 | 2 | -10/+10 |
|\| | |||||
| * | util.xmppstream: Check to make sure parser.stop is present before calling it. | Waqas Hussain | 2011-06-05 | 1 | -1/+1 |
| | | |||||
| * | COPYING: Reflow the all-caps text. It was wrapping really badly in the ↵ | Waqas Hussain | 2011-06-05 | 1 | -7/+7 |
| | | | | | | | | Windows installer. | ||||
| * | COPYING: Update copyright year; it's 2011 already. | Waqas Hussain | 2011-06-05 | 1 | -2/+2 |
| | | |||||
* | | util.encodings: Fix small typo introduced in 7f789266b741 | Matthew Wild | 2011-06-04 | 1 | -1/+1 |
| | | |||||
* | | mod_component: Small code clarity fix | Matthew Wild | 2011-06-04 | 1 | -1/+1 |
| | | |||||
* | | Merge with Florob | Matthew Wild | 2011-06-03 | 1 | -1/+1 |
|\ \ | |||||
| * | | mod_admin_adhoc: Only allow global admins to shut the server down | Florian Zeitz | 2011-06-03 | 1 | -1/+1 |
| | | | |||||
* | | | Merge 0.8->trunk | Matthew Wild | 2011-06-03 | 1 | -0/+2 |
|\ \ \ | |/ / |/| / | |/ | |||||
| * | Tagging 0.8.1 | Matthew Wild | 2011-06-03 | 0 | -0/+0 |
| | | |||||
| * | mod_storage_sql: Log error when failing to update MySQL schemavault/0.8.10.8.1 | Matthew Wild | 2011-06-03 | 1 | -0/+2 |
| | | |||||
* | | Merge 0.8->trunk | Matthew Wild | 2011-06-03 | 2 | -1/+24 |
|\| | |||||
| * | migrator/prosody_sql.lua: Create (and upgrade) MySQL tables to use ↵ | Matthew Wild | 2011-06-03 | 1 | -0/+18 |
| | | | | | | | | MEDIUMTEXT for the 'value' column to avoid truncation | ||||
| * | migrator/prosody_files: Don't choke on empty data stores for a user (thanks ↵ | Matthew Wild | 2011-06-02 | 1 | -1/+6 |
| | | | | | | | | @eoranged) | ||||
* | | mod_admin_adhoc: Add "Reload configuration" command | Florian Zeitz | 2011-06-02 | 1 | -3/+13 |
| | | |||||
* | | mod_adhoc: Add support for commands only executable by global administrators | Florian Zeitz | 2011-06-02 | 1 | -6/+9 |
| | | |||||
* | | Merge 0.8->trunk | Matthew Wild | 2011-06-02 | 1 | -2/+5 |
|\| | |||||
| * | Merge 0.7->0.8 | Matthew Wild | 2011-06-02 | 1 | -2/+5 |
| |\ | |||||
| | * | Merge 0.6->0.7 | Matthew Wild | 2011-06-02 | 1 | -1/+4 |
| | |\ | |||||
| | | * | xmlhandlers/xmppstream: Stop the parser when encountering restricted XML, ↵ | Matthew Wild | 2011-06-02 | 1 | -1/+4 |
| | | | | | | | | | | | | | | | | completing the fix for the billion laughs attack | ||||
* | | | | Merge 0.8->trunk | Matthew Wild | 2011-06-02 | 2 | -0/+20 |
|\| | | | |||||
| * | | | mod_storage_sql: Switch to MEDIUMTEXT for the 'value' column when using ↵ | Matthew Wild | 2011-06-02 | 1 | -0/+18 |
| | | | | | | | | | | | | | | | | MySQL, as it imposes a 64K limit otherwise, potentially truncating data. Automatically upgrades existing tables. | ||||
| * | | | util.json: Fixed handling of truncated JSON. | Waqas Hussain | 2011-06-02 | 1 | -0/+2 |
| | | | | |||||
* | | | | Merge 0.8->trunk | Matthew Wild | 2011-06-02 | 1 | -1/+0 |
|\| | | | |||||
| * | | | Merge 0.7->0.8 | Matthew Wild | 2011-06-02 | 1 | -1/+0 |
| |\| | | |||||
| | * | | Merge 0.6->0.7 | Matthew Wild | 2011-06-02 | 1 | -1/+0 |
| | |\| | |||||
| | | * | xmlhandlers: Don't restrict CDATA | Matthew Wild | 2011-06-02 | 1 | -1/+0 |
| | | | | |||||
* | | | | Merge 0.8->trunk | Matthew Wild | 2011-06-02 | 0 | -0/+0 |
|\| | | | |||||
| * | | | Merge 0.7->0.8 | Matthew Wild | 2011-06-01 | 0 | -0/+0 |
| |\| | | |||||
| | * | | Merge 0.6->0.7 | Matthew Wild | 2011-06-01 | 1 | -0/+22 |
| | |\| | |||||
| | | * | xmlhandlers: Reject XML comments, processing instructions and (if supported ↵ | Matthew Wild | 2011-06-01 | 1 | -0/+22 |
| | | | | | | | | | | | | | | | | by LuaExpat) DTDs. If not supported, log a warning. [Backport of 7cc426988bcc in trunk] | ||||
| * | | | util.xmppstream: Reject XML comments, processing instructions and (if ↵ | Matthew Wild | 2011-06-01 | 1 | -0/+21 |
| | | | | | | | | | | | | | | | | supported by LuaExpat) DTDs. If not supported, log a warning. | ||||
* | | | | util.xmppstream: Reject XML comments, processing instructions and (if ↵ | Matthew Wild | 2011-06-01 | 1 | -0/+21 |
| | | | | | | | | | | | | | | | | supported by LuaExpat) DTDs. If not supported, log a warning. | ||||
* | | | | util.encodings: Check return values before proceeding | Paul Aurich | 2011-05-22 | 1 | -3/+17 |
| | | | | |||||
* | | | | util.encodings: Swap code order ("ifndef" bugs me) | Paul Aurich | 2011-05-22 | 1 | -75/+77 |
| | | | |