[Modify] Polish it

This commit is contained in:
sta 2020-11-18 19:45:54 +09:00
parent 474c6ebf3f
commit e8e0bdbdf9

View File

@ -278,7 +278,7 @@ namespace WebSocketSharp.Net
if (conn._socket == null) if (conn._socket == null)
return; return;
var len = 0; var nread = 0;
try { try {
var current = conn._reuses; var current = conn._reuses;
@ -288,16 +288,7 @@ namespace WebSocketSharp.Net
conn._timeoutCanceled[current] = true; conn._timeoutCanceled[current] = true;
} }
var nread = conn._stream.EndRead (asyncResult); nread = conn._stream.EndRead (asyncResult);
if (nread <= 0) {
conn.close ();
return;
}
conn._requestBuffer.Write (conn._buffer, 0, nread);
len = (int) conn._requestBuffer.Length;
} }
catch (Exception) { catch (Exception) {
// TODO: Logging. // TODO: Logging.
@ -307,6 +298,15 @@ namespace WebSocketSharp.Net
return; return;
} }
if (nread <= 0) {
conn.close ();
return;
}
conn._requestBuffer.Write (conn._buffer, 0, nread);
var len = (int) conn._requestBuffer.Length;
if (conn.processInput (conn._requestBuffer.GetBuffer (), len)) { if (conn.processInput (conn._requestBuffer.GetBuffer (), len)) {
if (!conn._context.HasError) if (!conn._context.HasError)
conn._context.Request.FinishInitialization (); conn._context.Request.FinishInitialization ();