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

Renamed HandshakeRequest.cs to HttpRequest.cs, and refactored

Browse Source
This commit is contained in:
sta
2014-07-14 20:34:43 +09:00
parent f75b8fde86
commit 4427838632
5 changed files with 58 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
websocket-sharp/Net/WebSockets/TcpListenerWebSocketContext.cs
View File

@@ -49,7 +49,7 @@ namespace WebSocketSharp.Net.WebSockets
private TcpClient _client;
private CookieCollection _cookies;
private NameValueCollection _queryString;
private HandshakeRequest _request;
private HttpRequest _request;
private bool _secure;
private WebSocketStream _stream;
private Uri _uri;
@@ -66,7 +66,7 @@ namespace WebSocketSharp.Net.WebSockets
_client = client;
_secure = secure;
_stream = WebSocketStream.CreateServerStream (client, secure, cert);
_request = _stream.ReadHandshake<HandshakeRequest> (HandshakeRequest.Parse, 90000);
_request = _stream.ReadHttp<HttpRequest> (HttpRequest.Parse, 90000);
_uri = HttpUtility.CreateRequestUrl (
_request.RequestUri, _request.Headers ["Host"], _request.IsWebSocketRequest, secure);
@@ -329,7 +329,7 @@ namespace WebSocketSharp.Net.WebSockets
var res = new HandshakeResponse (HttpStatusCode.Unauthorized);
res.Headers ["WWW-Authenticate"] = challenge;
_stream.WriteHandshake (res);
_request = _stream.ReadHandshake<HandshakeRequest> (HandshakeRequest.Parse, 15000);
_request = _stream.ReadHttp<HttpRequest> (HttpRequest.Parse, 15000);
}
internal void SetUser (