diff options
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r-- | OpenSim/Framework/RegionInfo.cs | 8 | ||||
-rw-r--r-- | OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs | 10 |
2 files changed, 6 insertions, 12 deletions
diff --git a/OpenSim/Framework/RegionInfo.cs b/OpenSim/Framework/RegionInfo.cs index 949a289..08d5398 100644 --- a/OpenSim/Framework/RegionInfo.cs +++ b/OpenSim/Framework/RegionInfo.cs | |||
@@ -116,13 +116,7 @@ namespace OpenSim.Framework | |||
116 | public string ServerURI | 116 | public string ServerURI |
117 | { | 117 | { |
118 | get { return m_serverURI; } | 118 | get { return m_serverURI; } |
119 | set { | 119 | set { m_serverURI = value; } |
120 | if ( value.EndsWith("/") ) { | ||
121 | m_serverURI = value; | ||
122 | } else { | ||
123 | m_serverURI = value + '/'; | ||
124 | } | ||
125 | } | ||
126 | } | 120 | } |
127 | protected string m_serverURI; | 121 | protected string m_serverURI; |
128 | 122 | ||
diff --git a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs index 47e86ad..ba8c194 100644 --- a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs +++ b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs | |||
@@ -348,7 +348,7 @@ namespace OpenSim.Framework.Servers.HttpServer | |||
348 | { | 348 | { |
349 | try | 349 | try |
350 | { | 350 | { |
351 | m_log.Debug("[BASE HTTP SERVER]: Handling request to " + request.RawUrl); | 351 | // m_log.Debug("[BASE HTTP SERVER]: Handling request to " + request.RawUrl); |
352 | 352 | ||
353 | Thread.CurrentThread.CurrentCulture = new CultureInfo("en-US", true); | 353 | Thread.CurrentThread.CurrentCulture = new CultureInfo("en-US", true); |
354 | 354 | ||
@@ -376,11 +376,11 @@ namespace OpenSim.Framework.Servers.HttpServer | |||
376 | string path = request.RawUrl; | 376 | string path = request.RawUrl; |
377 | string handlerKey = GetHandlerKey(request.HttpMethod, path); | 377 | string handlerKey = GetHandlerKey(request.HttpMethod, path); |
378 | 378 | ||
379 | m_log.DebugFormat("[BASE HTTP SERVER]: Handling {0} request for {1}", request.HttpMethod, path); | 379 | // m_log.DebugFormat("[BASE HTTP SERVER]: Handling {0} request for {1}", request.HttpMethod, path); |
380 | 380 | ||
381 | if (TryGetStreamHandler(handlerKey, out requestHandler)) | 381 | if (TryGetStreamHandler(handlerKey, out requestHandler)) |
382 | { | 382 | { |
383 | m_log.Debug("[BASE HTTP SERVER]: Found Stream Handler"); | 383 | //m_log.Debug("[BASE HTTP SERVER]: Found Stream Handler"); |
384 | // Okay, so this is bad, but should be considered temporary until everything is IStreamHandler. | 384 | // Okay, so this is bad, but should be considered temporary until everything is IStreamHandler. |
385 | byte[] buffer = null; | 385 | byte[] buffer = null; |
386 | 386 | ||
@@ -395,7 +395,7 @@ namespace OpenSim.Framework.Servers.HttpServer | |||
395 | } | 395 | } |
396 | else if (requestHandler is IGenericHTTPHandler) | 396 | else if (requestHandler is IGenericHTTPHandler) |
397 | { | 397 | { |
398 | m_log.Debug("[BASE HTTP SERVER]: Found Caps based HTTP Handler"); | 398 | //m_log.Debug("[BASE HTTP SERVER]: Found Caps based HTTP Handler"); |
399 | IGenericHTTPHandler HTTPRequestHandler = requestHandler as IGenericHTTPHandler; | 399 | IGenericHTTPHandler HTTPRequestHandler = requestHandler as IGenericHTTPHandler; |
400 | Stream requestStream = request.InputStream; | 400 | Stream requestStream = request.InputStream; |
401 | 401 | ||
@@ -422,7 +422,7 @@ namespace OpenSim.Framework.Servers.HttpServer | |||
422 | 422 | ||
423 | foreach (string headername in rHeaders) | 423 | foreach (string headername in rHeaders) |
424 | { | 424 | { |
425 | m_log.Warn("[HEADER]: " + headername + "=" + request.Headers[headername]); | 425 | //m_log.Warn("[HEADER]: " + headername + "=" + request.Headers[headername]); |
426 | headervals[headername] = request.Headers[headername]; | 426 | headervals[headername] = request.Headers[headername]; |
427 | } | 427 | } |
428 | 428 | ||