[Modify] Polish it

This commit is contained in:
sta 2018-02-06 17:10:43 +09:00
parent 165dce6767
commit 2d47d5e663

View File

@ -612,12 +612,19 @@ namespace WebSocketSharp.Net
internal static Encoding GetEncoding (string contentType)
{
foreach (var elm in contentType.Split (';')) {
var name = "charset=";
var comparison = StringComparison.OrdinalIgnoreCase;
foreach (var elm in contentType.SplitHeaderValue (';')) {
var part = elm.Trim ();
if (part.IndexOf ("charset", StringComparison.OrdinalIgnoreCase) != 0)
if (part.IndexOf (name, comparison) != 0)
continue;
return Encoding.GetEncoding (part.GetValue ('=', true));
var val = part.GetValue ('=', true);
if (val == null || val.Length == 0)
return null;
return Encoding.GetEncoding (val);
}
return null;