diff options
| author | Kim Alvefur <zash@zash.se> | 2017-03-01 02:38:05 +0100 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2017-03-01 02:38:05 +0100 |
| commit | a11a584a59cde70ce4f0880049b9e675d8b2e223 (patch) | |
| tree | 9e8179e3cdc021aa83812cf4bbdb4fd0d9cbc814 /plugins/mod_websocket.lua | |
| parent | 93f4c5076db39f3cc14bb2ad989ade760da0f107 (diff) | |
| parent | 4de415d6700cd0f1ab4111cdf4c5f5cb7161c766 (diff) | |
| download | prosody-a11a584a59cde70ce4f0880049b9e675d8b2e223.tar.gz prosody-a11a584a59cde70ce4f0880049b9e675d8b2e223.zip | |
Merge 0.10->trunk
Diffstat (limited to 'plugins/mod_websocket.lua')
| -rw-r--r-- | plugins/mod_websocket.lua | 2 |
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> |