diff options
author | Teravus Ovares | 2008-09-14 18:39:17 +0000 |
---|---|---|
committer | Teravus Ovares | 2008-09-14 18:39:17 +0000 |
commit | dbbbec48dfbc51f30953d8a46f4fc8f192bd277c (patch) | |
tree | 218f93b95724e8bdc9a9c6e986268f2101c1eb6e /OpenSim/Framework/NetworkServersInfo.cs | |
parent | Added some further clipping to color- and alpha-values. (diff) | |
download | opensim-SC_OLD-dbbbec48dfbc51f30953d8a46f4fc8f192bd277c.zip opensim-SC_OLD-dbbbec48dfbc51f30953d8a46f4fc8f192bd277c.tar.gz opensim-SC_OLD-dbbbec48dfbc51f30953d8a46f4fc8f192bd277c.tar.bz2 opensim-SC_OLD-dbbbec48dfbc51f30953d8a46f4fc8f192bd277c.tar.xz |
* This update makes configuring SSL a little easier on Windows XP. It also makes it possible to run a HTTPS server on the region. It also has a junk Certification authority for test purposes.
* There are still a lot of things that are hard coded to use http. They need to be fixed.
* Also includes directions
* A standard junk PEM file to append to app_settings/CA.pem in the client so SSL will work
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Framework/NetworkServersInfo.cs | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/OpenSim/Framework/NetworkServersInfo.cs b/OpenSim/Framework/NetworkServersInfo.cs index 43ec11e..9f3014d 100644 --- a/OpenSim/Framework/NetworkServersInfo.cs +++ b/OpenSim/Framework/NetworkServersInfo.cs | |||
@@ -49,6 +49,9 @@ namespace OpenSim.Framework | |||
49 | public string UserRecvKey = String.Empty; | 49 | public string UserRecvKey = String.Empty; |
50 | public string UserSendKey = String.Empty; | 50 | public string UserSendKey = String.Empty; |
51 | public string UserURL = String.Empty; | 51 | public string UserURL = String.Empty; |
52 | public bool HttpUsesSSL = false; | ||
53 | public string HttpSSLCN = ""; | ||
54 | public uint httpSSLPort = 9001; | ||
52 | 55 | ||
53 | 56 | ||
54 | public NetworkServersInfo() | 57 | public NetworkServersInfo() |
@@ -78,6 +81,10 @@ namespace OpenSim.Framework | |||
78 | 81 | ||
79 | HttpListenerPort = | 82 | HttpListenerPort = |
80 | (uint) config.Configs["Network"].GetInt("http_listener_port", (int) DefaultHttpListenerPort); | 83 | (uint) config.Configs["Network"].GetInt("http_listener_port", (int) DefaultHttpListenerPort); |
84 | httpSSLPort = | ||
85 | (uint)config.Configs["Network"].GetInt("http_listener_sslport", ((int)DefaultHttpListenerPort+1)); | ||
86 | HttpUsesSSL = config.Configs["Network"].GetBoolean("http_listener_ssl", false); | ||
87 | HttpSSLCN = config.Configs["Network"].GetString("http_listener_cn", ""); | ||
81 | RemotingListenerPort = | 88 | RemotingListenerPort = |
82 | (uint) config.Configs["Network"].GetInt("remoting_listener_port", (int) RemotingListenerPort); | 89 | (uint) config.Configs["Network"].GetInt("remoting_listener_port", (int) RemotingListenerPort); |
83 | GridURL = | 90 | GridURL = |