Skip to content

Fix websocket server protocol selection #90

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 5, 2018
Merged

Fix websocket server protocol selection #90

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 12 additions & 11 deletions http/websocket.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -752,19 +752,20 @@ function websocket_methods:accept(options, timeout)
response_headers:upsert("sec-websocket-accept", base64_sha1(self.key .. magic))

local chosen_protocol
if self.protocols then
if options.protocols then
for _, protocol in ipairs(options.protocols) do
if self.protocols[protocol] then
chosen_protocol = protocol
break
end
if self.protocols and options.protocols then
--[[ The |Sec-WebSocket-Protocol| request-header field can be
used to indicate what subprotocols (application-level protocols
layered over the WebSocket Protocol) are acceptable to the client.
The server selects one or none of the acceptable protocols and echoes
that value in its handshake to indicate that it has selected that
protocol.]]
for _, protocol in ipairs(options.protocols) do
if self.protocols[protocol] then
response_headers:upsert("sec-websocket-protocol", protocol)
chosen_protocol = protocol
break
end
end
if not chosen_protocol then
return nil, "no matching protocol", ce.EILSEQNOSUPPORT
end
response_headers:upsert("sec-websocket-protocol", chosen_protocol)
end

do
Expand Down