minor: adjust some spacing and indentation
parent
464fa45ec9
commit
3a98fb080a
|
@ -86,7 +86,6 @@ using OpenSim.Region.Framework.Scenes;
|
||||||
|
|
||||||
namespace OpenSim.Region.CoreModules.Scripting.HttpRequest
|
namespace OpenSim.Region.CoreModules.Scripting.HttpRequest
|
||||||
{
|
{
|
||||||
|
|
||||||
public class HttpRequestModule : IRegionModule, IHttpRequestModule
|
public class HttpRequestModule : IRegionModule, IHttpRequestModule
|
||||||
{
|
{
|
||||||
private object HttpListLock = new object();
|
private object HttpListLock = new object();
|
||||||
|
@ -114,10 +113,11 @@ namespace OpenSim.Region.CoreModules.Scripting.HttpRequest
|
||||||
{
|
{
|
||||||
HttpWebRequest Request = (HttpWebRequest)sender;
|
HttpWebRequest Request = (HttpWebRequest)sender;
|
||||||
|
|
||||||
if(Request.Headers.Get("NoVerifyCert") != null)
|
if (Request.Headers.Get("NoVerifyCert") != null)
|
||||||
{
|
{
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
return chain.Build(new X509Certificate2(certificate));
|
return chain.Build(new X509Certificate2(certificate));
|
||||||
}
|
}
|
||||||
#region IHttpRequestModule Members
|
#region IHttpRequestModule Members
|
||||||
|
@ -206,7 +206,7 @@ namespace OpenSim.Region.CoreModules.Scripting.HttpRequest
|
||||||
* Not sure how important ordering is is here - the next first
|
* Not sure how important ordering is is here - the next first
|
||||||
* one completed in the list is returned, based soley on its list
|
* one completed in the list is returned, based soley on its list
|
||||||
* position, not the order in which the request was started or
|
* position, not the order in which the request was started or
|
||||||
* finsihed. I thought about setting up a queue for this, but
|
* finished. I thought about setting up a queue for this, but
|
||||||
* it will need some refactoring and this works 'enough' right now
|
* it will need some refactoring and this works 'enough' right now
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
@ -254,8 +254,8 @@ namespace OpenSim.Region.CoreModules.Scripting.HttpRequest
|
||||||
|
|
||||||
m_scene.RegisterModuleInterface<IHttpRequestModule>(this);
|
m_scene.RegisterModuleInterface<IHttpRequestModule>(this);
|
||||||
|
|
||||||
m_proxyurl = config.Configs["Startup"].GetString("HttpProxy");
|
m_proxyurl = config.Configs["Startup"].GetString("HttpProxy");
|
||||||
m_proxyexcepts = config.Configs["Startup"].GetString("HttpProxyExceptions");
|
m_proxyexcepts = config.Configs["Startup"].GetString("HttpProxyExceptions");
|
||||||
|
|
||||||
m_pendingRequests = new Dictionary<UUID, HttpRequestClass>();
|
m_pendingRequests = new Dictionary<UUID, HttpRequestClass>();
|
||||||
}
|
}
|
||||||
|
@ -363,10 +363,10 @@ namespace OpenSim.Region.CoreModules.Scripting.HttpRequest
|
||||||
|
|
||||||
if(!HttpVerifyCert)
|
if(!HttpVerifyCert)
|
||||||
{
|
{
|
||||||
// Connection Group Name is probably not used so we hijack it to identify
|
// We could hijack Connection Group Name to identify
|
||||||
// a desired security exception
|
// a desired security exception. But at the moment we'll use a dummy header instead.
|
||||||
// Request.ConnectionGroupName="NoVerify";
|
// Request.ConnectionGroupName = "NoVerify";
|
||||||
Request.Headers.Add("NoVerifyCert" , "true");
|
Request.Headers.Add("NoVerifyCert", "true");
|
||||||
}
|
}
|
||||||
// else
|
// else
|
||||||
// {
|
// {
|
||||||
|
@ -464,4 +464,4 @@ namespace OpenSim.Region.CoreModules.Scripting.HttpRequest
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
Loading…
Reference in New Issue