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

Refactored HandshakeResponse.cs

Browse Source
This commit is contained in:
sta 2014-06-17 16:23:01 +09:00
parent 3a82b42c25
commit 18217fde59
1 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
websocket-sharp/HandshakeResponse.cs
View File

@ -27,7 +27,6 @@
#endregion #endregion
using System; using System;
using System.Collections.Specialized;
using System.Text; using System.Text;
using WebSocketSharp.Net; using WebSocketSharp.Net;
@ -71,9 +70,9 @@ namespace WebSocketSharp
public AuthenticationChallenge AuthChallenge { public AuthenticationChallenge AuthChallenge {
get { get {
var challenge = Headers ["WWW-Authenticate"]; var auth = Headers ["WWW-Authenticate"];
return challenge != null && challenge.Length > 0 return auth != null && auth.Length > 0
? AuthenticationChallenge.Parse (challenge) ? AuthenticationChallenge.Parse (auth)
: null; : null;
} }
} }
@ -93,7 +92,7 @@ namespace WebSocketSharp
public bool IsWebSocketResponse { public bool IsWebSocketResponse {
get { get {
var headers = Headers; var headers = Headers;
return ProtocolVersion >= HttpVersion.Version11 && return ProtocolVersion > HttpVersion.Version10 &&
_code == "101" && _code == "101" &&
headers.Contains ("Upgrade", "websocket") && headers.Contains ("Upgrade", "websocket") &&
headers.Contains ("Connection", "Upgrade"); headers.Contains ("Connection", "Upgrade");
@ -134,7 +133,7 @@ namespace WebSocketSharp
public static HandshakeResponse Parse (string [] headerParts) public static HandshakeResponse Parse (string [] headerParts)
{ {
var statusLine = headerParts [0].Split (new char [] { ' ' }, 3); var statusLine = headerParts [0].Split (new [] { ' ' }, 3);
if (statusLine.Length != 3) if (statusLine.Length != 3)
throw new ArgumentException ("Invalid status line: " + headerParts [0]); throw new ArgumentException ("Invalid status line: " + headerParts [0]);
@ -162,21 +161,20 @@ namespace WebSocketSharp
public override string ToString () public override string ToString ()
{ {
var buffer = new StringBuilder (64); var output = new StringBuilder (64);
buffer.AppendFormat ( output.AppendFormat ("HTTP/{0} {1} {2}{3}", ProtocolVersion, _code, _reason, CrLf);
"HTTP/{0} {1} {2}{3}", ProtocolVersion, _code, _reason, CrLf);
var headers = Headers; var headers = Headers;
foreach (var key in headers.AllKeys) foreach (var key in headers.AllKeys)
buffer.AppendFormat ("{0}: {1}{2}", key, headers [key], CrLf); output.AppendFormat ("{0}: {1}{2}", key, headers [key], CrLf);
buffer.Append (CrLf); output.Append (CrLf);
var entity = EntityBody; var entity = EntityBody;
if (entity.Length > 0) if (entity.Length > 0)
buffer.Append (entity); output.Append (entity);
return buffer.ToString (); return output.ToString ();
} }
#endregion #endregion