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

Formatting cleanup.

Browse Source
This commit is contained in:
Jeff Ames
2008-05-16 01:22:11 +00:00
parent e25818d832
commit 65c5efe43b
261 changed files with 3718 additions and 3831 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
OpenSim/Framework/Servers/BaseHttpServer.cs
View File

@@ -82,10 +82,10 @@ namespace OpenSim.Framework.Servers
string path = handler.Path;
string handlerKey = GetHandlerKey(httpMethod, path);
if (!m_streamHandlers.ContainsKey(handlerKey))
{
//m_log.DebugFormat("[BASE HTTP SERVER]: Adding handler key {0}", handlerKey);
//m_log.DebugFormat("[BASE HTTP SERVER]: Adding handler key {0}", handlerKey);
m_streamHandlers.Add(handlerKey, handler);
}
}
@@ -135,20 +135,20 @@ namespace OpenSim.Framework.Servers
try
{
HttpListenerContext context = (HttpListenerContext) stateinfo;
HttpListenerRequest request = context.Request;
HttpListenerResponse response = context.Response;
response.KeepAlive = false;
response.SendChunked = false;
string path = request.RawUrl;
string handlerKey = GetHandlerKey(request.HttpMethod, path);
//m_log.DebugFormat("[BASE HTTP SERVER]: Handling {0} request for {1}", request.HttpMethod, path);
IRequestHandler requestHandler;
if (TryGetStreamHandler(handlerKey, out requestHandler))
{
// Okay, so this is bad, but should be considered temporary until everything is IStreamHandler.
@@ -156,13 +156,13 @@ namespace OpenSim.Framework.Servers
if (requestHandler is IStreamedRequestHandler)
{
IStreamedRequestHandler streamedRequestHandler = requestHandler as IStreamedRequestHandler;
buffer = streamedRequestHandler.Handle(path, request.InputStream);
}
else
{
IStreamHandler streamHandler = (IStreamHandler) requestHandler;
using (MemoryStream memoryStream = new MemoryStream())
{
streamHandler.Handle(path, request.InputStream, memoryStream);
@@ -170,11 +170,11 @@ namespace OpenSim.Framework.Servers
buffer = memoryStream.ToArray();
}
}
request.InputStream.Close();
response.ContentType = requestHandler.ContentType;
response.ContentLength64 = buffer.LongLength;
try
{
response.OutputStream.Write(buffer, 0, buffer.Length);
@@ -273,7 +273,7 @@ namespace OpenSim.Framework.Servers
return true;
}
}
/// <summary>
/// Try all the registered xmlrpc handlers when an xmlrpc request is received.
/// Sends back an XMLRPC unknown request response if no handler is registered for the requested method.
@@ -434,7 +434,7 @@ namespace OpenSim.Framework.Servers
{
// This is a test. There's a workable alternative.. as this way sucks.
// We'd like to put this into a text file parhaps that's easily editable.
//
//
// For this test to work, I used the following secondlife.exe parameters
// "C:\Program Files\SecondLifeWindLight\SecondLifeWindLight.exe" -settings settings_windlight.xml -channel "Second Life WindLight" -set SystemLanguage en-us -loginpage http://10.1.1.2:8002/?show_login_form=TRUE -loginuri http://10.1.1.2:8002 -user 10.1.1.2
//
@@ -461,7 +461,7 @@ namespace OpenSim.Framework.Servers
string[] querystringkeys = request.QueryString.AllKeys;
string[] rHeaders = request.Headers.AllKeys;
foreach (string queryname in querystringkeys)
{
keysvals.Add(queryname, request.QueryString[queryname]);
@@ -489,7 +489,7 @@ namespace OpenSim.Framework.Servers
{
Hashtable responsedata = requestprocessor(keysvals);
DoHTTPGruntWork(responsedata,response);
//SendHTML500(response);
}
else
@@ -519,7 +519,7 @@ namespace OpenSim.Framework.Servers
contentType = "text/html";
}
// We're forgoing the usual error status codes here because the client
// We're forgoing the usual error status codes here because the client
// ignores anything but 200 and 301
response.StatusCode = 200;
@@ -649,10 +649,10 @@ namespace OpenSim.Framework.Servers
public void RemoveStreamHandler(string httpMethod, string path)
{
string handlerKey = GetHandlerKey(httpMethod, path);
string handlerKey = GetHandlerKey(httpMethod, path);
//m_log.DebugFormat("[BASE HTTP SERVER]: Removing handler key {0}", handlerKey);
m_streamHandlers.Remove(handlerKey);
}
@@ -660,7 +660,7 @@ namespace OpenSim.Framework.Servers
{
m_HTTPHandlers.Remove(GetHandlerKey(httpMethod, path));
}
public string GetHTTP404(string host)
{
string file = Path.Combine(Util.configDir(), "http_404.html");

28
OpenSim/Framework/Servers/BaseOpenSimServer.cs
View File

@@ -44,16 +44,16 @@ namespace OpenSim.Framework.Servers
{
get { return m_httpServer; }
}
/// <summary>
/// Holds the non-viewer statistics collection object for this service/server
/// </summary>
protected IStatsCollector m_stats;
public BaseOpenSimServer()
{
m_startuptime = DateTime.Now;
}
}
/// <summary>
/// Should be overriden by descendents if they need to perform extra shutdown processing
@@ -66,7 +66,7 @@ namespace OpenSim.Framework.Servers
}
Environment.Exit(0);
}
/// <summary>
/// Runs commands issued by the server console from the operator
/// </summary>
@@ -75,17 +75,17 @@ namespace OpenSim.Framework.Servers
public virtual void RunCmd(string command, string[] cmdparams)
{
switch (command)
{
{
case "help":
Notice("quit - equivalent to shutdown.");
if (m_stats != null)
Notice("show stats - statistical information for this server");
Notice("show uptime - show server startup and uptime.");
Notice("shutdown - shutdown the server.\n");
break;
case "show":
if (cmdparams.Length > 0)
{
@@ -96,10 +96,10 @@ namespace OpenSim.Framework.Servers
case "quit":
case "shutdown":
Shutdown();
break;
break;
}
}
/// <summary>
/// Outputs to the console information about the region
/// </summary>
@@ -107,18 +107,18 @@ namespace OpenSim.Framework.Servers
public virtual void Show(string ShowWhat)
{
switch (ShowWhat)
{
{
case "stats":
if (m_stats != null)
{
Notice(m_stats.Report());
}
break;
break;
case "uptime":
Notice("Server has been running since " + m_startuptime.DayOfWeek + ", " + m_startuptime.ToString());
Notice("That is an elapsed time of " + (DateTime.Now - m_startuptime).ToString());
break;
break;
}
}

10
OpenSim/Framework/Servers/RestObjectPosterResponse.cs
View File

@@ -38,12 +38,12 @@ namespace OpenSim.Framework.Servers
/// <summary>
/// Makes an asynchronous REST request with a callback to invoke with the response.
/// </summary>
/// </summary>
public class RestObjectPosterResponse<TResponse>
{
// private static readonly log4net.ILog m_log
// private static readonly log4net.ILog m_log
// = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
public ReturnResponse<TResponse> ResponseCallback;
public void BeginPostObject<TRequest>(string requestUrl, TRequest obj)
@@ -87,11 +87,11 @@ namespace OpenSim.Framework.Servers
TResponse deserial;
XmlSerializer deserializer = new XmlSerializer(typeof (TResponse));
Stream stream = resp.GetResponseStream();
// This is currently a bad debug stanza since it gobbles us the response...
// StreamReader reader = new StreamReader(stream);
// m_log.DebugFormat("[REST OBJECT POSTER RESPONSE]: Received {0}", reader.ReadToEnd());
deserial = (TResponse) deserializer.Deserialize(stream);
if (deserial != null && ResponseCallback != null)

2
OpenSim/Framework/Servers/RestStreamHandler.cs
View File

@@ -34,7 +34,7 @@ namespace OpenSim.Framework.Servers
{
private RestMethod m_restMethod;
public RestMethod Method
public RestMethod Method
{
get { return m_restMethod; }
}

2
OpenSim/Framework/Servers/SynchronousRestObjectPoster.cs
View File

@@ -75,7 +75,7 @@ namespace OpenSim.Framework.Servers
using (WebResponse resp = request.GetResponse())
{
XmlSerializer deserializer = new XmlSerializer(typeof (TResponse));
deserial = (TResponse) deserializer.Deserialize(resp.GetResponseStream());
deserial = (TResponse) deserializer.Deserialize(resp.GetResponseStream());
}
return deserial;
}