diff --git a/OpenSim/ApplicationPlugins/Rest/Inventory/RestHandler.cs b/OpenSim/ApplicationPlugins/Rest/Inventory/RestHandler.cs
index db62d52438..cb88695600 100644
--- a/OpenSim/ApplicationPlugins/Rest/Inventory/RestHandler.cs
+++ b/OpenSim/ApplicationPlugins/Rest/Inventory/RestHandler.cs
@@ -539,7 +539,6 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory
/// path has not already been registered, the method is added to the active
/// handler table.
///
-
public void AddStreamHandler(string httpMethod, string path, RestMethod method)
{
if (!IsEnabled)
diff --git a/OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs b/OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs
index abdbc7268b..ae6c44bb6a 100644
--- a/OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs
+++ b/OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs
@@ -77,7 +77,6 @@ namespace OpenSim.Capabilities.Handlers
{
m_log.Error("[GETTEXTURE]: Cannot fetch texture " + textureStr + " without an asset service");
httpResponse.StatusCode = (int)System.Net.HttpStatusCode.NotFound;
- return null;
}
UUID textureID;
@@ -115,7 +114,6 @@ namespace OpenSim.Capabilities.Handlers
// "[GETTEXTURE]: For texture {0} sending back response {1}, data length {2}",
// textureID, httpResponse.StatusCode, httpResponse.ContentLength);
- httpResponse.Send();
return null;
}
diff --git a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
index f5addc817e..9cc1d4c382 100644
--- a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
+++ b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
@@ -408,7 +408,10 @@ namespace OpenSim.Framework.Servers.HttpServer
string uriString = request.RawUrl;
// string reqnum = "unknown";
- int tickstart = Environment.TickCount;
+ int requestStartTick = Environment.TickCount;
+
+ // Will be adjusted later on.
+ int requestEndTick = requestStartTick;
IRequestHandler requestHandler = null;
@@ -433,6 +436,7 @@ namespace OpenSim.Framework.Servers.HttpServer
{
if (HandleAgentRequest(agentHandler, request, response))
{
+ requestEndTick = Environment.TickCount;
return;
}
}
@@ -442,6 +446,7 @@ namespace OpenSim.Framework.Servers.HttpServer
string path = request.RawUrl;
string handlerKey = GetHandlerKey(request.HttpMethod, path);
+ byte[] buffer = null;
if (TryGetStreamHandler(handlerKey, out requestHandler))
{
@@ -450,9 +455,6 @@ namespace OpenSim.Framework.Servers.HttpServer
"[BASE HTTP SERVER]: Found stream handler for {0} {1} {2} {3}",
request.HttpMethod, request.Url.PathAndQuery, requestHandler.Name, requestHandler.Description);
- // Okay, so this is bad, but should be considered temporary until everything is IStreamHandler.
- byte[] buffer = null;
-
response.ContentType = requestHandler.ContentType; // Lets do this defaulting before in case handler has varying content type.
if (requestHandler is IStreamedRequestHandler)
@@ -507,8 +509,8 @@ namespace OpenSim.Framework.Servers.HttpServer
//m_log.Warn("[HTTP]: " + requestBody);
}
- DoHTTPGruntWork(HTTPRequestHandler.Handle(path, keysvals), response);
- return;
+
+ buffer = DoHTTPGruntWork(HTTPRequestHandler.Handle(path, keysvals), response);
}
else
{
@@ -521,133 +523,100 @@ namespace OpenSim.Framework.Servers.HttpServer
buffer = memoryStream.ToArray();
}
}
+ }
+ else
+ {
+ switch (request.ContentType)
+ {
+ case null:
+ case "text/html":
+
+ if (DebugLevel >= 1)
+ m_log.DebugFormat(
+ "[BASE HTTP SERVER]: Found a {0} content type handler for {1} {2}",
+ request.ContentType, request.HttpMethod, request.Url.PathAndQuery);
+
+ buffer = HandleHTTPRequest(request, response);
+ break;
+
+ case "application/llsd+xml":
+ case "application/xml+llsd":
+ case "application/llsd+json":
+
+ if (DebugLevel >= 1)
+ m_log.DebugFormat(
+ "[BASE HTTP SERVER]: Found a {0} content type handler for {1} {2}",
+ request.ContentType, request.HttpMethod, request.Url.PathAndQuery);
+
+ buffer = HandleLLSDRequests(request, response);
+ break;
+
+ case "text/xml":
+ case "application/xml":
+ case "application/json":
+ default:
+ //m_log.Info("[Debug BASE HTTP SERVER]: in default handler");
+ // Point of note.. the DoWeHaveA methods check for an EXACT path
+ // if (request.RawUrl.Contains("/CAPS/EQG"))
+ // {
+ // int i = 1;
+ // }
+ //m_log.Info("[Debug BASE HTTP SERVER]: Checking for LLSD Handler");
+ if (DoWeHaveALLSDHandler(request.RawUrl))
+ {
+ if (DebugLevel >= 1)
+ m_log.DebugFormat(
+ "[BASE HTTP SERVER]: Found a {0} content type handler for {1} {2}",
+ request.ContentType, request.HttpMethod, request.Url.PathAndQuery);
+
+ buffer = HandleLLSDRequests(request, response);
+ }
+ // m_log.DebugFormat("[BASE HTTP SERVER]: Checking for HTTP Handler for request {0}", request.RawUrl);
+ else if (DoWeHaveAHTTPHandler(request.RawUrl))
+ {
+ if (DebugLevel >= 1)
+ m_log.DebugFormat(
+ "[BASE HTTP SERVER]: Found a {0} content type handler for {1} {2}",
+ request.ContentType, request.HttpMethod, request.Url.PathAndQuery);
+
+ buffer = HandleHTTPRequest(request, response);
+ }
+ else
+ {
+
+ if (DebugLevel >= 1)
+ m_log.DebugFormat(
+ "[BASE HTTP SERVER]: Assuming a generic XMLRPC request for {0} {1}",
+ request.HttpMethod, request.Url.PathAndQuery);
+
+ // generic login request.
+ buffer = HandleXmlRpcRequests(request, response);
+ }
+
+ break;
+ }
+ }
- request.InputStream.Close();
-
- // HTTP IN support. The script engine takes it from here
- // Nothing to worry about for us.
- //
- if (buffer == null)
- return;
+ request.InputStream.Close();
+ if (buffer != null)
+ {
if (!response.SendChunked)
response.ContentLength64 = buffer.LongLength;
- try
- {
- response.OutputStream.Write(buffer, 0, buffer.Length);
- //response.OutputStream.Close();
- }
- catch (HttpListenerException)
- {
- m_log.WarnFormat("[BASE HTTP SERVER]: HTTP request abnormally terminated.");
- }
- //response.OutputStream.Close();
- try
- {
- response.Send();
- //response.FreeContext();
- }
- catch (SocketException e)
- {
- // This has to be here to prevent a Linux/Mono crash
- m_log.Warn(String.Format("[BASE HTTP SERVER]: XmlRpcRequest issue {0}.\nNOTE: this may be spurious on Linux. ", e.Message), e);
- }
- catch (IOException e)
- {
- m_log.Warn(String.Format("[BASE HTTP SERVER]: XmlRpcRequest issue {0}. ", e.Message), e);
- }
-
- return;
+ response.OutputStream.Write(buffer, 0, buffer.Length);
}
- if (request.AcceptTypes != null && request.AcceptTypes.Length > 0)
- {
- foreach (string strAccept in request.AcceptTypes)
- {
- if (strAccept.Contains("application/llsd+xml") ||
- strAccept.Contains("application/llsd+json"))
- {
- if (DebugLevel >= 1)
- m_log.DebugFormat(
- "[BASE HTTP SERVER]: Found application/llsd+xml accept header handler for {0} {1}",
- request.HttpMethod, request.Url.PathAndQuery);
+ // Do not include the time taken to actually send the response to the caller in the measurement
+ // time. This is to avoid logging when it's the client that is slow to process rather than the
+ // server
+ requestEndTick = Environment.TickCount;
- HandleLLSDRequests(request, response);
- return;
- }
- }
- }
+ response.Send();
- switch (request.ContentType)
- {
- case null:
- case "text/html":
+ //response.OutputStream.Close();
- if (DebugLevel >= 1)
- m_log.DebugFormat(
- "[BASE HTTP SERVER]: Found a {0} content type handler for {1} {2}",
- request.ContentType, request.HttpMethod, request.Url.PathAndQuery);
-
- HandleHTTPRequest(request, response);
- return;
-
- case "application/llsd+xml":
- case "application/xml+llsd":
- case "application/llsd+json":
-
- if (DebugLevel >= 1)
- m_log.DebugFormat(
- "[BASE HTTP SERVER]: Found a {0} content type handler for {1} {2}",
- request.ContentType, request.HttpMethod, request.Url.PathAndQuery);
-
- HandleLLSDRequests(request, response);
- return;
-
- case "text/xml":
- case "application/xml":
- case "application/json":
- default:
- //m_log.Info("[Debug BASE HTTP SERVER]: in default handler");
- // Point of note.. the DoWeHaveA methods check for an EXACT path
- // if (request.RawUrl.Contains("/CAPS/EQG"))
- // {
- // int i = 1;
- // }
- //m_log.Info("[Debug BASE HTTP SERVER]: Checking for LLSD Handler");
- if (DoWeHaveALLSDHandler(request.RawUrl))
- {
- if (DebugLevel >= 1)
- m_log.DebugFormat(
- "[BASE HTTP SERVER]: Found a {0} content type handler for {1} {2}",
- request.ContentType, request.HttpMethod, request.Url.PathAndQuery);
-
- HandleLLSDRequests(request, response);
- return;
- }
-
-// m_log.DebugFormat("[BASE HTTP SERVER]: Checking for HTTP Handler for request {0}", request.RawUrl);
- if (DoWeHaveAHTTPHandler(request.RawUrl))
- {
- if (DebugLevel >= 1)
- m_log.DebugFormat(
- "[BASE HTTP SERVER]: Found a {0} content type handler for {1} {2}",
- request.ContentType, request.HttpMethod, request.Url.PathAndQuery);
-
- HandleHTTPRequest(request, response);
- return;
- }
-
- if (DebugLevel >= 1)
- m_log.DebugFormat(
- "[BASE HTTP SERVER]: Assuming a generic XMLRPC request for {0} {1}",
- request.HttpMethod, request.Url.PathAndQuery);
-
- // generic login request.
- HandleXmlRpcRequests(request, response);
-
- return;
- }
+ //response.FreeContext();
}
catch (SocketException e)
{
@@ -672,8 +641,8 @@ namespace OpenSim.Framework.Servers.HttpServer
finally
{
// Every month or so this will wrap and give bad numbers, not really a problem
- // since its just for reporting, tickdiff limit can be adjusted
- int tickdiff = Environment.TickCount - tickstart;
+ // since its just for reporting
+ int tickdiff = requestEndTick - requestStartTick;
if (tickdiff > 3000)
{
m_log.InfoFormat(
@@ -805,7 +774,7 @@ namespace OpenSim.Framework.Servers.HttpServer
///
///
///
- private void HandleXmlRpcRequests(OSHttpRequest request, OSHttpResponse response)
+ private byte[] HandleXmlRpcRequests(OSHttpRequest request, OSHttpResponse response)
{
Stream requestStream = request.InputStream;
@@ -817,7 +786,7 @@ namespace OpenSim.Framework.Servers.HttpServer
requestStream.Close();
//m_log.Debug(requestBody);
requestBody = requestBody.Replace("", "");
- string responseString = String.Empty;
+ string responseString = null;
XmlRpcRequest xmlRprcRequest = null;
try
@@ -895,6 +864,7 @@ namespace OpenSim.Framework.Servers.HttpServer
String.Format("Requested method [{0}] not found", methodName));
}
+ response.ContentType = "text/xml";
responseString = XmlRpcResponseSerializer.Singleton.Serialize(xmlRpcResponse);
}
else
@@ -904,82 +874,25 @@ namespace OpenSim.Framework.Servers.HttpServer
response.StatusCode = 404;
response.StatusDescription = "Not Found";
response.ProtocolVersion = "HTTP/1.0";
- byte[] buf = Encoding.UTF8.GetBytes("Not found");
+ responseString = "Not found";
response.KeepAlive = false;
m_log.ErrorFormat(
"[BASE HTTP SERVER]: Handler not found for http request {0} {1}",
request.HttpMethod, request.Url.PathAndQuery);
-
- response.SendChunked = false;
- response.ContentLength64 = buf.Length;
- response.ContentEncoding = Encoding.UTF8;
-
- try
- {
- response.OutputStream.Write(buf, 0, buf.Length);
- }
- catch (Exception ex)
- {
- m_log.Warn("[BASE HTTP SERVER]: Error - " + ex.Message);
- }
- finally
- {
- try
- {
- response.Send();
- //response.FreeContext();
- }
- catch (SocketException e)
- {
- // This has to be here to prevent a Linux/Mono crash
- m_log.Warn(String.Format("[BASE HTTP SERVER]: XmlRpcRequest issue {0}.\nNOTE: this may be spurious on Linux. ", e.Message), e);
- }
- catch (IOException e)
- {
- m_log.Warn(String.Format("[BASE HTTP SERVER]: XmlRpcRequest issue {0} ", e.Message), e);
- }
- }
- return;
- //responseString = "Error";
}
}
- response.ContentType = "text/xml";
-
byte[] buffer = Encoding.UTF8.GetBytes(responseString);
response.SendChunked = false;
response.ContentLength64 = buffer.Length;
response.ContentEncoding = Encoding.UTF8;
- try
- {
- response.OutputStream.Write(buffer, 0, buffer.Length);
- }
- catch (Exception ex)
- {
- m_log.Warn("[BASE HTTP SERVER]: Error - " + ex.Message);
- }
- finally
- {
- try
- {
- response.Send();
- //response.FreeContext();
- }
- catch (SocketException e)
- {
- // This has to be here to prevent a Linux/Mono crash
- m_log.Warn(String.Format("[BASE HTTP SERVER]: XmlRpcRequest issue {0}.\nNOTE: this may be spurious on Linux. ", e.Message), e);
- }
- catch (IOException e)
- {
- m_log.Warn(String.Format("[BASE HTTP SERVER]: XmlRpcRequest issue {0} ", e.Message), e);
- }
- }
+
+ return buffer;
}
- private void HandleLLSDRequests(OSHttpRequest request, OSHttpResponse response)
+ private byte[] HandleLLSDRequests(OSHttpRequest request, OSHttpResponse response)
{
//m_log.Warn("[BASE HTTP SERVER]: We've figured out it's a LLSD Request");
Stream requestStream = request.InputStream;
@@ -1065,34 +978,7 @@ namespace OpenSim.Framework.Servers.HttpServer
response.ContentEncoding = Encoding.UTF8;
response.KeepAlive = true;
- try
- {
- response.OutputStream.Write(buffer, 0, buffer.Length);
- }
- catch (Exception ex)
- {
- m_log.Warn("[BASE HTTP SERVER]: Error - " + ex.Message);
- }
- finally
- {
- //response.OutputStream.Close();
- try
- {
- response.Send();
- response.OutputStream.Flush();
- //response.FreeContext();
- //response.OutputStream.Close();
- }
- catch (IOException e)
- {
- m_log.Warn(String.Format("[BASE HTTP SERVER]: LLSD IOException {0} ", e.Message), e);
- }
- catch (SocketException e)
- {
- // This has to be here to prevent a Linux/Mono crash
- m_log.Warn(String.Format("[BASE HTTP SERVER]: LLSD issue {0}.\nNOTE: this may be spurious on Linux. ", e.Message), e);
- }
- }
+ return buffer;
}
private byte[] BuildLLSDResponse(OSHttpRequest request, OSHttpResponse response, OSD llsdResponse)
@@ -1357,7 +1243,7 @@ namespace OpenSim.Framework.Servers.HttpServer
}
- public void HandleHTTPRequest(OSHttpRequest request, OSHttpResponse response)
+ public byte[] HandleHTTPRequest(OSHttpRequest request, OSHttpResponse response)
{
// m_log.DebugFormat(
// "[BASE HTTP SERVER]: HandleHTTPRequest for request to {0}, method {1}",
@@ -1367,15 +1253,14 @@ namespace OpenSim.Framework.Servers.HttpServer
{
case "OPTIONS":
response.StatusCode = (int)OSHttpStatusCode.SuccessOk;
- return;
+ return null;
default:
- HandleContentVerbs(request, response);
- return;
+ return HandleContentVerbs(request, response);
}
}
- private void HandleContentVerbs(OSHttpRequest request, OSHttpResponse response)
+ private byte[] HandleContentVerbs(OSHttpRequest request, OSHttpResponse response)
{
// m_log.DebugFormat("[BASE HTTP SERVER]: HandleContentVerbs for request to {0}", request.RawUrl);
@@ -1391,6 +1276,8 @@ namespace OpenSim.Framework.Servers.HttpServer
// to display the form, or process it.
// a better way would be nifty.
+ byte[] buffer;
+
Stream requestStream = request.InputStream;
Encoding encoding = Encoding.UTF8;
@@ -1451,14 +1338,14 @@ namespace OpenSim.Framework.Servers.HttpServer
if (foundHandler)
{
Hashtable responsedata1 = requestprocessor(keysvals);
- DoHTTPGruntWork(responsedata1,response);
+ buffer = DoHTTPGruntWork(responsedata1,response);
//SendHTML500(response);
}
else
{
// m_log.Warn("[BASE HTTP SERVER]: Handler Not Found");
- SendHTML404(response, host);
+ buffer = SendHTML404(response, host);
}
}
else
@@ -1468,16 +1355,18 @@ namespace OpenSim.Framework.Servers.HttpServer
if (foundHandler)
{
Hashtable responsedata2 = requestprocessor(keysvals);
- DoHTTPGruntWork(responsedata2, response);
+ buffer = DoHTTPGruntWork(responsedata2, response);
//SendHTML500(response);
}
else
{
// m_log.Warn("[BASE HTTP SERVER]: Handler Not Found2");
- SendHTML404(response, host);
+ buffer = SendHTML404(response, host);
}
}
+
+ return buffer;
}
private bool TryGetHTTPHandlerPathBased(string path, out GenericHTTPMethod httpHandler)
@@ -1545,7 +1434,7 @@ namespace OpenSim.Framework.Servers.HttpServer
}
}
- internal void DoHTTPGruntWork(Hashtable responsedata, OSHttpResponse response)
+ internal byte[] DoHTTPGruntWork(Hashtable responsedata, OSHttpResponse response)
{
int responsecode;
string responseString;
@@ -1639,38 +1528,10 @@ namespace OpenSim.Framework.Servers.HttpServer
response.ContentLength64 = buffer.Length;
response.ContentEncoding = Encoding.UTF8;
- try
- {
- response.OutputStream.Write(buffer, 0, buffer.Length);
- }
- catch (Exception ex)
- {
- m_log.Warn("[HTTPD]: Error - " + ex.Message);
- }
- finally
- {
- //response.OutputStream.Close();
- try
- {
- response.OutputStream.Flush();
- response.Send();
-
- //if (!response.KeepAlive && response.ReuseContext)
- // response.FreeContext();
- }
- catch (SocketException e)
- {
- // This has to be here to prevent a Linux/Mono crash
- m_log.Warn(String.Format("[BASE HTTP SERVER]: XmlRpcRequest issue {0}.\nNOTE: this may be spurious on Linux. ", e.Message), e);
- }
- catch (IOException e)
- {
- m_log.Warn(String.Format("[BASE HTTP SERVER]: XmlRpcRequest issue {0} ", e.Message), e);
- }
- }
+ return buffer;
}
- public void SendHTML404(OSHttpResponse response, string host)
+ public byte[] SendHTML404(OSHttpResponse response, string host)
{
// I know this statuscode is dumb, but the client doesn't respond to 404s and 500s
response.StatusCode = 404;
@@ -1683,31 +1544,10 @@ namespace OpenSim.Framework.Servers.HttpServer
response.ContentLength64 = buffer.Length;
response.ContentEncoding = Encoding.UTF8;
- try
- {
- response.OutputStream.Write(buffer, 0, buffer.Length);
- }
- catch (Exception ex)
- {
- m_log.Warn("[BASE HTTP SERVER]: Error - " + ex.Message);
- }
- finally
- {
- //response.OutputStream.Close();
- try
- {
- response.Send();
- //response.FreeContext();
- }
- catch (SocketException e)
- {
- // This has to be here to prevent a Linux/Mono crash
- m_log.Warn(String.Format("[BASE HTTP SERVER]: XmlRpcRequest issue {0}.\nNOTE: this may be spurious on Linux. ", e.Message), e);
- }
- }
+ return buffer;
}
- public void SendHTML500(OSHttpResponse response)
+ public byte[] SendHTML500(OSHttpResponse response)
{
// I know this statuscode is dumb, but the client doesn't respond to 404s and 500s
response.StatusCode = (int)OSHttpStatusCode.SuccessOk;
@@ -1719,28 +1559,8 @@ namespace OpenSim.Framework.Servers.HttpServer
response.SendChunked = false;
response.ContentLength64 = buffer.Length;
response.ContentEncoding = Encoding.UTF8;
- try
- {
- response.OutputStream.Write(buffer, 0, buffer.Length);
- }
- catch (Exception ex)
- {
- m_log.Warn("[BASE HTTP SERVER]: Error - " + ex.Message);
- }
- finally
- {
- //response.OutputStream.Close();
- try
- {
- response.Send();
- //response.FreeContext();
- }
- catch (SocketException e)
- {
- // This has to be here to prevent a Linux/Mono crash
- m_log.Warn(String.Format("[BASE HTTP SERVER] XmlRpcRequest issue {0}.\nNOTE: this may be spurious on Linux. ", e.Message), e);
- }
- }
+
+ return buffer;
}
public void Start()
diff --git a/OpenSim/Framework/Servers/HttpServer/Interfaces/IOSHttpResponse.cs b/OpenSim/Framework/Servers/HttpServer/Interfaces/IOSHttpResponse.cs
index 33a1663358..f61b090be4 100644
--- a/OpenSim/Framework/Servers/HttpServer/Interfaces/IOSHttpResponse.cs
+++ b/OpenSim/Framework/Servers/HttpServer/Interfaces/IOSHttpResponse.cs
@@ -128,11 +128,5 @@ namespace OpenSim.Framework.Servers.HttpServer
/// string containing the header field
/// value
void AddHeader(string key, string value);
-
- ///
- /// Send the response back to the remote client
- ///
- void Send();
}
-}
-
+}
\ No newline at end of file
diff --git a/OpenSim/Framework/Servers/HttpServer/OSHttpResponse.cs b/OpenSim/Framework/Servers/HttpServer/OSHttpResponse.cs
index f9227ace62..89fb5d4562 100644
--- a/OpenSim/Framework/Servers/HttpServer/OSHttpResponse.cs
+++ b/OpenSim/Framework/Servers/HttpServer/OSHttpResponse.cs
@@ -321,13 +321,12 @@ namespace OpenSim.Framework.Servers.HttpServer
{
_httpResponse.Body.Flush();
_httpResponse.Send();
-
}
+
public void FreeContext()
{
if (_httpClientContext != null)
_httpClientContext.Close();
}
-
}
}
\ No newline at end of file
diff --git a/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs b/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
index f96fd1fa20..3252251702 100644
--- a/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
+++ b/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
@@ -140,9 +140,8 @@ namespace OpenSim.Framework.Servers.HttpServer
foreach (object o in m_requests)
{
PollServiceHttpRequest req = (PollServiceHttpRequest) o;
- m_server.DoHTTPGruntWork(
- req.PollServiceArgs.NoEvents(req.RequestID, req.PollServiceArgs.Id),
- new OSHttpResponse(new HttpResponse(req.HttpContext, req.Request), req.HttpContext));
+ PollServiceWorkerThread.DoHTTPGruntWork(
+ m_server, req, req.PollServiceArgs.NoEvents(req.RequestID, req.PollServiceArgs.Id));
}
m_requests.Clear();
@@ -151,6 +150,7 @@ namespace OpenSim.Framework.Servers.HttpServer
{
t.Abort();
}
+
m_running = false;
}
}
diff --git a/OpenSim/Framework/Servers/HttpServer/PollServiceWorkerThread.cs b/OpenSim/Framework/Servers/HttpServer/PollServiceWorkerThread.cs
index 5e171f00f8..299542103a 100644
--- a/OpenSim/Framework/Servers/HttpServer/PollServiceWorkerThread.cs
+++ b/OpenSim/Framework/Servers/HttpServer/PollServiceWorkerThread.cs
@@ -90,15 +90,16 @@ namespace OpenSim.Framework.Servers.HttpServer
}
Hashtable responsedata = req.PollServiceArgs.GetEvents(req.RequestID, req.PollServiceArgs.Id, str.ReadToEnd());
- m_server.DoHTTPGruntWork(responsedata,
- new OSHttpResponse(new HttpResponse(req.HttpContext, req.Request),req.HttpContext));
+ DoHTTPGruntWork(m_server, req, responsedata);
}
else
{
if ((Environment.TickCount - req.RequestTime) > m_timeout)
{
- m_server.DoHTTPGruntWork(req.PollServiceArgs.NoEvents(req.RequestID, req.PollServiceArgs.Id),
- new OSHttpResponse(new HttpResponse(req.HttpContext, req.Request),req.HttpContext));
+ DoHTTPGruntWork(
+ m_server,
+ req,
+ req.PollServiceArgs.NoEvents(req.RequestID, req.PollServiceArgs.Id));
}
else
{
@@ -119,5 +120,47 @@ namespace OpenSim.Framework.Servers.HttpServer
{
m_request.Enqueue(pPollServiceHttpRequest);
}
+
+ ///
+ /// FIXME: This should be part of BaseHttpServer
+ ///
+ internal static void DoHTTPGruntWork(BaseHttpServer server, PollServiceHttpRequest req, Hashtable responsedata)
+ {
+ OSHttpResponse response
+ = new OSHttpResponse(new HttpResponse(req.HttpContext, req.Request), req.HttpContext);
+
+ byte[] buffer
+ = server.DoHTTPGruntWork(
+ responsedata, new OSHttpResponse(new HttpResponse(req.HttpContext, req.Request), req.HttpContext));
+
+ response.SendChunked = false;
+ response.ContentLength64 = buffer.Length;
+ response.ContentEncoding = Encoding.UTF8;
+
+ try
+ {
+ response.OutputStream.Write(buffer, 0, buffer.Length);
+ }
+ catch (Exception ex)
+ {
+ m_log.Warn(string.Format("[POLL SERVICE WORKER THREAD]: Error ", ex));
+ }
+ finally
+ {
+ //response.OutputStream.Close();
+ try
+ {
+ response.OutputStream.Flush();
+ response.Send();
+
+ //if (!response.KeepAlive && response.ReuseContext)
+ // response.FreeContext();
+ }
+ catch (Exception e)
+ {
+ m_log.Warn(String.Format("[POLL SERVICE WORKER THREAD]: Error ", e));
+ }
+ }
+ }
}
-}
+}
\ No newline at end of file
diff --git a/OpenSim/Region/Application/OpenSim.cs b/OpenSim/Region/Application/OpenSim.cs
index 591259bf5d..f4812e63eb 100644
--- a/OpenSim/Region/Application/OpenSim.cs
+++ b/OpenSim/Region/Application/OpenSim.cs
@@ -70,6 +70,7 @@ namespace OpenSim
private Regex m_consolePromptRegex = new Regex(@"([^\\])\\(\w)", RegexOptions.Compiled);
private string m_timedScript = "disabled";
+ private int m_timeInterval = 1200;
private Timer m_scriptTimer;
public OpenSim(IConfigSource configSource) : base(configSource)
@@ -99,6 +100,10 @@ namespace OpenSim
m_consolePort = (uint)networkConfig.GetInt("console_port", 0);
m_timedScript = startupConfig.GetString("timer_Script", "disabled");
+ if (m_timedScript != "disabled")
+ {
+ m_timeInterval = startupConfig.GetInt("timer_Interval", 1200);
+ }
if (m_logFileAppender != null)
{
@@ -216,7 +221,7 @@ namespace OpenSim
{
m_scriptTimer = new Timer();
m_scriptTimer.Enabled = true;
- m_scriptTimer.Interval = 1200*1000;
+ m_scriptTimer.Interval = m_timeInterval*1000;
m_scriptTimer.Elapsed += RunAutoTimerScript;
}
}