diff options
author | Melanie | 2011-04-17 18:28:06 +0200 |
---|---|---|
committer | Melanie | 2011-04-17 18:28:06 +0200 |
commit | 276181053147eb3ff0831ce1e730dc4819b16763 (patch) | |
tree | a0b3c64e28128e87b3a8c6099498d3a512634983 /OpenSim/Region/CoreModules/Scripting | |
parent | Fix agent animation updates (diff) | |
download | opensim-SC_OLD-276181053147eb3ff0831ce1e730dc4819b16763.zip opensim-SC_OLD-276181053147eb3ff0831ce1e730dc4819b16763.tar.gz opensim-SC_OLD-276181053147eb3ff0831ce1e730dc4819b16763.tar.bz2 opensim-SC_OLD-276181053147eb3ff0831ce1e730dc4819b16763.tar.xz |
Fix the cert validation handler so that it will not block other parts of
the server doing ssl successfully.
Diffstat (limited to 'OpenSim/Region/CoreModules/Scripting')
-rw-r--r-- | OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs b/OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs index 4e64979..5e28ee1 100644 --- a/OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs +++ b/OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs | |||
@@ -118,7 +118,15 @@ namespace OpenSim.Region.CoreModules.Scripting.HttpRequest | |||
118 | return true; | 118 | return true; |
119 | } | 119 | } |
120 | 120 | ||
121 | return chain.Build(new X509Certificate2(certificate)); | 121 | if ((((int)sslPolicyErrors) & ~4) != 0) |
122 | return false; | ||
123 | |||
124 | if (ServicePointManager.CertificatePolicy != null) | ||
125 | { | ||
126 | ServicePoint sp = Request.ServicePoint; | ||
127 | return ServicePointManager.CertificatePolicy.CheckValidationResult (sp, certificate, Request, 0); | ||
128 | } | ||
129 | return true; | ||
122 | } | 130 | } |
123 | #region IHttpRequestModule Members | 131 | #region IHttpRequestModule Members |
124 | 132 | ||
@@ -478,4 +486,4 @@ namespace OpenSim.Region.CoreModules.Scripting.HttpRequest | |||
478 | } | 486 | } |
479 | } | 487 | } |
480 | } | 488 | } |
481 | } \ No newline at end of file | 489 | } |