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

Fix for query string

Browse Source
This commit is contained in:
sta
2014-05-30 16:19:23 +09:00
parent 93295d1eb4
commit 4bf079b1a2
3 changed files with 34 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
websocket-sharp/Net/WebSockets/TcpListenerWebSocketContext.cs
View File

@@ -189,7 +189,8 @@ namespace WebSocketSharp.Net.WebSockets
public override NameValueCollection QueryString {
get {
return _queryString ??
(_queryString = createQueryString (_uri != null ? _uri.Query : null));
(_queryString =
HttpUtility.ParseQueryStringSimply (_uri != null ? _uri.Query : null));
}
}
@@ -309,34 +310,6 @@ namespace WebSocketSharp.Net.WebSockets
#region Private Methods
private static NameValueCollection createQueryString (string query)
{
if (query == null || query.Length == 0)
return new NameValueCollection (1);
var res = new NameValueCollection ();
if (query [0] == '?')
query = query.Substring (1);
var components = query.Split ('&');
foreach (var component in components) {
var i = component.IndexOf ('=');
if (i > -1) {
var name = HttpUtility.UrlDecode (component.Substring (0, i));
var val = component.Length > i + 1
? HttpUtility.UrlDecode (component.Substring (i + 1))
: String.Empty;
res.Add (name, val);
}
else {
res.Add (null, HttpUtility.UrlDecode (component));
}
}
return res;
}
private static Uri createRequestUrl (HandshakeRequest request, bool secure)
{
var host = request.Headers ["Host"];