From f0466795dcdcc306666fe9ce05a9dd15c1215018 Mon Sep 17 00:00:00 2001
From: sta <sta.blockhead@gmail.com>
Date: Fri, 24 Nov 2017 15:56:43 +0900
Subject: [PATCH] [Modify] Polish it

---
 websocket-sharp/WebSocket.cs | 29 +++++++++++++++++++++--------
 1 file changed, 21 insertions(+), 8 deletions(-)

diff --git a/websocket-sharp/WebSocket.cs b/websocket-sharp/WebSocket.cs
index 4eb978b1..d13bd577 100644
--- a/websocket-sharp/WebSocket.cs
+++ b/websocket-sharp/WebSocket.cs
@@ -857,23 +857,34 @@ namespace WebSocketSharp
     // As server
     private bool acceptHandshake ()
     {
-      _logger.Debug (String.Format ("A request from {0}:\n{1}", _context.UserEndPoint, _context));
+      var msg = String.Format (
+                  "A handshake request from {0}:\n{1}",
+                  _context.UserEndPoint,
+                  _context
+                );
+
+      _logger.Debug (msg);
 
-      string msg;
       if (!checkHandshakeRequest (_context, out msg)) {
-        sendHttpResponse (createHandshakeFailureResponse (HttpStatusCode.BadRequest));
+        var res = createHandshakeFailureResponse (HttpStatusCode.BadRequest);
+        sendHttpResponse (res);
 
         _logger.Fatal (msg);
-        fatal ("An error has occurred while accepting.", CloseStatusCode.ProtocolError);
+
+        msg = "A fatal error has occurred while attempting to accept.";
+        fatal (msg, CloseStatusCode.ProtocolError);
 
         return false;
       }
 
       if (!customCheckHandshakeRequest (_context, out msg)) {
-        sendHttpResponse (createHandshakeFailureResponse (HttpStatusCode.BadRequest));
+        var res = createHandshakeFailureResponse (HttpStatusCode.BadRequest);
+        sendHttpResponse (res);
 
         _logger.Fatal (msg);
-        fatal ("An error has occurred while accepting.", CloseStatusCode.PolicyViolation);
+
+        msg = "A fatal error has occurred while attempting to accept.";
+        fatal (msg, CloseStatusCode.PolicyViolation);
 
         return false;
       }
@@ -883,8 +894,10 @@ namespace WebSocketSharp
       if (_protocol != null)
         processSecWebSocketProtocolHeader (_context.SecWebSocketProtocols);
 
-      if (!_ignoreExtensions)
-        processSecWebSocketExtensionsClientHeader (_context.Headers["Sec-WebSocket-Extensions"]);
+      if (!_ignoreExtensions) {
+        var val = _context.Headers["Sec-WebSocket-Extensions"];
+        processSecWebSocketExtensionsClientHeader (val);
+      }
 
       return sendHttpResponse (createHandshakeResponse ());
     }