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

Fix a few for HttpListenerRequest.cs

Browse Source
This commit is contained in:
sta 2014-05-24 14:26:39 +09:00
parent bdb7e415bd
commit 72565cc8fe
1 changed files with 29 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
websocket-sharp/Net/HttpListenerRequest.cs
View File

@ -463,29 +463,29 @@ namespace WebSocketSharp.Net
#region Private Methods #region Private Methods
private void createQueryString (string query) private static NameValueCollection createQueryString (string query)
{ {
if (query == null || query.Length == 0) { if (query == null || query.Length == 0)
_queryString = new NameValueCollection (1); return new NameValueCollection (1);
return;
}
_queryString = new NameValueCollection (); var res = new NameValueCollection ();
if (query [0] == '?') if (query [0] == '?')
query = query.Substring (1); query = query.Substring (1);
var components = query.Split ('&'); var components = query.Split ('&');
foreach (var component in components) { foreach (var component in components) {
var i = component.IndexOf ('='); var i = component.IndexOf ('=');
if (i == -1) { if (i > -1) {
_queryString.Add (null, HttpUtility.UrlDecode (component));
}
else {
var name = HttpUtility.UrlDecode (component.Substring (0, i)); var name = HttpUtility.UrlDecode (component.Substring (0, i));
var val = HttpUtility.UrlDecode (component.Substring (i + 1)); var val = HttpUtility.UrlDecode (component.Substring (i + 1));
_queryString.Add (name, val); res.Add (name, val);
}
else {
res.Add (null, HttpUtility.UrlDecode (component));
} }
} }
return res;
} }
private static bool tryCreateVersion (string version, out Version result) private static bool tryCreateVersion (string version, out Version result)
@ -578,18 +578,31 @@ namespace WebSocketSharp.Net
if (noHost) if (noHost)
host = UserHostAddress; host = UserHostAddress;
string path; string path = null;
Uri rawUri; Uri rawUri;
if (_rawUrl.MaybeUri () && Uri.TryCreate (_rawUrl, UriKind.Absolute, out rawUri)) { if (_rawUrl == "*") {
}
else if (_rawUrl.StartsWith ("/")) {
path = HttpUtility.UrlDecode (_rawUrl);
}
else if (_rawUrl.MaybeUri () && Uri.TryCreate (_rawUrl, UriKind.Absolute, out rawUri)) {
host = rawUri.Host; host = rawUri.Host;
path = rawUri.PathAndQuery; path = rawUri.PathAndQuery;
} }
else { else {
path = HttpUtility.UrlDecode (_rawUrl); var authority = HttpUtility.UrlDecode (_rawUrl);
var slash = authority.IndexOf ('/');
if (slash > -1) {
host = authority.Substring (0, slash);
path = authority.Substring (slash);
}
else {
host = authority;
}
} }
var colon = host.IndexOf (':'); var colon = host.IndexOf (':');
if (colon != -1) if (colon > -1)
host = host.Substring (0, colon); host = host.Substring (0, colon);
var scheme = IsWebSocketRequest ? "ws" : "http"; var scheme = IsWebSocketRequest ? "ws" : "http";
@ -605,7 +618,7 @@ namespace WebSocketSharp.Net
return; return;
} }
createQueryString (_url.Query); _queryString = createQueryString (_url.Query);
var encoding = Headers ["Transfer-Encoding"]; var encoding = Headers ["Transfer-Encoding"];
if (_version >= HttpVersion.Version11 && encoding != null && encoding.Length > 0) { if (_version >= HttpVersion.Version11 && encoding != null && encoding.Length > 0) {