aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge 0.10->trunkMatthew Wild2014-04-028-15/+101
|\
| * Merge 0.9->0.10Matthew Wild2014-04-02136-2257/+3484
| |\
| * | util.xmppstream: Also disable CharacterData merging after stream restartsMatthew Wild2014-04-021-1/+1
| * | util.xmppstream: Disable LuaExpat's buffering (if possible)Matthew Wild2014-04-021-3/+3
| * | Tagging 0.9.4Matthew Wild2014-04-010-0/+0
| * | Merge0.9.4Matthew Wild2014-04-011-1/+1
| |\ \
| | * | MUC: Fixed traceback when a JID not in a room requested a role change for an ...Waqas Hussain2014-04-011-1/+1
| * | | MergeMatthew Wild2014-04-012-0/+2
| |\| |
| | * | net.server_{select,event}: Add compat code for supporting the same client por...Kim Alvefur2014-04-012-0/+2
| | * | Backed out changeset a5b5bce71a11Kim Alvefur2014-03-311-1/+1
| | * | net.server_event: Rename conn:port() -> conn:clientport() to match server_selectKim Alvefur2014-03-271-1/+1
| * | | Makefile: Change sed regex to be compatible with FreeBSD's odd sed, and chang...Matthew Wild2014-03-301-1/+1
| * | | util.dependencies: Log error when LuaExpat is not capable of enforcing stanza...Matthew Wild2014-03-301-1/+9
| * | | util.xmppstream: Implement stanza size limiting, default limit 10MBMatthew Wild2014-03-301-6/+80
| * | | portmanager: Make maximum read size configurable, and default to 4KBMatthew Wild2014-03-301-1/+3
| * | | mod_compression: Only allow compression on authenticated streamsKim Alvefur2014-02-181-2/+2
| |/ /
* | | Merge 0.10->trunkKim Alvefur2014-03-255-10/+17
|\ \ \ | | |/ | |/|
| * | Merge 0.9->0.10Kim Alvefur2014-03-253-3/+8
| |\|
| | * prosodyctl: Show real error if certificate config file can't be openedKim Alvefur2014-03-221-1/+6
| | * modulemanager: Load mod_saslauth on components by defaultKim Alvefur2014-03-221-1/+1
| | * mod_saslauth: Only do c2s SASL on normal VirtualHostsKim Alvefur2014-03-221-1/+1
| * | prosody.cfg.lua.dist: mod_posix is enabled by default on posix platforms nowKim Alvefur2014-03-221-1/+1
| * | util.sasl: Fix logic for when mechanisms with channel binding support are off...Kim Alvefur2014-03-221-6/+8
* | | Merge 0.10->trunkKim Alvefur2014-03-092-5/+6
|\| |
| * | Merge 0.9->0.10Kim Alvefur2014-03-092-5/+6
| |\|
| | * mod_http_files: Strip path separator from end of paths, was broken on Windows...Kim Alvefur2014-03-091-1/+2
| | * util.pluginloader: Always use path separator from package.config (thanks Junne)Kim Alvefur2014-03-091-4/+4
* | | Merge 0.10->trunkKim Alvefur2014-02-263-4/+9
|\| |
| * | Merge 0.9->0.10Kim Alvefur2014-02-263-4/+9
| |\|
| | * mod_http: Fix http_external_url setting without an explicit portKim Alvefur2014-02-261-0/+3
| | * mod_http: Use hostname from the correct context (thanks gryffus)Kim Alvefur2014-02-201-1/+1
| | * tools/ejabberd2prosody: Don't throw an error if XML CDATA is null ([] in Erla...Waqas Hussain2014-02-181-2/+4
| | * mod_auth_anonymous: Fixed a traceback in listing all users (issue#396).Waqas Hussain2014-02-171-1/+1
* | | Merge 0.10->trunkKim Alvefur2014-02-191-18/+1
|\| |
| * | mod_proxy65: Use mod_discoFlorian Zeitz2014-02-191-18/+1
* | | Merge 0.10->trunkKim Alvefur2014-02-191-5/+7
|\| |
| * | mod_auth_interal_hashed: Update salt and iteration count when setting a new p...Florian Zeitz2014-02-121-5/+7
* | | Merge 0.10 -> trunkKim Alvefur2014-02-125-9/+12
|\| |
| * | Merge 0.9 -> 0.10Kim Alvefur2014-02-122-2/+4
| |\|
| | * mod_admin_telnet: Prep jids for user:create() etc.Kim Alvefur2014-02-091-2/+1
| | * mod_s2s: Log a warning if no local addresses are found, as this breaks s2soutKim Alvefur2014-02-091-0/+3
| * | mod_saslauth: Make sure sasl handler has add_cb_handler (fixes #392)Kim Alvefur2014-02-121-1/+1
| * | mod_storage_sql2: archive:delete() with username = true deletes for all usersKim Alvefur2014-02-091-0/+4
| * | mod_ping: Use type-specific eventKim Alvefur2014-02-091-6/+3
* | | Merge 0.10->trunkKim Alvefur2014-02-061-1/+1
|\| |
| * | Merge 0.9->0.10Kim Alvefur2014-02-061-1/+1
| |\|
| | * mod_motd: Strip indentation only, leave multiple newlinesKim Alvefur2014-02-061-1/+1
* | | Merge 0.10->trunkKim Alvefur2014-02-037-9/+28
|\| |
| * | Merge 0.9->0.10Kim Alvefur2014-02-031-1/+1
| |\|
| | * tools/ejabberd2prosody: Handle new room member format.Kim Alvefur2014-01-271-1/+1
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-23 00:57:52 +0000