aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | Merge 0.9->trunk.Waqas Hussain2012-12-032-2/+2
|\| | | |
| * | | | util.xml: Fix module name.Waqas Hussain2012-12-031-1/+1
| | | | |
| * | | | net.http.parser: Fix syntax error introduced in c5edb08fc7cb.Waqas Hussain2012-12-031-1/+1
| | | | |
* | | | | Merge 0.9->trunk.Waqas Hussain2012-12-038-312/+64
|\| | | |
| * | | | plugins/storage/xmlparse.lib.lua: Delete.Waqas Hussain2012-12-031-56/+0
| | | | |
| * | | | plugins/storage/mod_xep0227: Use util.xml.Waqas Hussain2012-12-031-1/+1
| | | | |
| * | | | tools/migration/migrator/jabberd14: Use util.xml.Waqas Hussain2012-12-031-50/+1
| | | | |
| * | | | tools/openfire2prosody: Use util.xml.Waqas Hussain2012-12-031-51/+1
| | | | |
| * | | | tools/jabberd14sql2prosody: Use util.xml.Waqas Hussain2012-12-031-50/+1
| | | | |
| * | | | tools/ejabberdsql2prosody: Use util.xml.Waqas Hussain2012-12-031-52/+1
| | | | |
| * | | | util.template: Use util.xml.Waqas Hussain2012-12-031-52/+2
| | | | |
| * | | | util.xml: Initial commit; exposes parse(), which is now the canonical way to ↵Waqas Hussain2012-12-031-0/+57
| | | | | | | | | | | | | | | | | | | | convert a string to a stanza.
* | | | | Merge 0.9->trunk.Waqas Hussain2012-12-013-13/+14
|\| | | |
| * | | | sessionmanager: Log the actual error message when roster loading fails.Waqas Hussain2012-11-301-0/+1
| | | | |
| * | | | MUC: Expose create_room(jid).Waqas Hussain2012-11-301-12/+11
| | | | |
| * | | | mod_storage_sql: Return actual error string on commit failure.Waqas Hussain2012-11-301-1/+2
| | | | |
* | | | | Merge 0.9->trunkMatthew Wild2012-11-291-1/+1
|\| | | |
| * | | | net.http.parser: Collapse multiple consecutive slashes in a path to a single ↵Matthew Wild2012-11-291-1/+1
| | | | | | | | | | | | | | | | | | | | slash
* | | | | MergeMatthew Wild2012-11-290-0/+0
|\ \ \ \ \
| * \ \ \ \ Merge 0.9->trunkKim Alvefur2012-11-251-9/+0
| |\ \ \ \ \
| * \ \ \ \ \ Merge 0.9->trunkKim Alvefur2012-11-231-1/+1
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge 0.9->trunkKim Alvefur2012-11-232-10/+42
| |\ \ \ \ \ \ \
* | \ \ \ \ \ \ \ Merge 0.9->trunkMatthew Wild2012-11-294-21/+44
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | / / / / | | |_|_|/ / / / | |/| | | | | |
| * | | | | | | mod_http: Fix pattern and slightly improve efficiency and memory usage of ↵Matthew Wild2012-11-291-2/+2
| | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | wildcard HTTP handlers
| * | | | | | mod_admin_adhoc: Remove unused formKim Alvefur2012-11-251-9/+0
| | |/ / / / | |/| | | |
| * | | | | net.server: Fix when no network_settings set and using libeventKim Alvefur2012-11-231-1/+1
| |/ / / /
| * | | | net.server: Make server_* configurable in the config file.Kim Alvefur2012-11-231-0/+32
| | | | |
| * | | | net.server_select: Better names for config options (thanks MattJ)Kim Alvefur2012-11-231-10/+10
| | | | |
* | | | | Merge 0.9->trunkMatthew Wild2012-11-222-15/+12
|\| | | |
| * | | | muc: Make max_history_messages simply a service-wide config option, and ↵Matthew Wild2012-11-222-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 Wild2012-11-220-0/+0
|\ \ \ \ \
| * \ \ \ \ Merge 0.9->trunkKim Alvefur2012-11-221-1/+1
| |\ \ \ \ \
* | \ \ \ \ \ Merge 0.9->trunkMatthew Wild2012-11-222-4/+7
|\ \ \ \ \ \ \ | |/ / / / / / |/| | / / / / | | |/ / / / | |/| | | |
| * | | | | modulemanager: Set module.reloading when a module is reloading, and when ↵Matthew Wild2012-11-221-3/+6
| |/ / / / | | | | | | | | | | | | | | | loading make the saved state available in module.saved_state (if any)
| * | | | mod_http: Make module:http_url() aware of http_hostKim Alvefur2012-11-221-1/+1
| | | | |
* | | | | Merge 0.9->trunkMatthew Wild2012-11-222-62/+69
|\| | | |
| * | | | mod_bosh: Add 'Connection: keep-alive' headerMatthew Wild2012-11-221-1/+1
| | | | |
| * | | | mod_bosh: Add support for stanza filters to BOSH sessions (needed by some ↵Matthew Wild2012-11-221-0/+5
| | | | | | | | | | | | | | | | | | | | plugins)
| * | | | mod_admin_telnet: Refactor so that command processing is performed in a ↵Matthew Wild2012-11-221-59/+59
| | | | | | | | | | | | | | | | | | | | separate function (usable from other modules)
| * | | | mod_bosh: Add bosh_max_wait config option, to limit the amount of time a ↵Matthew Wild2012-11-221-2/+4
| | | | | | | | | | | | | | | | | | | | client can request for the server to hold open requests
* | | | | Merge 0.9->trunkMatthew Wild2012-11-221-5/+5
|\| | | |
| * | | | mod_http: Rename variable for clarityMatthew Wild2012-11-221-5/+5
| | | | |
* | | | | Merge 0.9->trunkMatthew Wild2012-11-153-3/+4
|\| | | |
| * | | | util.pubsub: Add item-published eventMatthew Wild2012-11-151-0/+1
| | | | |
| * | | | mod_http: Add 'http_host' option to change the HTTP virtual host that this ↵Matthew Wild2012-11-151-1/+1
| | | | | | | | | | | | | | | | | | | | host is accessible at (e.g. allows mapping a host to '127.0.0.1')
| * | | | mod_bosh: Share sessions and inactive_sessions tablesMatthew Wild2012-11-151-2/+2
| | | | |
* | | | | Merge 0.9 -> trunkKim Alvefur2012-11-112-0/+13
|\| | | |
| * | | | mod_posix: Log a message explaining that we are detaching from the consoleKim Alvefur2012-11-111-0/+1
| | | | |
| * | | | util.pposix: Prevent FDs 0, 1 and 2 from being assigned to connectionsKim Alvefur2012-11-101-0/+4
| | | | |
| * | | | mod_posix: Remove console and stdout logging sinks before daemonizingKim Alvefur2012-11-101-0/+8
| | | | |