aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* mod_saslauth: Break out tls-unique channel binding callback so it is instanti...Kim Alvefur2014-11-191-5/+10
* mod_saslauth: Keep sasl_handler in a local variableKim Alvefur2014-11-191-5/+6
* mod_pubsub: Add support for including the publisher in item broadcastsPhilipp Hancke2014-11-202-2/+6
* Merge 0.9 -> 0.10Kim Alvefur2014-11-092-10/+14
|\
| * net.dns: Try next server if peer name can not be set (thanks wirehack7)Kim Alvefur2014-10-301-6/+10
| * net.dns: Return new socket from servfailKim Alvefur2014-10-301-3/+4
| * net.adns: Log peername recorded from wrapped setpeername instead of calling s...Kim Alvefur2014-10-301-2/+1
| * net.adns: Preserve error from setpeernameKim Alvefur2014-10-301-1/+1
* | util.paths: Add function for joining path segmentsKim Alvefur2014-11-081-0/+6
* | mod_http: For URLs that end with / or wildcard handlers, add a low-priority r...Kim Alvefur2014-11-041-0/+8
* | mod_admin_telnet: Soft-reqire util.pposix for server:memory()Kim Alvefur2014-10-271-1/+2
* | Merge 0.9->0.10Kim Alvefur2014-10-263-15/+4
|\|
| * Tagging 0.9.7Matthew Wild2014-10-240-0/+0
| * Backout changeset 6e67c73f730c: not a major fix and it breaks interop with at...0.9.7Matthew Wild2014-10-241-13/+2
| * prosodyctl: Fix nil global access traceback in `prosodyctl about` (luarocks 2...Waqas Hussain2014-10-191-1/+1
| * Tagging 0.9.6Matthew Wild2014-10-150-0/+0
| * certmanager, net.http: Disable SSLv3 by default0.9.6Matthew Wild2014-10-142-2/+2
* | mod_blocklist: Don't send unavailable presence from unavailable sessions when...Kim Alvefur2014-10-261-1/+3
* | mod_blocklist: Only log message about migrating from mod_privacy when there i...Kim Alvefur2014-10-251-1/+1
* | mod_saslauth: Better name for config optionKim Alvefur2014-10-211-1/+1
* | mod_saslauth: Make it possible to disable certain mechanismsKim Alvefur2014-10-211-1/+5
* | mod_saslauth: Add LOGIN to mechanisms not allowed over unencrypted connection...Kim Alvefur2014-10-211-1/+1
* | mod_saslauth: Use a configurable set of mechanisms to not allow over unencryp...Kim Alvefur2014-10-211-2/+3
* | mod_saslauth: Log warning if no SASL mechanisms were offeredKim Alvefur2014-10-211-1/+5
* | mod_saslauth: Use type-specific config option gettersKim Alvefur2014-10-211-2/+2
* | mod_legacyauth, mod_saslauth, mod_tls: Pass require_encryption as default opt...Kim Alvefur2014-10-213-4/+4
* | prosodyctl: Add 'require_encryption' to list of deprecated options pointed ou...Kim Alvefur2014-10-211-1/+1
* | Merge 0.9->0.10Matthew Wild2014-10-142-2/+2
|\|
| * mod_pubsub: Fix error type of 'forbidden' (change from 'cancel' to 'auth')Matthew Wild2014-10-141-1/+1
| * mod_s2s: Capitalize log messageKim Alvefur2014-10-101-1/+1
* | prosody: Make getfenv() replacement for require() sandboxing local to avoid p...Kim Alvefur2014-10-131-6/+4
* | Merge 0.9->0.10Waqas Hussain2014-10-082-3/+14
|\|
| * util/dataforms: Make sure we iterate over field tagsdaurnimator2014-10-071-1/+1
| * util.stanza: Escape newlines and tabs (\r\n\t) when serializing stanzas. \r\n...Waqas Hussain2014-10-081-2/+13
* | Merge 0.9->0.10Kim Alvefur2014-10-052-6/+11
|\|
| * net.dns: Avoid duplicate cache entriesFlorian Zeitz2014-10-051-4/+9
| * mod_admin_adhoc: Add required to field in user deletion form tooKim Alvefur2014-09-291-1/+1
| * mod_admin_adhoc: Mark 'accountjids' field as required in 'end user sessions' ...Kim Alvefur2014-09-291-1/+1
* | mod_blocklist: Capitalize log messageKim Alvefur2014-10-051-1/+1
* | net.server_select: Reset read timeout timer if the event is handledKim Alvefur2014-10-031-0/+2
* | mod_admin_web: Add "List S2S connections" commandFlorian Zeitz2014-09-281-0/+82
* | mod_admin_adhoc: Show IP in detailed version of online user listingFlorian Zeitz2014-09-281-2/+2
* | net.websocket: Make data masking configurableFlorian Zeitz2014-09-262-3/+3
* | pubsub.lib: Fix variable renaming issueKim Alvefur2014-09-281-1/+1
* | mod_pubsub: Fix retreival of node config defaultsKim Alvefur2014-09-281-2/+2
* | mod_pubsub: Move node config form into pubsub.lib (Thanks Florob)Kim Alvefur2014-09-282-23/+18
* | pubsub.lib: Fix actor in configureKim Alvefur2014-09-281-1/+1
* | mod_pubsub: Add support for requesting default node configurationKim Alvefur2014-09-282-0/+9
* | mod_pubsub: Add max items to node config formKim Alvefur2014-09-281-0/+5
* | util.pubsub: Add support for limiting the number of item in a node (default t...Kim Alvefur2014-09-281-0/+11