[Modify] Polish it

This commit is contained in:
sta 2015-12-11 15:24:41 +09:00
parent 07addc4eee
commit 8b48f224ea

View File

@ -80,12 +80,12 @@ namespace WebSocketSharp
private bool _enableRedirection; private bool _enableRedirection;
private AutoResetEvent _exitReceiving; private AutoResetEvent _exitReceiving;
private string _extensions; private string _extensions;
private bool _fcompressed;
private Opcode _fopcode;
private object _forConn; private object _forConn;
private object _forMessageEventQueue; private object _forMessageEventQueue;
private object _forSend; private object _forSend;
private MemoryStream _fragmentsBuffer; private MemoryStream _fragmentsBuffer;
private bool _fragmentsCompressed;
private Opcode _fragmentsOpcode;
private const string _guid = "258EAFA5-E914-47DA-95CA-C5AB0DC85B11"; private const string _guid = "258EAFA5-E914-47DA-95CA-C5AB0DC85B11";
private Func<WebSocketContext, string> _handshakeRequestChecker; private Func<WebSocketContext, string> _handshakeRequestChecker;
private bool _ignoreExtensions; private bool _ignoreExtensions;
@ -1116,8 +1116,8 @@ namespace WebSocketSharp
if (frame.IsContinuation) if (frame.IsContinuation)
return true; return true;
_fopcode = frame.Opcode; _fragmentsOpcode = frame.Opcode;
_fcompressed = frame.IsCompressed; _fragmentsCompressed = frame.IsCompressed;
_fragmentsBuffer = new MemoryStream (); _fragmentsBuffer = new MemoryStream ();
_inContinuation = true; _inContinuation = true;
} }
@ -1125,11 +1125,11 @@ namespace WebSocketSharp
_fragmentsBuffer.WriteBytes (frame.PayloadData.ApplicationData, 1024); _fragmentsBuffer.WriteBytes (frame.PayloadData.ApplicationData, 1024);
if (frame.IsFinal) { if (frame.IsFinal) {
using (_fragmentsBuffer) { using (_fragmentsBuffer) {
var data = _fcompressed var data = _fragmentsCompressed
? _fragmentsBuffer.DecompressToArray (_compression) ? _fragmentsBuffer.DecompressToArray (_compression)
: _fragmentsBuffer.ToArray (); : _fragmentsBuffer.ToArray ();
enqueueToMessageEventQueue (new MessageEventArgs (_fopcode, data)); enqueueToMessageEventQueue (new MessageEventArgs (_fragmentsOpcode, data));
} }
_fragmentsBuffer = null; _fragmentsBuffer = null;