aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
diff options
context:
space:
mode:
authorteravus2013-02-07 10:26:48 -0500
committerteravus2013-02-07 10:27:18 -0500
commit4867a7cbbf7302845fff031db5eae6fbf93bf26b (patch)
tree865329b6ab50a3f6bae2edc23f1251abe0cd4d4d /OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
parentWe're not really done here.. but we're getting there. Socket Read is work... (diff)
downloadopensim-SC-4867a7cbbf7302845fff031db5eae6fbf93bf26b.zip
opensim-SC-4867a7cbbf7302845fff031db5eae6fbf93bf26b.tar.gz
opensim-SC-4867a7cbbf7302845fff031db5eae6fbf93bf26b.tar.bz2
opensim-SC-4867a7cbbf7302845fff031db5eae6fbf93bf26b.tar.xz
This is the final commit that enables the Websocket handler
Diffstat (limited to 'OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs')
-rw-r--r--OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs12
1 files changed, 10 insertions, 2 deletions
diff --git a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
index dcfe99a..70c531c 100644
--- a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
+++ b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
@@ -54,7 +54,15 @@ namespace OpenSim.Framework.Servers.HttpServer
54 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 54 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
55 private HttpServerLogWriter httpserverlog = new HttpServerLogWriter(); 55 private HttpServerLogWriter httpserverlog = new HttpServerLogWriter();
56 56
57 public delegate void WebSocketRequestDelegate(string servicepath, WebSocketHTTPServerHandler handler); 57
58 /// <summary>
59 /// This is a pending websocket request before it got an sucessful upgrade response.
60 /// The consumer must call handler.HandshakeAndUpgrade() to signal to the handler to
61 /// start the connection and optionally provide an origin authentication method.
62 /// </summary>
63 /// <param name="servicepath"></param>
64 /// <param name="handler"></param>
65 public delegate void WebSocketRequestDelegate(string servicepath, WebSocketHttpServerHandler handler);
58 66
59 /// <summary> 67 /// <summary>
60 /// Gets or sets the debug level. 68 /// Gets or sets the debug level.
@@ -440,7 +448,7 @@ namespace OpenSim.Framework.Servers.HttpServer
440 } 448 }
441 if (dWebSocketRequestDelegate != null) 449 if (dWebSocketRequestDelegate != null)
442 { 450 {
443 dWebSocketRequestDelegate(req.Url.AbsolutePath, new WebSocketHTTPServerHandler(req, context, 16384)); 451 dWebSocketRequestDelegate(req.Url.AbsolutePath, new WebSocketHttpServerHandler(req, context, 8192));
444 return; 452 return;
445 } 453 }
446 454