diff options
author | Teravus Ovares | 2008-09-14 23:39:35 +0000 |
---|---|---|
committer | Teravus Ovares | 2008-09-14 23:39:35 +0000 |
commit | cdced699fb497ebf3ecbbd306269dbbda337aadc (patch) | |
tree | 52090ec782b916dcf048becf8103d6a2e51a9f0e /OpenSim/Framework/Servers | |
parent | * This update makes configuring SSL a little easier on Windows XP. It also m... (diff) | |
download | opensim-SC_OLD-cdced699fb497ebf3ecbbd306269dbbda337aadc.zip opensim-SC_OLD-cdced699fb497ebf3ecbbd306269dbbda337aadc.tar.gz opensim-SC_OLD-cdced699fb497ebf3ecbbd306269dbbda337aadc.tar.bz2 opensim-SC_OLD-cdced699fb497ebf3ecbbd306269dbbda337aadc.tar.xz |
* Made Seed CAP response respect the SSL setting.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Framework/Servers/BaseHttpServer.cs | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/OpenSim/Framework/Servers/BaseHttpServer.cs b/OpenSim/Framework/Servers/BaseHttpServer.cs index 6cf6744..bde1f7e 100644 --- a/OpenSim/Framework/Servers/BaseHttpServer.cs +++ b/OpenSim/Framework/Servers/BaseHttpServer.cs | |||
@@ -61,16 +61,28 @@ namespace OpenSim.Framework.Servers | |||
61 | protected uint m_sslport; | 61 | protected uint m_sslport; |
62 | protected bool m_ssl = false; | 62 | protected bool m_ssl = false; |
63 | protected bool m_firstcaps = true; | 63 | protected bool m_firstcaps = true; |
64 | protected string m_SSLCommonName = ""; | ||
64 | 65 | ||
65 | public uint SSLPort | 66 | public uint SSLPort |
66 | { | 67 | { |
67 | get { return m_sslport; } | 68 | get { return m_sslport; } |
68 | } | 69 | } |
70 | |||
71 | public string SSLCommonName | ||
72 | { | ||
73 | get { return m_SSLCommonName; } | ||
74 | } | ||
75 | |||
69 | public uint Port | 76 | public uint Port |
70 | { | 77 | { |
71 | get { return m_port; } | 78 | get { return m_port; } |
72 | } | 79 | } |
73 | 80 | ||
81 | public bool UseSSL | ||
82 | { | ||
83 | get { return m_ssl; } | ||
84 | } | ||
85 | |||
74 | public BaseHttpServer(uint port) | 86 | public BaseHttpServer(uint port) |
75 | { | 87 | { |
76 | m_port = port; | 88 | m_port = port; |
@@ -83,6 +95,7 @@ namespace OpenSim.Framework.Servers | |||
83 | 95 | ||
84 | } | 96 | } |
85 | 97 | ||
98 | |||
86 | public BaseHttpServer(uint port, bool ssl, uint sslport, string CN) | 99 | public BaseHttpServer(uint port, bool ssl, uint sslport, string CN) |
87 | { | 100 | { |
88 | m_ssl = ssl; | 101 | m_ssl = ssl; |
@@ -103,6 +116,8 @@ namespace OpenSim.Framework.Servers | |||
103 | if (CN.Length > 0) | 116 | if (CN.Length > 0) |
104 | searchCN = CN.ToUpper(); | 117 | searchCN = CN.ToUpper(); |
105 | 118 | ||
119 | m_SSLCommonName = searchCN; | ||
120 | |||
106 | Type t = Type.GetType("Mono.Runtime"); | 121 | Type t = Type.GetType("Mono.Runtime"); |
107 | if (t != null) | 122 | if (t != null) |
108 | { | 123 | { |