aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2017-02-25 02:15:15 +0100
committerKim Alvefur <zash@zash.se>2017-02-25 02:15:15 +0100
commit013b8292abda642906ca3ad4f3dc9300cd46954f (patch)
tree490fe6ce78c50d0ff13923b794d6e1f141ec9af5
parent3405d89baaf305a5b0c06005f29fd61616d55349 (diff)
downloadprosody-013b8292abda642906ca3ad4f3dc9300cd46954f.tar.gz
prosody-013b8292abda642906ca3ad4f3dc9300cd46954f.zip
mod_websocket: Set connections starttls method to false to prevent mod_tls from offering starttls (fixes #837)
-rw-r--r--plugins/mod_websocket.lua2
1 files changed, 2 insertions, 0 deletions
diff --git a/plugins/mod_websocket.lua b/plugins/mod_websocket.lua
index c19ad566..47d170a1 100644
--- a/plugins/mod_websocket.lua
+++ b/plugins/mod_websocket.lua
@@ -136,6 +136,8 @@ function handle_request(event)
local request, response = event.request, event.response;
local conn = response.conn;
+ conn.starttls = false; -- Prevent mod_tls from believing starttls can be done
+
if not request.headers.sec_websocket_key then
response.headers.content_type = "text/html";
return [[<!DOCTYPE html><html><head><title>Websocket</title></head><body>