[Modify] Move it

2018-04-11 19:48:07 +09:00
parent be0d8ec526
commit a83a3bab41
1 changed files with 9 additions and 7 deletions
--- 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;
      }
    }