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-06-23 11:01:19 +09:00
parent 846f380157
commit 5e3814fa71
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -262,8 +262,10 @@ namespace WebSocketSharp.Net
len = (int) conn._requestBuffer.Length; len = (int) conn._requestBuffer.Length;
} }
catch (Exception ex) { catch (Exception ex) {
if (conn._requestBuffer != null && conn._requestBuffer.Length > 0) if (conn._requestBuffer != null && conn._requestBuffer.Length > 0) {
conn.SendError (ex.Message, 400); conn.SendError (ex.Message, 400);
return;
}
conn.close (); conn.close ();
return; return;
@ -280,15 +282,11 @@ namespace WebSocketSharp.Net
if (conn._context.HasError) { if (conn._context.HasError) {
conn.SendError (); conn.SendError ();
conn.Close (true);
return; return;
} }
if (!conn._listener.BindContext (conn._context)) { if (!conn._listener.BindContext (conn._context)) {
conn.SendError ("Invalid host", 400); conn.SendError ("Invalid host", 400);
conn.Close (true);
return; return;
} }
@ -332,7 +330,7 @@ namespace WebSocketSharp.Net
continue; continue;
if (_position > 32768) if (_position > 32768)
_context.ErrorMessage = "Maximum total headers length exceeded"; _context.ErrorMessage = "Headers too long";
_currentLine = null; _currentLine = null;
return true; return true;
@ -357,7 +355,7 @@ namespace WebSocketSharp.Net
_position += nread; _position += nread;
if (_position >= 32768) { if (_position >= 32768) {
_context.ErrorMessage = "Maximum total headers length exceeded"; _context.ErrorMessage = "Headers too long";
return true; return true;
} }
@ -548,7 +546,7 @@ namespace WebSocketSharp.Net
res.Close (entity, true); res.Close (entity, true);
} }
catch { catch {
// Response was already closed. Close (true);
} }
} }
} }