Merge branch 'master' of https://github.com/andremussche/DelphiWebsockets

2014-01-20 08:59:36 +01:00 · 2014-01-20 08:59:36 +01:00 · 0181d6b8ab
parent 2b7abcceff e1d2ad094b
commit 0181d6b8ab
2 changed files with 3 additions and 0 deletions
--- a/IdHTTPWebsocketClient.pas
+++ b/IdHTTPWebsocketClient.pas
@ -325,6 +325,7 @@ begin
        if (IOHandler <> nil) then
          IOHandler.Clear;

+        Self.ConnectTimeout := 100;
        Self.Connect;
        TryUpgradeToWebsocket;
      except
--- a/IdIOHandlerWebsocket.pas
+++ b/IdIOHandlerWebsocket.pas
@ -556,6 +556,8 @@ end;

 function TIdIOHandlerWebsocket.Readable(AMSec: Integer): Boolean;
 begin
+  if FWSInputBuffer.Size > 0 then Exit(True);
+
  if not FSelectLock.TryEnter then Exit(False);
  try
    Result := inherited Readable(AMSec);