aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2011-04-11 22:29:08 +0100
committerJustin Clark-Casey (justincc)2011-04-11 22:29:08 +0100
commit3a98fb080a751d21999bb2baa769462426b5d776 (patch)
tree4e7a9f53bfe2ab335513ac95f380b0c8f9dd085c /OpenSim/Region/CoreModules
parentImplimented HTTP_VERIFY_CERT for llHttpRequest (diff)
downloadopensim-SC_OLD-3a98fb080a751d21999bb2baa769462426b5d776.zip
opensim-SC_OLD-3a98fb080a751d21999bb2baa769462426b5d776.tar.gz
opensim-SC_OLD-3a98fb080a751d21999bb2baa769462426b5d776.tar.bz2
opensim-SC_OLD-3a98fb080a751d21999bb2baa769462426b5d776.tar.xz
minor: adjust some spacing and indentation
Diffstat (limited to 'OpenSim/Region/CoreModules')
-rw-r--r--OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs20
1 files changed, 10 insertions, 10 deletions
diff --git a/OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs b/OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs
index a37c781..23e15ef 100644
--- a/OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs
+++ b/OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs
@@ -86,7 +86,6 @@ using OpenSim.Region.Framework.Scenes;
86 86
87namespace OpenSim.Region.CoreModules.Scripting.HttpRequest 87namespace OpenSim.Region.CoreModules.Scripting.HttpRequest
88{ 88{
89
90 public class HttpRequestModule : IRegionModule, IHttpRequestModule 89 public class HttpRequestModule : IRegionModule, IHttpRequestModule
91 { 90 {
92 private object HttpListLock = new object(); 91 private object HttpListLock = new object();
@@ -114,10 +113,11 @@ namespace OpenSim.Region.CoreModules.Scripting.HttpRequest
114 { 113 {
115 HttpWebRequest Request = (HttpWebRequest)sender; 114 HttpWebRequest Request = (HttpWebRequest)sender;
116 115
117 if(Request.Headers.Get("NoVerifyCert") != null) 116 if (Request.Headers.Get("NoVerifyCert") != null)
118 { 117 {
119 return true; 118 return true;
120 } 119 }
120
121 return chain.Build(new X509Certificate2(certificate)); 121 return chain.Build(new X509Certificate2(certificate));
122 } 122 }
123 #region IHttpRequestModule Members 123 #region IHttpRequestModule Members
@@ -206,7 +206,7 @@ namespace OpenSim.Region.CoreModules.Scripting.HttpRequest
206 * Not sure how important ordering is is here - the next first 206 * Not sure how important ordering is is here - the next first
207 * one completed in the list is returned, based soley on its list 207 * one completed in the list is returned, based soley on its list
208 * position, not the order in which the request was started or 208 * position, not the order in which the request was started or
209 * finsihed. I thought about setting up a queue for this, but 209 * finished. I thought about setting up a queue for this, but
210 * it will need some refactoring and this works 'enough' right now 210 * it will need some refactoring and this works 'enough' right now
211 */ 211 */
212 212
@@ -254,8 +254,8 @@ namespace OpenSim.Region.CoreModules.Scripting.HttpRequest
254 254
255 m_scene.RegisterModuleInterface<IHttpRequestModule>(this); 255 m_scene.RegisterModuleInterface<IHttpRequestModule>(this);
256 256
257 m_proxyurl = config.Configs["Startup"].GetString("HttpProxy"); 257 m_proxyurl = config.Configs["Startup"].GetString("HttpProxy");
258 m_proxyexcepts = config.Configs["Startup"].GetString("HttpProxyExceptions"); 258 m_proxyexcepts = config.Configs["Startup"].GetString("HttpProxyExceptions");
259 259
260 m_pendingRequests = new Dictionary<UUID, HttpRequestClass>(); 260 m_pendingRequests = new Dictionary<UUID, HttpRequestClass>();
261 } 261 }
@@ -363,10 +363,10 @@ namespace OpenSim.Region.CoreModules.Scripting.HttpRequest
363 363
364 if(!HttpVerifyCert) 364 if(!HttpVerifyCert)
365 { 365 {
366 // Connection Group Name is probably not used so we hijack it to identify 366 // We could hijack Connection Group Name to identify
367 // a desired security exception 367 // a desired security exception. But at the moment we'll use a dummy header instead.
368// Request.ConnectionGroupName="NoVerify"; 368// Request.ConnectionGroupName = "NoVerify";
369 Request.Headers.Add("NoVerifyCert" , "true"); 369 Request.Headers.Add("NoVerifyCert", "true");
370 } 370 }
371// else 371// else
372// { 372// {
@@ -464,4 +464,4 @@ namespace OpenSim.Region.CoreModules.Scripting.HttpRequest
464 } 464 }
465 } 465 }
466 } 466 }
467} 467} \ No newline at end of file