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 | 55ba289bedc1580f49af034b8a849958b698de77 (patch) | |
| tree | 9e8179e3cdc021aa83812cf4bbdb4fd0d9cbc814 /plugins/mod_websocket.lua | |
| parent | da6eaea135e293573a6aeaf651ac49288e47e47f (diff) | |
| parent | 9e586ac1dfdf187a7a5d5f80a818c92b13b16f0c (diff) | |
| download | prosody-55ba289bedc1580f49af034b8a849958b698de77.tar.gz prosody-55ba289bedc1580f49af034b8a849958b698de77.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> |