diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Framework/Servers/BaseHttpServer.cs | 24 | ||||
-rw-r--r-- | OpenSim/Framework/Servers/BaseOpenSimServer.cs | 18 |
2 files changed, 21 insertions, 21 deletions
diff --git a/OpenSim/Framework/Servers/BaseHttpServer.cs b/OpenSim/Framework/Servers/BaseHttpServer.cs index 79929bd..d326b66 100644 --- a/OpenSim/Framework/Servers/BaseHttpServer.cs +++ b/OpenSim/Framework/Servers/BaseHttpServer.cs | |||
@@ -278,7 +278,7 @@ namespace OpenSim.Framework.Servers | |||
278 | HandleLLSDRequests(request, response); | 278 | HandleLLSDRequests(request, response); |
279 | 279 | ||
280 | return; | 280 | return; |
281 | } | 281 | } |
282 | HandleXmlRpcRequests(request, response); | 282 | HandleXmlRpcRequests(request, response); |
283 | return; | 283 | return; |
284 | } | 284 | } |
@@ -498,7 +498,7 @@ namespace OpenSim.Framework.Servers | |||
498 | { | 498 | { |
499 | // we didn't find a registered llsd handler to service this request | 499 | // we didn't find a registered llsd handler to service this request |
500 | // check if we have a default llsd handler | 500 | // check if we have a default llsd handler |
501 | 501 | ||
502 | if (m_defaultLlsdHandler != null) | 502 | if (m_defaultLlsdHandler != null) |
503 | { | 503 | { |
504 | // LibOMV path | 504 | // LibOMV path |
@@ -541,7 +541,7 @@ namespace OpenSim.Framework.Servers | |||
541 | 541 | ||
542 | private bool DoWeHaveALLSDHandler(string path) | 542 | private bool DoWeHaveALLSDHandler(string path) |
543 | { | 543 | { |
544 | 544 | ||
545 | string[] pathbase = path.Split('/'); | 545 | string[] pathbase = path.Split('/'); |
546 | string searchquery = "/"; | 546 | string searchquery = "/"; |
547 | 547 | ||
@@ -559,27 +559,27 @@ namespace OpenSim.Framework.Servers | |||
559 | 559 | ||
560 | foreach (string pattern in m_llsdHandlers.Keys) | 560 | foreach (string pattern in m_llsdHandlers.Keys) |
561 | { | 561 | { |
562 | 562 | ||
563 | if (searchquery.StartsWith(pattern) && searchquery.Length >= pattern.Length) | 563 | if (searchquery.StartsWith(pattern) && searchquery.Length >= pattern.Length) |
564 | { | 564 | { |
565 | 565 | ||
566 | bestMatch = pattern; | 566 | bestMatch = pattern; |
567 | 567 | ||
568 | } | 568 | } |
569 | } | 569 | } |
570 | 570 | ||
571 | // extra kicker to remove the default XMLRPC login case.. just in case.. | 571 | // extra kicker to remove the default XMLRPC login case.. just in case.. |
572 | if (path == "/") | 572 | if (path == "/") |
573 | return false; | 573 | return false; |
574 | 574 | ||
575 | if (String.IsNullOrEmpty(bestMatch)) | 575 | if (String.IsNullOrEmpty(bestMatch)) |
576 | { | 576 | { |
577 | 577 | ||
578 | return false; | 578 | return false; |
579 | } | 579 | } |
580 | else | 580 | else |
581 | { | 581 | { |
582 | 582 | ||
583 | return true; | 583 | return true; |
584 | } | 584 | } |
585 | } | 585 | } |
@@ -588,7 +588,7 @@ namespace OpenSim.Framework.Servers | |||
588 | { | 588 | { |
589 | llsdHandler = null; | 589 | llsdHandler = null; |
590 | // Pull out the first part of the path | 590 | // Pull out the first part of the path |
591 | // splitting the path by '/' means we'll get the following return.. | 591 | // splitting the path by '/' means we'll get the following return.. |
592 | // {0}/{1}/{2} | 592 | // {0}/{1}/{2} |
593 | // where {0} isn't something we really control 100% | 593 | // where {0} isn't something we really control 100% |
594 | 594 | ||
@@ -599,7 +599,7 @@ namespace OpenSim.Framework.Servers | |||
599 | return false; | 599 | return false; |
600 | 600 | ||
601 | for (int i=1; i<pathbase.Length; i++) | 601 | for (int i=1; i<pathbase.Length; i++) |
602 | { | 602 | { |
603 | searchquery += pathbase[i]; | 603 | searchquery += pathbase[i]; |
604 | if (pathbase.Length-1 != i) | 604 | if (pathbase.Length-1 != i) |
605 | searchquery += "/"; | 605 | searchquery += "/"; |
@@ -609,7 +609,7 @@ namespace OpenSim.Framework.Servers | |||
609 | // | 609 | // |
610 | // [] = optional | 610 | // [] = optional |
611 | // /resource/UUID/action[/action] | 611 | // /resource/UUID/action[/action] |
612 | // | 612 | // |
613 | // now try to get the closest match to the reigstered path | 613 | // now try to get the closest match to the reigstered path |
614 | // at least for OGP, registered path would probably only consist of the /resource/ | 614 | // at least for OGP, registered path would probably only consist of the /resource/ |
615 | 615 | ||
diff --git a/OpenSim/Framework/Servers/BaseOpenSimServer.cs b/OpenSim/Framework/Servers/BaseOpenSimServer.cs index b26d397..794dbd8 100644 --- a/OpenSim/Framework/Servers/BaseOpenSimServer.cs +++ b/OpenSim/Framework/Servers/BaseOpenSimServer.cs | |||
@@ -107,20 +107,20 @@ namespace OpenSim.Framework.Servers | |||
107 | { | 107 | { |
108 | sb.Append(m_stats.Report()); | 108 | sb.Append(m_stats.Report()); |
109 | } | 109 | } |
110 | 110 | ||
111 | sb.Append(Environment.NewLine); | 111 | sb.Append(Environment.NewLine); |
112 | sb.Append(GetThreadsReport()); | 112 | sb.Append(GetThreadsReport()); |
113 | 113 | ||
114 | m_log.Debug(sb); | 114 | m_log.Debug(sb); |
115 | } | 115 | } |
116 | 116 | ||
117 | /// <summary> | 117 | /// <summary> |
118 | /// Get a report about the registered threads in this server. | 118 | /// Get a report about the registered threads in this server. |
119 | /// </summary> | 119 | /// </summary> |
120 | protected string GetThreadsReport() | 120 | protected string GetThreadsReport() |
121 | { | 121 | { |
122 | StringBuilder sb = new StringBuilder(); | 122 | StringBuilder sb = new StringBuilder(); |
123 | 123 | ||
124 | List<Thread> threads = ThreadTracker.GetThreads(); | 124 | List<Thread> threads = ThreadTracker.GetThreads(); |
125 | if (threads == null) | 125 | if (threads == null) |
126 | { | 126 | { |
@@ -132,13 +132,13 @@ namespace OpenSim.Framework.Servers | |||
132 | foreach (Thread t in threads) | 132 | foreach (Thread t in threads) |
133 | { | 133 | { |
134 | sb.Append( | 134 | sb.Append( |
135 | "ID: " + t.ManagedThreadId + ", Name: " + t.Name + ", Alive: " + t.IsAlive | 135 | "ID: " + t.ManagedThreadId + ", Name: " + t.Name + ", Alive: " + t.IsAlive |
136 | + ", Pri: " + t.Priority + ", State: " + t.ThreadState + Environment.NewLine); | 136 | + ", Pri: " + t.Priority + ", State: " + t.ThreadState + Environment.NewLine); |
137 | } | 137 | } |
138 | } | 138 | } |
139 | 139 | ||
140 | return sb.ToString(); | 140 | return sb.ToString(); |
141 | } | 141 | } |
142 | 142 | ||
143 | /// <summary> | 143 | /// <summary> |
144 | /// Return a report about the uptime of this server | 144 | /// Return a report about the uptime of this server |
@@ -312,7 +312,7 @@ namespace OpenSim.Framework.Servers | |||
312 | 312 | ||
313 | return; | 313 | return; |
314 | } | 314 | } |
315 | } | 315 | } |
316 | 316 | ||
317 | /// <summary> | 317 | /// <summary> |
318 | /// Outputs to the console information about the region | 318 | /// Outputs to the console information about the region |