Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 | ||||
* | | | 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.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.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. | ||||
* | | | mod_muc: Remove room from memory when it is made non-persistent and is empty | Matthew Wild | 2011-05-04 | 1 | -0/+3 |
| | | | |||||
* | | | mod_legacyauth: Disallow on unencrypted connections by default, heed ↵ | Matthew Wild | 2011-04-20 | 1 | -1/+3 |
| | | | | | | | | | | | | allow_unencrypted_plain_auth config option (thanks Maranda/Zash) | ||||
* | | | Tagging 0.8.1 | Matthew Wild | 2011-04-18 | 0 | -0/+0 |
| | | | |||||
* | | | util.datetime: Fix timestamp parsing when in DST (thanks xnyhps) | Matthew Wild | 2011-04-15 | 1 | -1/+1 |
| | | | |||||
* | | | prosody: Add sanity_check() to startup sequence. Check that we have at least ↵ | Matthew Wild | 2011-04-14 | 1 | -0/+14 |
| | | | | | | | | | | | | one vhost enabled to avoid Bad Things. | ||||
* | | | tools/migration/migrator/prosody_sql.lua: Fix compatibility with PostgreSQL ↵ | Matthew Wild | 2011-04-11 | 1 | -1/+5 |
| | | | | | | | | | | | | (thanks Timo) | ||||
* | | | mod_tls: Fix for components to more reliably inherit SSL settings from their ↵ | Matthew Wild | 2011-04-06 | 1 | -4/+3 |
| | | | | | | | | | | | | parenthost (thanks Link Mauve) | ||||
* | | | Tagging 0.8.0 | Matthew Wild | 2011-04-05 | 0 | -0/+0 |
| | | | |||||
* | | | tools/migration/migrator/prosody_files.lua: Fix for previous commitvault/0.8.00.8.0 | Matthew Wild | 2011-04-05 | 1 | -1/+2 |
| | | | |||||
* | | | tools/migration/prosody-migrator.lua: Add messages to show when migration is ↵ | Matthew Wild | 2011-04-05 | 1 | -1/+2 |
| | | | | | | | | | | | | in progress | ||||
* | | | tools/migration: Support for ~/ in paths | Matthew Wild | 2011-04-05 | 2 | -1/+10 |
| | | | |||||
* | | | usermanager: Check host exists before trying to look up admins for it | Matthew Wild | 2011-04-05 | 1 | -0/+2 |
| | | | |||||
* | | | util.dependencies: Add a dummy util.ztact loader to log a message for people ↵ | Matthew Wild | 2011-04-05 | 1 | -0/+13 |
| | | | | | | | | | | | | still using it (e.g. in their Debian-derived config files) | ||||
* | | | tools/migration/prosody-migrator.lua: Refactor store handler loading to ↵ | Matthew Wild | 2011-04-05 | 1 | -13/+22 |
| | | | | | | | | | | | | report errors they throw | ||||
* | | | tools/migration/migrator/prosody_sql: Throw a friendlier error when LuaDBI ↵ | Matthew Wild | 2011-04-05 | 1 | -1/+5 |
| | | | | | | | | | | | | is not found | ||||
* | | | prosody.cfg.lua.dist: Add example of 'authentication' option | Matthew Wild | 2011-04-05 | 1 | -0/+9 |
| | | | |||||
* | | | mod_privacy: Remove several unused variable declarations | Matthew Wild | 2011-03-29 | 1 | -3/+1 |
| | | | |||||
* | | | mod_privacy: Remove unused function, sendUnavailable | Matthew Wild | 2011-03-29 | 1 | -22/+0 |
| | | | |||||
* | | | sessionmanager: Fire pre-resource-unbind to allow plugins (such as ↵ | Matthew Wild | 2011-03-29 | 1 | -4/+11 |
| | | | | | | | | | | | | mod_smacks) to hook and prevent/override session destruction | ||||
* | | | tools/migration: Rename main.lua -> prosody-migrator.lua and update the Makefile | Matthew Wild | 2011-03-21 | 2 | -3/+3 |
| | | | |||||
* | | | net.httpserver: Revert commit eccd3c87d717 which has since been fixed in a ↵ | Matthew Wild | 2011-03-21 | 1 | -1/+0 |
| | | | | | | | | | | | | better way | ||||
* | | | mod_dialback: Use session:close() on dialback failure instead of ↵ | Matthew Wild | 2011-03-21 | 1 | -2/+1 |
| | | | | | | | | | | | | s2smanager.destroy_session() (thanks Zash) | ||||
* | | | tools/migration/Makefile: Don't install main.lua (we already install it as ↵ | Matthew Wild | 2011-03-03 | 1 | -2/+2 |
| | | | | | | | | | | | | prosody-migrator) (thanks Enrico) | ||||
* | | | prosody: Load net.httpserver at startup, to avoid creating a global later. | Waqas Hussain | 2011-03-02 | 1 | -0/+1 |
| | | | |||||
* | | | net.connlisteners: Log traceback on errors in listener loading. | Waqas Hussain | 2011-03-02 | 1 | -3/+5 |
| | | | |||||
* | | | mod_storage_sql: Display friendlier error when LuaDBI is missing | Matthew Wild | 2011-03-01 | 1 | -1/+12 |
| | | | |||||
* | | | tools/migration/*: Numerous changes and restructuring, and the addition of a ↵ | Matthew Wild | 2011-02-26 | 5 | -9/+56 |
| | | | | | | | | | | | | Makefile | ||||
* | | | tools/migration/*.lua: Rename config to migrator.cfg.lua, add error handling ↵ | Matthew Wild | 2011-02-25 | 2 | -8/+69 |
| | | | | | | | | | | | | for config and command-line parameters | ||||
* | | | tools/migration/main.lua: Add command-line parsing, including ↵ | Matthew Wild | 2011-02-25 | 1 | -11/+29 |
| | | | | | | | | | | | | --config=CONFIG_FILE, and the ability to specify to/from stores to migrate | ||||
* | | | tools/migration/config.lua: Minor fixes for more sensible defaults | Matthew Wild | 2011-02-25 | 1 | -10/+10 |
| | | | |||||
* | | | mod_pep: Fix comparison between incoming hash and the cached hash for a JID, ↵ | Matthew Wild | 2011-02-25 | 1 | -1/+1 |
| | | | | | | | | | | | | fixes repeated PEP events on presence (fixes #225) | ||||
* | | | util.sasl.scram: Fix bug in validate_username function. (Thanks Florob) | Tobias Markmann | 2011-02-24 | 1 | -3/+3 |
| | | | |||||
* | | | MUC: Don't limit affiliation changes to owners, and allow owners to remove ↵ | Waqas Hussain | 2011-02-24 | 1 | -2/+17 |
| | | | | | | | | | | | | themselves if they are not the last owner. | ||||
* | | | MUC: Add a textual error message when the user isn't allowed to get/set ↵ | Waqas Hussain | 2011-02-24 | 1 | -1/+1 |
| | | | | | | | | | | | | config form. | ||||
* | | | util.stanza: Whitespace fix after merge (complicated) | Matthew Wild | 2011-02-24 | 1 | -1/+1 |
| | | | |||||
* | | | prosody, prosodyctl: Use plugin_paths in addition to, not instead of, the ↵ | Matthew Wild | 2011-02-24 | 2 | -4/+8 |
| | | | | | | | | | | | | default plugin path | ||||
* | | | tools/migration/*.lua: Convert to unix line endings | Matthew Wild | 2011-02-23 | 5 | -416/+416 |
| | | | |||||
* | | | net.httpserver: Removed an unused function. | Waqas Hussain | 2011-02-23 | 1 | -4/+0 |
| | | |