DevWiki/websocket-sharp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Moved the Ext.CheckIfValidCloseParameters methods to the WebSocket class

Browse Source
This commit is contained in:
sta
2015-05-02 15:35:03 +09:00
parent 28e2992e8d
commit f3e0591a18
4 changed files with 65 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
websocket-sharp/Server/HttpServer.cs
View File

@@ -757,7 +757,9 @@ namespace WebSocketSharp.Server
public void Stop (ushort code, string reason)
{
lock (_sync) {
var msg = _state.CheckIfStart () ?? code.CheckIfValidCloseParameters (reason);
var msg = _state.CheckIfStart () ??
WebSocket.CheckIfValidCloseParameters (code, reason, false);
if (msg != null) {
_logger.Error (msg);
return;
@@ -793,7 +795,9 @@ namespace WebSocketSharp.Server
public void Stop (CloseStatusCode code, string reason)
{
lock (_sync) {
var msg = _state.CheckIfStart () ?? code.CheckIfValidCloseParameters (reason);
var msg = _state.CheckIfStart () ??
WebSocket.CheckIfValidCloseParameters (code, reason, false);
if (msg != null) {
_logger.Error (msg);
return;

8
websocket-sharp/Server/WebSocketServer.cs
View File

@@ -842,7 +842,9 @@ namespace WebSocketSharp.Server
public void Stop (ushort code, string reason)
{
lock (_sync) {
var msg = _state.CheckIfStart () ?? code.CheckIfValidCloseParameters (reason);
var msg = _state.CheckIfStart () ??
WebSocket.CheckIfValidCloseParameters (code, reason, false);
if (msg != null) {
_logger.Error (msg);
return;
@@ -877,7 +879,9 @@ namespace WebSocketSharp.Server
public void Stop (CloseStatusCode code, string reason)
{
lock (_sync) {
var msg = _state.CheckIfStart () ?? code.CheckIfValidCloseParameters (reason);
var msg = _state.CheckIfStart () ??
WebSocket.CheckIfValidCloseParameters (code, reason, false);
if (msg != null) {
_logger.Error (msg);
return;