Skip to content

adopt to compare string terminology. #315

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

adopt to compare string terminology. #315

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
19 changes: 12 additions & 7 deletions websocket-sharp/WebSocket.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -776,23 +776,28 @@ private bool checkHandshakeResponse (HttpResponse response, out string message)
return false;
}

var headers = response.Headers;
if (!validateSecWebSocketAcceptHeader (headers["Sec-WebSocket-Accept"])) {
var headersSource = response.Headers;
var headers = new NameValueCollection();
foreach (var name in headersSource.AllKeys) {
headers[name.ToLower()] = headersSource[name];
}

if (!validateSecWebSocketAcceptHeader (headers[("Sec-WebSocket-Accept").ToLower()])) {
message = "Includes no Sec-WebSocket-Accept header, or it has an invalid value.";
return false;
}

if (!validateSecWebSocketProtocolServerHeader (headers["Sec-WebSocket-Protocol"])) {
if (!validateSecWebSocketProtocolServerHeader (headers[("Sec-WebSocket-Protocol").ToLower()])) {
message = "Includes no Sec-WebSocket-Protocol header, or it has an invalid value.";
return false;
}

if (!validateSecWebSocketExtensionsServerHeader (headers["Sec-WebSocket-Extensions"])) {
if (!validateSecWebSocketExtensionsServerHeader (headers[("Sec-WebSocket-Extensions").ToLower()])) {
message = "Includes an invalid Sec-WebSocket-Extensions header.";
return false;
}

if (!validateSecWebSocketVersionServerHeader (headers["Sec-WebSocket-Version"])) {
if (!validateSecWebSocketVersionServerHeader (headers[("Sec-WebSocket-Version").ToLower()])) {
message = "Includes an invalid Sec-WebSocket-Version header.";
return false;
}
Expand Down Expand Up @@ -1185,10 +1190,10 @@ private void doHandshake ()
throw new WebSocketException (CloseStatusCode.ProtocolError, msg);

if (_protocolsRequested)
_protocol = res.Headers["Sec-WebSocket-Protocol"];
_protocol = res.Headers[("Sec-WebSocket-Protocol").ToLower()];

if (_extensionsRequested)
processSecWebSocketExtensionsServerHeader (res.Headers["Sec-WebSocket-Extensions"]);
processSecWebSocketExtensionsServerHeader (res.Headers[("Sec-WebSocket-Extensions").ToLower()]);

processCookies (res.Cookies);
}
Expand Down