aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2011-11-29 20:37:03 +0000
committerJustin Clark-Casey (justincc)2011-11-29 20:37:03 +0000
commitfa63054c4f5cf970922c2fef386b084272c5491c (patch)
treef8c8e596a9818a5335ec5fa3c92afa633ac2c4be
parentWith "debug http 1", show the path with the query string instead of just the ... (diff)
downloadopensim-SC_OLD-fa63054c4f5cf970922c2fef386b084272c5491c.zip
opensim-SC_OLD-fa63054c4f5cf970922c2fef386b084272c5491c.tar.gz
opensim-SC_OLD-fa63054c4f5cf970922c2fef386b084272c5491c.tar.bz2
opensim-SC_OLD-fa63054c4f5cf970922c2fef386b084272c5491c.tar.xz
On "show caps", stop excluding the seed cap but do exclude it elsewhere
-rw-r--r--OpenSim/Capabilities/CapsHandlers.cs30
-rw-r--r--OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs4
-rw-r--r--OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs3
-rw-r--r--OpenSim/Region/CoreModules/Framework/Caps/CapabilitiesModule.cs2
4 files changed, 21 insertions, 18 deletions
diff --git a/OpenSim/Capabilities/CapsHandlers.cs b/OpenSim/Capabilities/CapsHandlers.cs
index e1c800e..a0e9ebc 100644
--- a/OpenSim/Capabilities/CapsHandlers.cs
+++ b/OpenSim/Capabilities/CapsHandlers.cs
@@ -147,25 +147,25 @@ namespace OpenSim.Framework.Capabilities
147 /// Return an LLSD-serializable Hashtable describing the 147 /// Return an LLSD-serializable Hashtable describing the
148 /// capabilities and their handler details. 148 /// capabilities and their handler details.
149 /// </summary> 149 /// </summary>
150 public Hashtable CapsDetails 150 /// <param name="excludeSeed">If true, then exclude the seed cap.</param>
151 public Hashtable GetCapsDetails(bool excludeSeed)
151 { 152 {
152 get 153 Hashtable caps = new Hashtable();
154 string protocol = "http://";
155
156 if (m_useSSL)
157 protocol = "https://";
158
159 string baseUrl = protocol + m_httpListenerHostName + ":" + m_httpListenerPort.ToString();
160 foreach (string capsName in m_capsHandlers.Keys)
153 { 161 {
154 Hashtable caps = new Hashtable(); 162 if (excludeSeed && "SEED" == capsName)
155 string protocol = "http://"; 163 continue;
156
157 if (m_useSSL)
158 protocol = "https://";
159 164
160 string baseUrl = protocol + m_httpListenerHostName + ":" + m_httpListenerPort.ToString(); 165 caps[capsName] = baseUrl + m_capsHandlers[capsName].Path;
161 foreach (string capsName in m_capsHandlers.Keys)
162 {
163 // skip SEED cap
164 if ("SEED" == capsName) continue;
165 caps[capsName] = baseUrl + m_capsHandlers[capsName].Path;
166 }
167 return caps;
168 } 166 }
167
168 return caps;
169 } 169 }
170 } 170 }
171} 171}
diff --git a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
index 7bd1836..6bffba5 100644
--- a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
+++ b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
@@ -903,7 +903,9 @@ namespace OpenSim.Framework.Servers.HttpServer
903 byte[] buf = Encoding.UTF8.GetBytes("Not found"); 903 byte[] buf = Encoding.UTF8.GetBytes("Not found");
904 response.KeepAlive = false; 904 response.KeepAlive = false;
905 905
906 m_log.ErrorFormat("[BASE HTTP SERVER]: Handler not found for http request {0}", request.RawUrl); 906 m_log.ErrorFormat(
907 "[BASE HTTP SERVER]: Handler not found for http request {0} {1}",
908 request.HttpMethod, request.Url.PathAndQuery);
907 909
908 response.SendChunked = false; 910 response.SendChunked = false;
909 response.ContentLength64 = buf.Length; 911 response.ContentLength64 = buf.Length;
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
index 8f0ae76..07b4df3 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
@@ -238,7 +238,8 @@ namespace OpenSim.Region.ClientStack.Linden
238 return string.Empty; 238 return string.Empty;
239 } 239 }
240 240
241 Hashtable caps = m_HostCapsObj.CapsHandlers.CapsDetails; 241 Hashtable caps = m_HostCapsObj.CapsHandlers.GetCapsDetails(true);
242
242 // Add the external too 243 // Add the external too
243 foreach (KeyValuePair<string, string> kvp in m_HostCapsObj.ExternalCapsHandlers) 244 foreach (KeyValuePair<string, string> kvp in m_HostCapsObj.ExternalCapsHandlers)
244 caps[kvp.Key] = kvp.Value; 245 caps[kvp.Key] = kvp.Value;
diff --git a/OpenSim/Region/CoreModules/Framework/Caps/CapabilitiesModule.cs b/OpenSim/Region/CoreModules/Framework/Caps/CapabilitiesModule.cs
index 780411f..9d1538f 100644
--- a/OpenSim/Region/CoreModules/Framework/Caps/CapabilitiesModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/Caps/CapabilitiesModule.cs
@@ -239,7 +239,7 @@ namespace OpenSim.Region.CoreModules.Framework
239 { 239 {
240 caps.AppendFormat("** User {0}:\n", kvp.Key); 240 caps.AppendFormat("** User {0}:\n", kvp.Key);
241 241
242 for (IDictionaryEnumerator kvp2 = kvp.Value.CapsHandlers.CapsDetails.GetEnumerator(); kvp2.MoveNext(); ) 242 for (IDictionaryEnumerator kvp2 = kvp.Value.CapsHandlers.GetCapsDetails(false).GetEnumerator(); kvp2.MoveNext(); )
243 { 243 {
244 Uri uri = new Uri(kvp2.Value.ToString()); 244 Uri uri = new Uri(kvp2.Value.ToString());
245 caps.AppendFormat(m_showCapsCommandFormat, kvp2.Key, uri.PathAndQuery); 245 caps.AppendFormat(m_showCapsCommandFormat, kvp2.Key, uri.PathAndQuery);