OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' into httptests

httptests
UbitUmarov 2016-12-06 10:26:57 +00:00
parent ccaa7a4a8a 44588ce45e
commit 4993a08d25
2 changed files with 7 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Capabilities/Caps.cs
View File

@ -136,7 +136,7 @@ namespace OpenSim.Framework.Capabilities
} }
m_agentID = agent; m_agentID = agent;
m_capsHandlers = new CapsHandlers(httpServer, httpListen, httpPort, (httpServer == null) ? false : httpServer.UseSSL); m_capsHandlers = new CapsHandlers(httpServer, httpListen, httpPort);
m_regionName = regionName; m_regionName = regionName;
m_capsActive.Reset(); m_capsActive.Reset();
} }

26
OpenSim/Capabilities/CapsHandlers.cs
View File

@ -53,31 +53,15 @@ namespace OpenSim.Framework.Capabilities
/// <param name="httpListener">base HTTP server</param> /// <param name="httpListener">base HTTP server</param>
/// <param name="httpListenerHostname">host name of the HTTP server</param> /// <param name="httpListenerHostname">host name of the HTTP server</param>
/// <param name="httpListenerPort">HTTP port</param> /// <param name="httpListenerPort">HTTP port</param>
public CapsHandlers(BaseHttpServer httpListener, string httpListenerHostname, uint httpListenerPort) public CapsHandlers(IHttpServer httpListener, string httpListenerHostname, uint httpListenerPort)
: this(httpListener,httpListenerHostname,httpListenerPort, false)
{
}
/// <summary></summary>
/// CapsHandlers is a cap handler container but also takes
/// care of adding and removing cap handlers to and from the
/// supplied BaseHttpServer.
/// </summary>
/// <param name="httpListener">base HTTP server</param>
/// <param name="httpListenerHostname">host name of the HTTP
/// server</param>
/// <param name="httpListenerPort">HTTP port</param>
public CapsHandlers(IHttpServer httpListener, string httpListenerHostname, uint httpListenerPort, bool https)
{ {
m_httpListener = httpListener; m_httpListener = httpListener;
m_httpListenerHostName = httpListenerHostname; m_httpListenerHostName = httpListenerHostname;
m_httpListenerPort = httpListenerPort; m_httpListenerPort = httpListenerPort;
m_useSSL = https; if (httpListener != null && httpListener.UseSSL)
if (httpListener != null && m_useSSL) m_useSSL = true;
{ else
m_httpListenerHostName = httpListener.SSLCommonName; m_useSSL = false;
m_httpListenerPort = httpListener.SSLPort;
}
} }
/// <summary> /// <summary>