diff options
| author | UbitUmarov | 2016-10-09 01:01:52 +0100 |
|---|---|---|
| committer | UbitUmarov | 2016-10-09 01:01:52 +0100 |
| commit | 5b946405a09a4ec89e0d7664fabbf5015c7c62e8 (patch) | |
| tree | c1d29ec42bd4bf546e1a51eea00863dcac1fee12 /OpenSim/Region | |
| parent | Merge branch 'master' into httptests (diff) | |
| download | opensim-SC-5b946405a09a4ec89e0d7664fabbf5015c7c62e8.zip opensim-SC-5b946405a09a4ec89e0d7664fabbf5015c7c62e8.tar.gz opensim-SC-5b946405a09a4ec89e0d7664fabbf5015c7c62e8.tar.bz2 opensim-SC-5b946405a09a4ec89e0d7664fabbf5015c7c62e8.tar.xz | |
changes to regions ssl suport: verify if hostnames are validate by the selected cert, make clear that for now all regions need to have the same ExternalHostName if using sll (due to other code that needs to be changed later)
Diffstat (limited to 'OpenSim/Region')
| -rw-r--r-- | OpenSim/Region/Application/OpenSimBase.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Application/OpenSimBase.cs b/OpenSim/Region/Application/OpenSimBase.cs index 62abf8e..90505e1 100644 --- a/OpenSim/Region/Application/OpenSimBase.cs +++ b/OpenSim/Region/Application/OpenSimBase.cs | |||
| @@ -417,7 +417,7 @@ namespace OpenSim | |||
| 417 | regionInfo.HttpPort = m_httpServerPort; | 417 | regionInfo.HttpPort = m_httpServerPort; |
| 418 | if(m_httpServerSSL) | 418 | if(m_httpServerSSL) |
| 419 | { | 419 | { |
| 420 | if(m_networkServersInfo.HttpSSLCN != regionInfo.ExternalHostName) | 420 | if(!m_httpServer.CheckSSLCertHost(regionInfo.ExternalHostName)) |
| 421 | throw new Exception("main http cert CN doesn't match region External IP"); | 421 | throw new Exception("main http cert CN doesn't match region External IP"); |
| 422 | 422 | ||
| 423 | regionInfo.ServerURI = "https://" + regionInfo.ExternalHostName + | 423 | regionInfo.ServerURI = "https://" + regionInfo.ExternalHostName + |