From 9351245a3235303a10560c018be84ffa6906fb60 Mon Sep 17 00:00:00 2001
From: sta <sta.blockhead@gmail.com>
Date: Thu, 5 Jul 2018 20:38:26 +0900
Subject: [PATCH] [Modify] Polish it

---
 websocket-sharp/Server/WebSocketBehavior.cs | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/websocket-sharp/Server/WebSocketBehavior.cs b/websocket-sharp/Server/WebSocketBehavior.cs
index b6c42c16..23f5cf26 100644
--- a/websocket-sharp/Server/WebSocketBehavior.cs
+++ b/websocket-sharp/Server/WebSocketBehavior.cs
@@ -366,12 +366,19 @@ namespace WebSocketSharp.Server
 
     private string checkHandshakeRequest (WebSocketContext context)
     {
-      return _originValidator != null && !_originValidator (context.Origin)
-             ? "Includes no Origin header, or it has an invalid value."
-             : _cookiesValidator != null
-               && !_cookiesValidator (context.CookieCollection, context.WebSocket.CookieCollection)
-               ? "Includes no cookie, or an invalid cookie exists."
-               : null;
+      if (_originValidator != null) {
+        if (!_originValidator (context.Origin))
+          return "It includes no Origin header or an invalid one.";
+      }
+
+      if (_cookiesValidator != null) {
+        var req = context.CookieCollection;
+        var res = context.WebSocket.CookieCollection;
+        if (!_cookiesValidator (req, res))
+          return "It includes no cookie or an invalid one.";
+      }
+
+      return null;
     }
 
     private void onClose (object sender, CloseEventArgs e)