[Modify] Polish it

This commit is contained in:
sta 2020-10-13 19:39:38 +09:00
parent 578f394de4
commit c29d31492d

View File

@ -353,7 +353,9 @@ namespace WebSocketSharp.Net
var dns = Uri.CheckHostName (host) == UriHostNameType.Dns; var dns = Uri.CheckHostName (host) == UriHostNameType.Dns;
var port = uri.Port.ToString (); var port = uri.Port.ToString ();
var path = HttpUtility.UrlDecode (uri.AbsolutePath); var path = HttpUtility.UrlDecode (uri.AbsolutePath);
var pathSlash = path[path.Length - 1] != '/' ? path + "/" : path;
if (path[path.Length - 1] != '/')
path += "/";
if (host != null && host.Length > 0) { if (host != null && host.Length > 0) {
var bestLen = -1; var bestLen = -1;
@ -378,7 +380,7 @@ namespace WebSocketSharp.Net
if (len < bestLen) if (len < bestLen)
continue; continue;
if (path.StartsWith (prefPath) || pathSlash.StartsWith (prefPath)) { if (path.StartsWith (prefPath)) {
bestLen = len; bestLen = len;
listener = pref.Listener; listener = pref.Listener;
} }
@ -391,18 +393,12 @@ namespace WebSocketSharp.Net
var prefs = _unhandled; var prefs = _unhandled;
listener = searchHttpListenerFromSpecial (path, prefs); listener = searchHttpListenerFromSpecial (path, prefs);
if (listener == null && pathSlash != path)
listener = searchHttpListenerFromSpecial (pathSlash, prefs);
if (listener != null) if (listener != null)
return true; return true;
prefs = _all; prefs = _all;
listener = searchHttpListenerFromSpecial (path, prefs); listener = searchHttpListenerFromSpecial (path, prefs);
if (listener == null && pathSlash != path)
listener = searchHttpListenerFromSpecial (pathSlash, prefs);
return listener != null; return listener != null;
} }