DevWiki/websocket-sharp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Get the value once for IsWebSocketRequest property

Browse Source
This commit is contained in:
sta 2014-06-02 15:33:25 +09:00
parent 94bb58f4fc
commit fa01992fa1
2 changed files with 25 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
websocket-sharp/HandshakeRequest.cs
View File

@ -39,6 +39,8 @@ namespace WebSocketSharp
private string _method; private string _method;
private string _uri; private string _uri;
private bool _websocketRequest;
private bool _websocketRequestWasSet;
#endregion #endregion
@ -94,11 +96,17 @@ namespace WebSocketSharp
public bool IsWebSocketRequest { public bool IsWebSocketRequest {
get { get {
var headers = Headers; if (!_websocketRequestWasSet) {
return _method == "GET" && var headers = Headers;
ProtocolVersion > HttpVersion.Version10 && _websocketRequest = _method == "GET" &&
headers.Contains ("Upgrade", "websocket") && ProtocolVersion > HttpVersion.Version10 &&
headers.Contains ("Connection", "Upgrade"); headers.Contains ("Upgrade", "websocket") &&
headers.Contains ("Connection", "Upgrade");
_websocketRequestWasSet = true;
}
return _websocketRequest;
} }
} }

16
websocket-sharp/Net/HttpListenerRequest.cs
View File

@ -83,6 +83,8 @@ namespace WebSocketSharp.Net
private Uri _url; private Uri _url;
private string [] _userLanguages; private string [] _userLanguages;
private Version _version; private Version _version;
private bool _websocketRequest;
private bool _websocketRequestWasSet;
#endregion #endregion
@ -273,10 +275,16 @@ namespace WebSocketSharp.Net
/// </value> /// </value>
public bool IsWebSocketRequest { public bool IsWebSocketRequest {
get { get {
return _method == "GET" && if (!_websocketRequestWasSet) {
_version > HttpVersion.Version10 && _websocketRequest = _method == "GET" &&
_headers.Contains ("Upgrade", "websocket") && _version > HttpVersion.Version10 &&
_headers.Contains ("Connection", "Upgrade"); _headers.Contains ("Upgrade", "websocket") &&
_headers.Contains ("Connection", "Upgrade");
_websocketRequestWasSet = true;
}
return _websocketRequest;
} }
} }