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

just remove the damm thing

Browse Source
This commit is contained in:
UbitUmarov
2012-09-26 16:17:49 +01:00
parent 7e3eba1064
commit 617f1b9223
7 changed files with 7 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
View File

@@ -317,6 +317,7 @@ namespace OpenSim.Framework.Servers.HttpServer
StreamReader reader = new StreamReader(requestStream, encoding);
string requestBody = reader.ReadToEnd();
reader.Close();
Hashtable keysvals = new Hashtable();
Hashtable headervals = new Hashtable();

9
OpenSim/Framework/Servers/HttpServer/PollServiceEventArgs.cs
View File

@@ -34,7 +34,7 @@ namespace OpenSim.Framework.Servers.HttpServer
public delegate void RequestMethod(UUID requestID, Hashtable request);
public delegate bool HasEventsMethod(UUID requestID, UUID pId);
public delegate Hashtable GetEventsMethod(UUID requestID, UUID pId, string request);
public delegate Hashtable GetEventsMethod(UUID requestID, UUID pId);
public delegate Hashtable NoEventsMethod(UUID requestID, UUID pId);
@@ -47,13 +47,6 @@ namespace OpenSim.Framework.Servers.HttpServer
public UUID Id;
public int TimeOutms;
public EventType Type;
// must be set true for cases where GetEvents needs to access the request body
// at each pool. http can start processing before having the full body
// but not sure if this is active for poll events
// if original coder thinked its needed i keep it
// if the Event has a Request method this seems to smoke for now
// seems for now nothing actually uses this so default to false
public bool GetEventsNeedsRequestBody = false;
public enum EventType : int
{

18
OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
View File

@@ -336,23 +336,7 @@ namespace OpenSim.Framework.Servers.HttpServer
{
if (req.PollServiceArgs.HasEvents(req.RequestID, req.PollServiceArgs.Id))
{
string strreq = "";
if (req.PollServiceArgs.GetEventsNeedsRequestBody)
{
try
{
// should we try to seek back? fear we can't
str = new StreamReader(req.Request.Body);
strreq = str.ReadToEnd();
str.Close();
}
catch
{
continue;
}
}
Hashtable responsedata = req.PollServiceArgs.GetEvents(req.RequestID, req.PollServiceArgs.Id, strreq);
Hashtable responsedata = req.PollServiceArgs.GetEvents(req.RequestID, req.PollServiceArgs.Id);
if (responsedata == null)
continue;