From 828e117190cdd66f6e637959b727b0c2ce221491 Mon Sep 17 00:00:00 2001 From: sta Date: Thu, 5 Feb 2015 17:31:33 +0900 Subject: [PATCH] Replaced the AcceptWebSocket (string, Logger) method with the AcceptWebSocket (string) method --- websocket-sharp/Net/HttpListenerContext.cs | 7 ++----- websocket-sharp/Server/HttpServer.cs | 2 +- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/websocket-sharp/Net/HttpListenerContext.cs b/websocket-sharp/Net/HttpListenerContext.cs index c8dddd01..3075b3f4 100644 --- a/websocket-sharp/Net/HttpListenerContext.cs +++ b/websocket-sharp/Net/HttpListenerContext.cs @@ -178,9 +178,6 @@ namespace WebSocketSharp.Net /// /// A that represents the subprotocol used in the WebSocket connection. /// - /// - /// A that provides the logging functions used in the WebSocket attempts. - /// /// /// /// is empty. @@ -192,7 +189,7 @@ namespace WebSocketSharp.Net /// contains an invalid character. /// /// - public HttpListenerWebSocketContext AcceptWebSocket (string protocol, Logger logger) + public HttpListenerWebSocketContext AcceptWebSocket (string protocol) { if (protocol != null) { if (protocol.Length == 0) @@ -202,7 +199,7 @@ namespace WebSocketSharp.Net throw new ArgumentException ("Contains an invalid character.", "protocol"); } - return new HttpListenerWebSocketContext (this, protocol, logger ?? new Logger ()); + return new HttpListenerWebSocketContext (this, protocol, _listener.Log); } #endregion diff --git a/websocket-sharp/Server/HttpServer.cs b/websocket-sharp/Server/HttpServer.cs index 57e84042..9afac295 100644 --- a/websocket-sharp/Server/HttpServer.cs +++ b/websocket-sharp/Server/HttpServer.cs @@ -554,7 +554,7 @@ namespace WebSocketSharp.Server state => { try { if (ctx.Request.IsUpgradeTo ("websocket")) { - processRequest (ctx.AcceptWebSocket (null, _logger)); + processRequest (ctx.AcceptWebSocket (null)); return; }