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

Refactored a few for EndPointListener.cs

Browse Source
This commit is contained in:
sta 2015-07-13 18:15:09 +09:00
parent d2dc6ff959
commit 68b9fb0106
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
websocket-sharp/Net/EndPointListener.cs
View File

@ -312,7 +312,6 @@ namespace WebSocketSharp.Net
var host = uri.Host; var host = uri.Host;
var dns = Uri.CheckHostName (host) == UriHostNameType.Dns; var dns = Uri.CheckHostName (host) == UriHostNameType.Dns;
var port = uri.Port; var port = uri.Port;
var path = HttpUtility.UrlDecode (uri.AbsolutePath); var path = HttpUtility.UrlDecode (uri.AbsolutePath);
var pathSlash = path[path.Length - 1] == '/' ? path : path + "/"; var pathSlash = path[path.Length - 1] == '/' ? path : path + "/";
@ -325,11 +324,15 @@ namespace WebSocketSharp.Net
if (ppath.Length < bestLen) if (ppath.Length < bestLen)
continue; continue;
var phost = pref.Host; if (pref.Port != port)
var pdns = Uri.CheckHostName (phost) == UriHostNameType.Dns;
if ((dns && pdns && phost != host) || pref.Port != port)
continue; continue;
if (dns) {
var phost = pref.Host;
if (Uri.CheckHostName (phost) == UriHostNameType.Dns && phost != host)
continue;
}
if (path.StartsWith (ppath) || pathSlash.StartsWith (ppath)) { if (path.StartsWith (ppath) || pathSlash.StartsWith (ppath)) {
bestLen = ppath.Length; bestLen = ppath.Length;
bestMatch = _prefixes[pref]; bestMatch = _prefixes[pref];