ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-01 06:06:06 +08:00
Code Issues Packages Projects Releases Wiki Activity

change osrequest Query back to hashtable, add QueryAsDictionary as new better option. (recover compatibily with current external modules

Browse Source
This commit is contained in:
UbitUmarov
2020-04-13 14:24:22 +01:00
parent 745a469af8
commit e0ba96055c
3 changed files with 51 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
OpenSim/Framework/Servers/HttpServer/OSHttpRequest.cs
View File

@@ -123,17 +123,28 @@ namespace OpenSim.Framework.Servers.HttpServer
get { return _request.QueryString;}
}
public Dictionary<string,string> Query
private Hashtable _queryAsHashtable = null;
public Hashtable Query
{
get
{
if (_queryKeyValues == null)
BuildQueryDictionary();
return _queryKeyValues;
if (_queryAsHashtable == null)
BuildQueryHashtable();
return _queryAsHashtable;
}
}
private Dictionary<string, string> _queryKeyValues = null;
//faster than Query
private Dictionary<string, string> _queryAsDictionay = null;
public Dictionary<string,string> QueryAsDictionary
{
get
{
if (_queryAsDictionay == null)
BuildQueryDictionary();
return _queryAsDictionay;
}
}
/// <value>
/// POST request values, if applicable
@@ -150,6 +161,11 @@ namespace OpenSim.Framework.Servers.HttpServer
get { return _request.RemoteIPEndPoint; }
}
public IPEndPoint LocalIPEndPoint
{
get { return _request.LocalIPEndPoint; }
}
public Uri Url
{
get { return _request.Uri; }
@@ -216,19 +232,35 @@ namespace OpenSim.Framework.Servers.HttpServer
private void BuildQueryDictionary()
{
NameValueCollection q = _request.QueryString;
_queryKeyValues = new Dictionary<string, string>(); // only key value pairs
_queryAsDictionay = new Dictionary<string, string>(); // only key value pairs
for(int i = 0; i <q.Count; ++i)
{
try
{
var name = q.GetKey(i);
if(!string.IsNullOrEmpty(name))
_queryKeyValues[name] = q[i];
_queryAsDictionay[name] = q[i];
}
catch {}
}
}
private void BuildQueryHashtable()
{
NameValueCollection q = _request.QueryString;
_queryAsHashtable = new Hashtable();
for (int i = 0; i < q.Count; ++i)
{
try
{
var name = q.GetKey(i);
if (!string.IsNullOrEmpty(name))
_queryAsDictionay[name] = q[i];
}
catch { }
}
}
public override string ToString()
{
StringBuilder me = new StringBuilder();