This is the final commit that enables the Websocket handler

user_profiles
teravus 2013-02-07 10:26:48 -05:00
parent 1dc09d8e8f
commit 4867a7cbbf
4 changed files with 1095 additions and 2 deletions

View File

@ -54,7 +54,15 @@ namespace OpenSim.Framework.Servers.HttpServer
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
private HttpServerLogWriter httpserverlog = new HttpServerLogWriter(); private HttpServerLogWriter httpserverlog = new HttpServerLogWriter();
public delegate void WebSocketRequestDelegate(string servicepath, WebSocketHTTPServerHandler handler);
/// <summary>
/// This is a pending websocket request before it got an sucessful upgrade response.
/// The consumer must call handler.HandshakeAndUpgrade() to signal to the handler to
/// start the connection and optionally provide an origin authentication method.
/// </summary>
/// <param name="servicepath"></param>
/// <param name="handler"></param>
public delegate void WebSocketRequestDelegate(string servicepath, WebSocketHttpServerHandler handler);
/// <summary> /// <summary>
/// Gets or sets the debug level. /// Gets or sets the debug level.
@ -440,7 +448,7 @@ namespace OpenSim.Framework.Servers.HttpServer
} }
if (dWebSocketRequestDelegate != null) if (dWebSocketRequestDelegate != null)
{ {
dWebSocketRequestDelegate(req.Url.AbsolutePath, new WebSocketHTTPServerHandler(req, context, 16384)); dWebSocketRequestDelegate(req.Url.AbsolutePath, new WebSocketHttpServerHandler(req, context, 8192));
return; return;
} }

File diff suppressed because it is too large Load Diff

Binary file not shown.

Binary file not shown.