aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge 0.9->trunkWaqas Hussain2012-12-152-8/+4
|\
| * MUC: Support invite messages when stanza type is explicitly set to "normal" ↵Waqas Hussain2012-12-151-2/+2
| | | | | | | | or to an unknown value.
| * util.sasl.plain: Reduce some code.Waqas Hussain2012-12-151-6/+2
| |
* | Merge 0.9->trunkKim Alvefur2012-12-111-29/+91
|\|
| * mod_http_files: Generate simple directory index.Kim Alvefur2012-12-111-2/+23
| |
| * mod_http_files: Have mimetypes in a shared table. Get mimetypes from ↵Kim Alvefur2012-12-111-10/+28
| | | | | | | | /etc/mime.types if exists.
| * mod_http_files: Cache data read from disk in a weak tableKim Alvefur2012-12-111-13/+18
| |
| * mod_http_files: Add Last-Modified headerKim Alvefur2012-12-111-0/+2
| |
| * mod_http_files: Add ETag and check If-None-Match to allow client-side cacheKim Alvefur2012-12-111-0/+7
| |
| * mod_http_files: Return 404 faster if file does not existKim Alvefur2012-12-111-3/+9
| |
| * mod_http_files: Configurable number of index files to check forKim Alvefur2012-12-111-2/+5
| |
* | Merge 0.9->trunkKim Alvefur2012-12-094-4/+25
|\|
| * mod_http: Fix path length patternKim Alvefur2012-12-091-1/+1
| |
| * mod_auth_anonymous: Implement user iteration APIKim Alvefur2012-12-091-0/+4
| |
| * mod_c2s: Check if TLS compression is usedKim Alvefur2012-12-091-0/+16
| |
| * mod_admin_telnet: Improve wording when listing usersKim Alvefur2012-12-091-3/+4
| |
* | MergeMatthew Wild2012-12-041-1/+1
|\|
| * portmanager: Return first service with the specified name from get_service() ↵Matthew Wild2012-12-041-1/+1
| | | | | | | | (instead of the array of possible services) (thanks xnyhps)
* | 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
| |\ \