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

Refactored a few for HttpConnection.cs

Browse Source
This commit is contained in:
sta 2015-05-23 16:55:40 +09:00
parent 323161988e
commit 9113555a54
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
websocket-sharp/Net/HttpConnection.cs
View File

@ -327,10 +327,13 @@ namespace WebSocketSharp.Net
// false -> Need more input. // false -> Need more input.
private bool processInput (byte[] data, int length) private bool processInput (byte[] data, int length)
{ {
if (_currentLine == null)
_currentLine = new StringBuilder ();
var nread = 0; var nread = 0;
try { try {
string line; string line;
while ((line = readLineFrom (data, _position, length - _position, ref nread)) != null) { while ((line = readLineFrom (data, _position, length, out nread)) != null) {
_position += nread; _position += nread;
if (line.Length == 0) { if (line.Length == 0) {
if (_inputState == InputState.RequestLine) if (_inputState == InputState.RequestLine)
@ -361,14 +364,10 @@ namespace WebSocketSharp.Net
return false; return false;
} }
private string readLineFrom (byte[] buffer, int offset, int count, ref int read) private string readLineFrom (byte[] buffer, int offset, int length, out int read)
{ {
if (_currentLine == null)
_currentLine = new StringBuilder ();
var last = offset + count;
read = 0; read = 0;
for (var i = offset; i < last && _lineState != LineState.Lf; i++) { for (var i = offset; i < length && _lineState != LineState.Lf; i++) {
read++; read++;
var b = buffer[i]; var b = buffer[i];
if (b == 13) if (b == 13)