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

Refactored WebSocket.cs

Browse Source
This commit is contained in:
sta 2014-12-17 14:10:58 +09:00
parent 94c26e6107
commit 54bb87140e
1 changed files with 12 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
websocket-sharp/WebSocket.cs
View File

@ -602,13 +602,13 @@ namespace WebSocketSharp
{ {
var headers = context.Headers; var headers = context.Headers;
return context.RequestUri == null return context.RequestUri == null
? "An invalid request url." ? "Specifies an invalid Request-URI."
: !context.IsWebSocketRequest : !context.IsWebSocketRequest
? "Not a WebSocket connection request." ? "Not a WebSocket connection request."
: !validateSecWebSocketKeyHeader (headers["Sec-WebSocket-Key"]) : !validateSecWebSocketKeyHeader (headers["Sec-WebSocket-Key"])
? "Invalid Sec-WebSocket-Key header." ? "Includes an invalid Sec-WebSocket-Key header."
: !validateSecWebSocketVersionClientHeader (headers["Sec-WebSocket-Version"]) : !validateSecWebSocketVersionClientHeader (headers["Sec-WebSocket-Version"])
? "Invalid Sec-WebSocket-Version header." ? "Includes an invalid Sec-WebSocket-Version header."
: CustomHandshakeRequestChecker (context); : CustomHandshakeRequestChecker (context);
} }
@ -617,19 +617,19 @@ namespace WebSocketSharp
{ {
var headers = response.Headers; var headers = response.Headers;
return response.IsRedirect return response.IsRedirect
? "A Redirect response was received." ? "Indicates the redirection."
: response.IsUnauthorized : response.IsUnauthorized
? "An HTTP authentication is required." ? "Requires the HTTP authentication."
: !response.IsWebSocketResponse : !response.IsWebSocketResponse
? "Not a WebSocket connection response." ? "Not a WebSocket connection response."
: !validateSecWebSocketAcceptHeader (headers["Sec-WebSocket-Accept"]) : !validateSecWebSocketAcceptHeader (headers["Sec-WebSocket-Accept"])
? "Invalid Sec-WebSocket-Accept header." ? "Includes an invalid Sec-WebSocket-Accept header."
: !validateSecWebSocketProtocolHeader (headers["Sec-WebSocket-Protocol"]) : !validateSecWebSocketProtocolHeader (headers["Sec-WebSocket-Protocol"])
? "Invalid Sec-WebSocket-Protocol header." ? "Includes an invalid Sec-WebSocket-Protocol header."
: !validateSecWebSocketExtensionsHeader (headers["Sec-WebSocket-Extensions"]) : !validateSecWebSocketExtensionsHeader (headers["Sec-WebSocket-Extensions"])
? "Invalid Sec-WebSocket-Extensions header." ? "Includes an invalid Sec-WebSocket-Extensions header."
: !validateSecWebSocketVersionServerHeader (headers["Sec-WebSocket-Version"]) : !validateSecWebSocketVersionServerHeader (headers["Sec-WebSocket-Version"])
? "Invalid Sec-WebSocket-Version header." ? "Includes an invalid Sec-WebSocket-Version header."
: null; : null;
} }
@ -1268,20 +1268,17 @@ namespace WebSocketSharp
if (res.IsRedirect) { if (res.IsRedirect) {
var url = res.Headers["Location"]; var url = res.Headers["Location"];
_logger.Warn ( _logger.Warn (String.Format ("Received a redirection to '{0}'.", url));
String.Format (
"Received a Redirect response that specifies the Location to '{0}'.", url));
if (_enableRedirection) { if (_enableRedirection) {
if (url == null) { if (url == null) {
_logger.Error ("No url to redirect is specified."); _logger.Error ("No url to redirect is located.");
return res; return res;
} }
Uri uri; Uri uri;
string msg; string msg;
if (!url.TryCreateWebSocketUri (out uri, out msg)) { if (!url.TryCreateWebSocketUri (out uri, out msg)) {
_logger.Error ("An invalid url to redirect: " + msg); _logger.Error ("An invalid url to redirect is located: " + msg);
return res; return res;
} }