Software / code / prosody
Diff
plugins/mod_websocket.lua @ 7923:81f3068fc30c
Merge 0.10->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Wed, 01 Mar 2017 02:38:05 +0100 |
| parent | 7914:a6eb3b6bf903 |
| child | 7937:5b03a8003659 |
line wrap: on
line diff
--- a/plugins/mod_websocket.lua Sat Feb 25 17:41:39 2017 +0100 +++ b/plugins/mod_websocket.lua Wed Mar 01 02:38:05 2017 +0100 @@ -136,6 +136,8 @@ 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>
