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

http server: change uri query handling

Browse Source
This commit is contained in:
UbitUmarov
2020-04-11 15:18:49 +01:00
parent 1c6d454691
commit 0d940df4e2
7 changed files with 84 additions and 226 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -120,15 +120,20 @@ namespace OpenSim.Framework.Servers.HttpServer
public NameValueCollection QueryString
{
get { return _queryString; }
get { return _request.QueryString;}
}
private NameValueCollection _queryString;
public Dictionary<string,string> Query
{
get { return _query; }
get
{
if (_queryKeyValues == null)
BuildQueryDictionary();
return _queryKeyValues;
}
}
private Dictionary<string, string> _query;
private Dictionary<string, string> _queryKeyValues = null;
/// <value>
/// POST request values, if applicable
@@ -190,7 +195,7 @@ namespace OpenSim.Framework.Servers.HttpServer
{
_contentEncoding = Encoding.GetEncoding(_request.Headers["content-encoding"]);
}
catch (Exception)
catch
{
// ignore
}
@@ -224,29 +229,6 @@ namespace OpenSim.Framework.Servers.HttpServer
}
}
_queryString = new NameValueCollection();
_query = new Dictionary<string, string>();
try
{
foreach (HttpInputItem item in req.QueryString)
{
try
{
_queryString.Add(item.Name, item.Value);
_query[item.Name] = item.Value;
}
catch (InvalidCastException)
{
_log.DebugFormat("[OSHttpRequest]: error parsing {0} query item, skipping it", item.Name);
continue;
}
}
}
catch (Exception)
{
_log.ErrorFormat("[OSHttpRequest]: Error parsing querystring");
}
// Form = new Hashtable();
// foreach (HttpInputItem item in req.Form)
// {
@@ -255,6 +237,22 @@ namespace OpenSim.Framework.Servers.HttpServer
// }
}
private void BuildQueryDictionary()
{
NameValueCollection q = _request.QueryString;
_queryKeyValues = 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];
}
catch {}
}
}
public override string ToString()
{
StringBuilder me = new StringBuilder();