diff options
author | Jonathan Freedman | 2010-10-20 02:36:59 -0400 |
---|---|---|
committer | Teravus Ovares (Dan Olivares) | 2010-10-20 22:36:29 -0400 |
commit | 017b83d0a3e3ac6a1c8bc86b9bef1ee47cba059e (patch) | |
tree | 97978c1c3b2b108cc96161681141d135eabd1bc1 /OpenSim/Framework | |
parent | * more url / hg cleanup (diff) | |
download | opensim-SC_OLD-017b83d0a3e3ac6a1c8bc86b9bef1ee47cba059e.zip opensim-SC_OLD-017b83d0a3e3ac6a1c8bc86b9bef1ee47cba059e.tar.gz opensim-SC_OLD-017b83d0a3e3ac6a1c8bc86b9bef1ee47cba059e.tar.bz2 opensim-SC_OLD-017b83d0a3e3ac6a1c8bc86b9bef1ee47cba059e.tar.xz |
* remove some spurious debug info
* The last 4 commits are a patch from otakup0pe that's supposed to make URLs better somehow in an effort to make it easier to do hypergrid (I think).. But as it seems that I'm the only one who was able to apply the patch.. and I looked it over and it doesn't look like it breaks anything via the diffs.. I'll sign off on it.
Signed-off-by: Teravus Ovares (Dan Olivares) <teravus@gmail.com>
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r-- | OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs index 47e86ad..0c1e5e0 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 | ||