aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge 0.10->trunkKim Alvefur2014-11-222-10/+8
|\
| * certmanager, mod_tls: Return final ssl config as third return value (fix for ...Kim Alvefur2014-11-222-10/+8
* | Merge 0.10->trunkKim Alvefur2014-11-204-20/+36
|\|
| * Merge 0.9->0.10Kim Alvefur2014-11-201-6/+6
| |\
| | * net.http.parser: Fix whitespace/indentationMatthew Wild2014-11-181-5/+5
| | * net.http.parser: Fix chunked encoding parsing across packet boundaries.daurnimator2014-11-101-1/+1
| * | mod_tls: Keep ssl config around and attach them to sessionsKim Alvefur2014-11-191-6/+12
| * | certmanager: Return final ssl config along with ssl context on successKim Alvefur2014-11-191-1/+3
| * | mod_saslauth: Make it easier to support multiple channel binding methondsKim Alvefur2014-11-191-2/+4
| * | 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
* | | Merge 0.10->trunkMatthew Wild2014-11-202-2/+6
|\| |
| * | mod_pubsub: Add support for including the publisher in item broadcastsPhilipp Hancke2014-11-202-2/+6
* | | net.cqueues: Add module that allows use of cqueues while still using net.serv...daurnimator2014-11-181-0/+65
* | | plugins/muc/muc.lib: Allow muc-broadcast-presence event listeners to modify n...daurnimator2014-11-141-2/+9
* | | plugins/muc/muc.lib: Don't expose actor jids to users when anonymousdaurnimator2014-11-111-27/+39
* | | Merge 0.10->trunkKim Alvefur2014-11-095-11/+30
|\| |
| * | 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.10->trunkKim Alvefur2014-10-267-26/+26
|\| |
| * | 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
* | | net/server: Handle lack of util.signal correctlydaurnimator2014-10-221-4/+10
* | | net/server: Remove printdaurnimator2014-10-221-1/+0
* | | net.server: Rename 'server' config option to 'network_backend' (to select whi...Matthew Wild2014-10-221-1/+1
* | | net/server: If server.hook_signal exists, overwrite signal.signal; else make ...daurnimator2014-10-211-16/+18
* | | Move timer code out of util.timer and into relevant net.server backendsdaurnimator2014-10-203-66/+65
* | | net/server: Split up different backends in a nicer way. Add global config opt...daurnimator2014-10-171-38/+51
* | | plugins/muc/mod_muc: Add 'local_only' flag to mod_muc, so rooms don't get res...daurnimator2014-10-171-7/+9
* | | plugins/muc/muc.lib: Add :each_affiliation() iteratordaurnimator2014-10-151-5/+20