DevWiki/websocket-sharp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[Modify] Polish it

Browse Source
This commit is contained in:
sta 2017-11-24 15:56:43 +09:00
parent f981eb7287
commit f0466795dc
1 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
websocket-sharp/WebSocket.cs
View File

@ -857,23 +857,34 @@ namespace WebSocketSharp
// As server // As server
private bool acceptHandshake () private bool acceptHandshake ()
{ {
_logger.Debug (String.Format ("A request from {0}:\n{1}", _context.UserEndPoint, _context)); var msg = String.Format (
"A handshake request from {0}:\n{1}",
_context.UserEndPoint,
_context
);
_logger.Debug (msg);
string msg;
if (!checkHandshakeRequest (_context, out msg)) { if (!checkHandshakeRequest (_context, out msg)) {
sendHttpResponse (createHandshakeFailureResponse (HttpStatusCode.BadRequest)); var res = createHandshakeFailureResponse (HttpStatusCode.BadRequest);
sendHttpResponse (res);
_logger.Fatal (msg); _logger.Fatal (msg);
fatal ("An error has occurred while accepting.", CloseStatusCode.ProtocolError);
msg = "A fatal error has occurred while attempting to accept.";
fatal (msg, CloseStatusCode.ProtocolError);
return false; return false;
} }
if (!customCheckHandshakeRequest (_context, out msg)) { if (!customCheckHandshakeRequest (_context, out msg)) {
sendHttpResponse (createHandshakeFailureResponse (HttpStatusCode.BadRequest)); var res = createHandshakeFailureResponse (HttpStatusCode.BadRequest);
sendHttpResponse (res);
_logger.Fatal (msg); _logger.Fatal (msg);
fatal ("An error has occurred while accepting.", CloseStatusCode.PolicyViolation);
msg = "A fatal error has occurred while attempting to accept.";
fatal (msg, CloseStatusCode.PolicyViolation);
return false; return false;
} }
@ -883,8 +894,10 @@ namespace WebSocketSharp
if (_protocol != null) if (_protocol != null)
processSecWebSocketProtocolHeader (_context.SecWebSocketProtocols); processSecWebSocketProtocolHeader (_context.SecWebSocketProtocols);
if (!_ignoreExtensions) if (!_ignoreExtensions) {
processSecWebSocketExtensionsClientHeader (_context.Headers["Sec-WebSocket-Extensions"]); var val = _context.Headers["Sec-WebSocket-Extensions"];
processSecWebSocketExtensionsClientHeader (val);
}
return sendHttpResponse (createHandshakeResponse ()); return sendHttpResponse (createHandshakeResponse ());
} }