From 633d80904bad561a5ae229d930a6fc6db565eafc Mon Sep 17 00:00:00 2001 From: sta Date: Sun, 31 Jan 2016 15:41:47 +0900 Subject: [PATCH] [Modify] Move it --- websocket-sharp/WebSocket.cs | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/websocket-sharp/WebSocket.cs b/websocket-sharp/WebSocket.cs index 73dc3138..f968d2ba 100644 --- a/websocket-sharp/WebSocket.cs +++ b/websocket-sharp/WebSocket.cs @@ -677,6 +677,8 @@ namespace WebSocketSharp throw new WebSocketException (CloseStatusCode.PolicyViolation, msg); } + _base64Key = _context.Headers["Sec-WebSocket-Key"]; + if (_protocol != null) processSecWebSocketProtocolHeader (_context.SecWebSocketProtocols); @@ -1712,11 +1714,7 @@ namespace WebSocketSharp // As server private bool validateSecWebSocketKeyHeader (string value) { - if (value == null || value.Length == 0) - return false; - - _base64Key = value; - return true; + return value != null && value.Length > 0; } // As client