Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge 0.9->trunk. | Waqas Hussain | 2012-12-03 | 2 | -2/+2 |
|\ | |||||
| * | util.xml: Fix module name. | Waqas Hussain | 2012-12-03 | 1 | -1/+1 |
| | | |||||
| * | net.http.parser: Fix syntax error introduced in c5edb08fc7cb. | Waqas Hussain | 2012-12-03 | 1 | -1/+1 |
| | | |||||
* | | Merge 0.9->trunk. | Waqas Hussain | 2012-12-03 | 8 | -312/+64 |
|\| | |||||
| * | plugins/storage/xmlparse.lib.lua: Delete. | Waqas Hussain | 2012-12-03 | 1 | -56/+0 |
| | | |||||
| * | plugins/storage/mod_xep0227: Use util.xml. | Waqas Hussain | 2012-12-03 | 1 | -1/+1 |
| | | |||||
| * | tools/migration/migrator/jabberd14: Use util.xml. | Waqas Hussain | 2012-12-03 | 1 | -50/+1 |
| | | |||||
| * | tools/openfire2prosody: Use util.xml. | Waqas Hussain | 2012-12-03 | 1 | -51/+1 |
| | | |||||
| * | tools/jabberd14sql2prosody: Use util.xml. | Waqas Hussain | 2012-12-03 | 1 | -50/+1 |
| | | |||||
| * | tools/ejabberdsql2prosody: Use util.xml. | Waqas Hussain | 2012-12-03 | 1 | -52/+1 |
| | | |||||
| * | util.template: Use util.xml. | Waqas Hussain | 2012-12-03 | 1 | -52/+2 |
| | | |||||
| * | util.xml: Initial commit; exposes parse(), which is now the canonical way to ↵ | Waqas Hussain | 2012-12-03 | 1 | -0/+57 |
| | | | | | | | | convert a string to a stanza. | ||||
* | | Merge 0.9->trunk. | Waqas Hussain | 2012-12-01 | 3 | -13/+14 |
|\| | |||||
| * | sessionmanager: Log the actual error message when roster loading fails. | Waqas Hussain | 2012-11-30 | 1 | -0/+1 |
| | | |||||
| * | MUC: Expose create_room(jid). | Waqas Hussain | 2012-11-30 | 1 | -12/+11 |
| | | |||||
| * | mod_storage_sql: Return actual error string on commit failure. | Waqas Hussain | 2012-11-30 | 1 | -1/+2 |
| | | |||||
* | | Merge 0.9->trunk | Matthew Wild | 2012-11-29 | 1 | -1/+1 |
|\| | |||||
| * | net.http.parser: Collapse multiple consecutive slashes in a path to a single ↵ | Matthew Wild | 2012-11-29 | 1 | -1/+1 |
| | | | | | | | | slash | ||||
* | | Merge | Matthew Wild | 2012-11-29 | 0 | -0/+0 |
|\ \ | |||||
| * \ | Merge 0.9->trunk | Kim Alvefur | 2012-11-25 | 1 | -9/+0 |
| |\ \ | |||||
| * \ \ | Merge 0.9->trunk | Kim Alvefur | 2012-11-23 | 1 | -1/+1 |
| |\ \ \ | |||||
| * \ \ \ | Merge 0.9->trunk | Kim Alvefur | 2012-11-23 | 2 | -10/+42 |
| |\ \ \ \ | |||||
* | \ \ \ \ | Merge 0.9->trunk | Matthew Wild | 2012-11-29 | 4 | -21/+44 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | / | | |_|_|/ | |/| | | | |||||
| * | | | | mod_http: Fix pattern and slightly improve efficiency and memory usage of ↵ | Matthew Wild | 2012-11-29 | 1 | -2/+2 |
| | |_|/ | |/| | | | | | | | | | | wildcard HTTP handlers | ||||
| * | | | mod_admin_adhoc: Remove unused form | Kim Alvefur | 2012-11-25 | 1 | -9/+0 |
| | |/ | |/| | |||||
| * | | net.server: Fix when no network_settings set and using libevent | Kim Alvefur | 2012-11-23 | 1 | -1/+1 |
| |/ | |||||
| * | net.server: Make server_* configurable in the config file. | Kim Alvefur | 2012-11-23 | 1 | -0/+32 |
| | | |||||
| * | net.server_select: Better names for config options (thanks MattJ) | Kim Alvefur | 2012-11-23 | 1 | -10/+10 |
| | | |||||
* | | Merge 0.9->trunk | Matthew Wild | 2012-11-22 | 2 | -15/+12 |
|\| | |||||
| * | muc: Make max_history_messages simply a service-wide config option, and ↵ | Matthew Wild | 2012-11-22 | 2 | -15/+12 |
| | | | | | | | | don't store it per-room (rooms still have their own history_message, but this is a global limit) | ||||
* | | Merge with a merge (or something) | Matthew Wild | 2012-11-22 | 0 | -0/+0 |
|\ \ | |||||
| * \ | Merge 0.9->trunk | Kim Alvefur | 2012-11-22 | 1 | -1/+1 |
| |\ \ | |||||
* | \ \ | Merge 0.9->trunk | Matthew Wild | 2012-11-22 | 2 | -4/+7 |
|\ \ \ \ | |/ / / |/| | / | | |/ | |/| | |||||
| * | | modulemanager: Set module.reloading when a module is reloading, and when ↵ | Matthew Wild | 2012-11-22 | 1 | -3/+6 |
| |/ | | | | | | | loading make the saved state available in module.saved_state (if any) | ||||
| * | mod_http: Make module:http_url() aware of http_host | Kim Alvefur | 2012-11-22 | 1 | -1/+1 |
| | | |||||
* | | Merge 0.9->trunk | Matthew Wild | 2012-11-22 | 2 | -62/+69 |
|\| | |||||
| * | mod_bosh: Add 'Connection: keep-alive' header | Matthew Wild | 2012-11-22 | 1 | -1/+1 |
| | | |||||
| * | mod_bosh: Add support for stanza filters to BOSH sessions (needed by some ↵ | Matthew Wild | 2012-11-22 | 1 | -0/+5 |
| | | | | | | | | plugins) | ||||
| * | mod_admin_telnet: Refactor so that command processing is performed in a ↵ | Matthew Wild | 2012-11-22 | 1 | -59/+59 |
| | | | | | | | | separate function (usable from other modules) | ||||
| * | mod_bosh: Add bosh_max_wait config option, to limit the amount of time a ↵ | Matthew Wild | 2012-11-22 | 1 | -2/+4 |
| | | | | | | | | client can request for the server to hold open requests | ||||
* | | Merge 0.9->trunk | Matthew Wild | 2012-11-22 | 1 | -5/+5 |
|\| | |||||
| * | mod_http: Rename variable for clarity | Matthew Wild | 2012-11-22 | 1 | -5/+5 |
| | | |||||
* | | Merge 0.9->trunk | Matthew Wild | 2012-11-15 | 3 | -3/+4 |
|\| | |||||
| * | util.pubsub: Add item-published event | Matthew Wild | 2012-11-15 | 1 | -0/+1 |
| | | |||||
| * | mod_http: Add 'http_host' option to change the HTTP virtual host that this ↵ | Matthew Wild | 2012-11-15 | 1 | -1/+1 |
| | | | | | | | | host is accessible at (e.g. allows mapping a host to '127.0.0.1') | ||||
| * | mod_bosh: Share sessions and inactive_sessions tables | Matthew Wild | 2012-11-15 | 1 | -2/+2 |
| | | |||||
* | | Merge 0.9 -> trunk | Kim Alvefur | 2012-11-11 | 2 | -0/+13 |
|\| | |||||
| * | mod_posix: Log a message explaining that we are detaching from the console | Kim Alvefur | 2012-11-11 | 1 | -0/+1 |
| | | |||||
| * | util.pposix: Prevent FDs 0, 1 and 2 from being assigned to connections | Kim Alvefur | 2012-11-10 | 1 | -0/+4 |
| | | |||||
| * | mod_posix: Remove console and stdout logging sinks before daemonizing | Kim Alvefur | 2012-11-10 | 1 | -0/+8 |
| | |