From a83a3bab414c568612b25ca9fd32cd4b224e711f Mon Sep 17 00:00:00 2001
From: sta <sta.blockhead@gmail.com>
Date: Wed, 11 Apr 2018 19:48:07 +0900
Subject: [PATCH] [Modify] Move it

---
 .../WebSockets/TcpListenerWebSocketContext.cs    | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/websocket-sharp/Net/WebSockets/TcpListenerWebSocketContext.cs b/websocket-sharp/Net/WebSockets/TcpListenerWebSocketContext.cs
index 61583877..90738fcc 100644
--- a/websocket-sharp/Net/WebSockets/TcpListenerWebSocketContext.cs
+++ b/websocket-sharp/Net/WebSockets/TcpListenerWebSocketContext.cs
@@ -101,13 +101,6 @@ namespace WebSocketSharp.Net.WebSockets
       }
 
       _request = HttpRequest.Read (_stream, 90000);
-      _uri = HttpUtility.CreateRequestUrl (
-               _request.RequestUri,
-               _request.Headers["Host"],
-               _request.IsWebSocketRequest,
-               secure
-             );
-
       _websocket = new WebSocket (this, protocol);
     }
 
@@ -261,6 +254,15 @@ namespace WebSocketSharp.Net.WebSockets
     /// </value>
     public override Uri RequestUri {
       get {
+        if (_uri == null) {
+          _uri = HttpUtility.CreateRequestUrl (
+                   _request.RequestUri,
+                   _request.Headers["Host"],
+                   _request.IsWebSocketRequest,
+                   _secure
+                 );
+        }
+
         return _uri;
       }
     }