aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--OpenSim/Framework/Servers/BaseHttpServer.cs17
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneObjectPart.cs1
2 files changed, 6 insertions, 12 deletions
diff --git a/OpenSim/Framework/Servers/BaseHttpServer.cs b/OpenSim/Framework/Servers/BaseHttpServer.cs
index d7cf96e..09adc11 100644
--- a/OpenSim/Framework/Servers/BaseHttpServer.cs
+++ b/OpenSim/Framework/Servers/BaseHttpServer.cs
@@ -97,11 +97,9 @@ namespace OpenSim.Framework.Servers
97 public BaseHttpServer(uint port, bool ssl) 97 public BaseHttpServer(uint port, bool ssl)
98 { 98 {
99 m_ssl = ssl; 99 m_ssl = ssl;
100 m_port = port; 100 m_port = port;
101
102 } 101 }
103 102
104
105 public BaseHttpServer(uint port, bool ssl, uint sslport, string CN) 103 public BaseHttpServer(uint port, bool ssl, uint sslport, string CN)
106 { 104 {
107 m_ssl = ssl; 105 m_ssl = ssl;
@@ -264,9 +262,7 @@ namespace OpenSim.Framework.Servers
264 //request.QueryString = objstate.req.QueryString; 262 //request.QueryString = objstate.req.QueryString;
265 263
266 */ 264 */
267 HandleRequest(request,resp); 265 HandleRequest(request,resp);
268
269
270 } 266 }
271 267
272 public virtual void HandleRequest(OSHttpRequest request, OSHttpResponse response) 268 public virtual void HandleRequest(OSHttpRequest request, OSHttpResponse response)
@@ -280,7 +276,7 @@ namespace OpenSim.Framework.Servers
280 // the request can be passed through to the other handlers. This is a low 276 // the request can be passed through to the other handlers. This is a low
281 // probability event; if a request is matched it is normally expected to be 277 // probability event; if a request is matched it is normally expected to be
282 // handled 278 // handled
283 //m_log.Info("[Debug BASE HTTP SERVER]: Handling Request" + request.RawUrl); 279 //m_log.Debug("[BASE HTTP SERVER]: Handling Request" + request.RawUrl);
284 IHttpAgentHandler agentHandler; 280 IHttpAgentHandler agentHandler;
285 281
286 if (TryGetAgentHandler(request, response, out agentHandler)) 282 if (TryGetAgentHandler(request, response, out agentHandler))
@@ -302,7 +298,7 @@ namespace OpenSim.Framework.Servers
302 298
303 if (TryGetStreamHandler(handlerKey, out requestHandler)) 299 if (TryGetStreamHandler(handlerKey, out requestHandler))
304 { 300 {
305 //m_log.Info("[Debug BASE HTTP SERVER]: Found Stream Handler"); 301 //m_log.Debug("[BASE HTTP SERVER]: Found Stream Handler");
306 // Okay, so this is bad, but should be considered temporary until everything is IStreamHandler. 302 // Okay, so this is bad, but should be considered temporary until everything is IStreamHandler.
307 byte[] buffer; 303 byte[] buffer;
308 if (requestHandler is IStreamedRequestHandler) 304 if (requestHandler is IStreamedRequestHandler)
@@ -313,7 +309,7 @@ namespace OpenSim.Framework.Servers
313 } 309 }
314 else if (requestHandler is IGenericHTTPHandler) 310 else if (requestHandler is IGenericHTTPHandler)
315 { 311 {
316 //m_log.Info("[Debug BASE HTTP SERVER]: Found Caps based HTTP Handler"); 312 //m_log.Debug("[BASE HTTP SERVER]: Found Caps based HTTP Handler");
317 IGenericHTTPHandler HTTPRequestHandler = requestHandler as IGenericHTTPHandler; 313 IGenericHTTPHandler HTTPRequestHandler = requestHandler as IGenericHTTPHandler;
318 Stream requestStream = request.InputStream; 314 Stream requestStream = request.InputStream;
319 315
@@ -322,7 +318,6 @@ namespace OpenSim.Framework.Servers
322 318
323 string requestBody = reader.ReadToEnd(); 319 string requestBody = reader.ReadToEnd();
324 320
325
326 reader.Close(); 321 reader.Close();
327 requestStream.Close(); 322 requestStream.Close();
328 323
@@ -1414,7 +1409,7 @@ namespace OpenSim.Framework.Servers
1414 } 1409 }
1415 1410
1416 public void httpServerDisconnectMonitor(HttpServer.IHttpClientContext source, SocketError err) 1411 public void httpServerDisconnectMonitor(HttpServer.IHttpClientContext source, SocketError err)
1417 { 1412 {
1418 switch (err) 1413 switch (err)
1419 { 1414 {
1420 case SocketError.NotSocket: 1415 case SocketError.NotSocket:
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
index e864090..b22830c 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
@@ -688,7 +688,6 @@ namespace OpenSim.Region.Environment.Scenes
688 set { m_acceleration = value; } 688 set { m_acceleration = value; }
689 } 689 }
690 690
691
692 public string Description 691 public string Description
693 { 692 {
694 get { return m_description; } 693 get { return m_description; }