Fix for query string

websocket-sharp/Net/HttpListenerRequest.cs

@@ -334,7 +334,7 @@ namespace WebSocketSharp.Net
     /// </value>
     public NameValueCollection QueryString {
       get {
-        return _queryString ?? (_queryString = createQueryString (_url.Query));
+        return _queryString ?? (_queryString = HttpUtility.ParseQueryStringSimply (_url.Query));
       }
     }
 
@@ -454,34 +454,6 @@ namespace WebSocketSharp.Net
 
     #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 bool tryCreateVersion (string version, out Version result)
     {
       result = null;