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

Refactored AuthenticationChallenge.cs

Browse Source
This commit is contained in:
sta 2014-06-21 21:28:08 +09:00
parent b2559a3276
commit 7ed991d72e
2 changed files with 12 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
websocket-sharp/AuthenticationChallenge.cs
View File

@ -117,8 +117,9 @@ namespace WebSocketSharp
public static AuthenticationChallenge Parse (string value) public static AuthenticationChallenge Parse (string value)
{ {
var challenge = value.Split (new char [] {' '}, 2); var challenge = value.Split (new [] { ' ' }, 2);
var scheme = challenge [0].ToLower (); var scheme = challenge [0].ToLower ();
return scheme == "basic" || scheme == "digest" return scheme == "basic" || scheme == "digest"
? new AuthenticationChallenge (scheme, challenge [1]) ? new AuthenticationChallenge (scheme, challenge [1])
: null; : null;

26
websocket-sharp/Ext.cs
View File

@ -606,26 +606,20 @@ namespace WebSocketSharp
internal static NameValueCollection ParseAuthParams (this string value) internal static NameValueCollection ParseAuthParams (this string value)
{ {
var result = new NameValueCollection (); var res = new NameValueCollection ();
var i = 0;
string name, val;
foreach (var param in value.SplitHeaderValue (',')) { foreach (var param in value.SplitHeaderValue (',')) {
i = param.IndexOf ('='); var i = param.IndexOf ('=');
if (i > 0) { var name = i > 0 ? param.Substring (0, i).Trim () : null;
name = param.Substring (0, i).Trim (); var val = i < 0
val = i < param.Length - 1 ? param.Trim ().Trim ('"')
? param.Substring (i + 1).Trim ().Trim ('"') : param.Length > i + 1
: String.Empty; ? param.Substring (i + 1).Trim ().Trim ('"')
} : String.Empty;
else {
name = param;
val = String.Empty;
}
result.Add (name, val); res.Add (name, val);
} }
return result; return res;
} }
internal static byte [] ReadBytes (this Stream stream, int length) internal static byte [] ReadBytes (this Stream stream, int length)