aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge 0.10 -> trunkWaqas Hussain2014-12-167-7/+18
|\
| * mod_admin_telnet: Use the session-specific print functionKim Alvefur2014-12-131-0/+1
| |
| * mod_storage_sql2, util.sql: Set character encoding on every connectKim Alvefur2014-12-112-2/+1
| |
| * mod_blocklist: Fix importKim Alvefur2014-12-091-1/+1
| |
| * mod_http: Log name and base URL of HTTP appsKim Alvefur2014-12-081-0/+1
| |
| * net.http.server: Log names of the events firedKim Alvefur2014-12-081-1/+1
| |
| * mod_bosh: Use util.asyncKim Alvefur2014-12-071-3/+13
| |
* | 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
| | | | | | | | c6caaa440e74, portmanager assumes non-falsy second return value is an error) (thanks deoren)
* | 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 ↵Kim Alvefur2014-11-191-5/+10
| | | | | | | | | | | | instantiated once
| * | 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 ↵daurnimator2014-11-181-0/+65
| | | | | | | | | | | | net.server as main loop
* | | plugins/muc/muc.lib: Allow muc-broadcast-presence event listeners to modify ↵daurnimator2014-11-141-2/+9
| | | | | | | | | | | | nick, actor, reason
* | | plugins/muc/muc.lib: Don't expose actor jids to users when anonymousdaurnimator2014-11-111-27/+39
| | | | | | | | | | | | | | | * * * plugins/muc/muc.lib: Allow event listeners to modify actor
* | | 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 ↵Kim Alvefur2014-10-301-2/+1
| | | | | | | | | | | | sock:getpeername, it exists and throws an error on unconnected sockets (thanks wirehack7)
| | * 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 ↵Kim Alvefur2014-11-041-0/+8
| | | | | | | | | | | | redirect from without to with slash
| * | 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 ↵Matthew Wild2014-10-241-13/+2
| | | | | | | | | | | | at least Isode M-Link, and possibly standards, while it's not clear it actually fixes the original problem either.
| | * prosodyctl: Fix nil global access traceback in `prosodyctl about` (luarocks ↵Waqas Hussain2014-10-191-1/+1
| | | | | | | | | | | | 2.2.0 no longer uses module())
| | * Tagging 0.9.6Matthew Wild2014-10-150-0/+0
| | |
| | * certmanager, net.http: Disable SSLv3 by defaultMatthew Wild2014-10-142-2/+2
| | |
| * | mod_blocklist: Don't send unavailable presence from unavailable sessions ↵Kim Alvefur2014-10-261-1/+3
| | | | | | | | | | | | when blocking a contact
| * | mod_blocklist: Only log message about migrating from mod_privacy when there ↵Kim Alvefur2014-10-251-1/+1
| | | | | | | | | | | | is data to migrate
| * | 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 ↵Kim Alvefur2014-10-211-1/+1
| | | | | | | | | | | | connections as it may be offered by 3rd party authentication plugins
| * | mod_saslauth: Use a configurable set of mechanisms to not allow over ↵Kim Alvefur2014-10-211-2/+3
| | | | | | | | | | | | unencrypted connections
| * | 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 ↵Kim Alvefur2014-10-213-4/+4
| | | | | | | | | | | | option to s2s_require_encryption so the later overrides the former
| * | prosodyctl: Add 'require_encryption' to list of deprecated options pointed ↵Kim Alvefur2014-10-211-1/+1
| | | | | | | | | | | | out by the check command
* | | net/server: Handle lack of util.signal correctlydaurnimator2014-10-221-4/+10
| | |