cmueller/DelphiWebsockets
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fixed some issues with the compiler switch and other things i messed up last night.

Browse source 
Fixed some issues with the compiler switch and other things i messed up
last night
This commit is contained in:
Yvi71 2015-11-13 11:09:24 +01:00
parent 8c88e1704e
commit 803bce2cf3
2 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
IdIOHandlerWebsocket.pas
View file

@ -30,8 +30,8 @@ type
{.$ifend} {.$ifend}
{$IFDEF WS_NO_SSL} {$IFDEF WS_NO_SSL}
TIdIOHandlerWebsocket = class(TIdIOHandlerStack) TIdIOHandlerWebsocket = class(TIdIOHandlerStack)
{ELSE} {$ELSE}
TIdIOHandlerWebsocketSSL = class(TIdSSLIOHandlerSocketOpenSSL) TIdIOHandlerWebsocket = class(TIdSSLIOHandlerSocketOpenSSL)
{$ENDIF} {$ENDIF}
private private
FIsServerSide: Boolean; FIsServerSide: Boolean;
@ -268,12 +268,12 @@ begin
end; end;
{$IFNDEF WS_NO_SSL} {$IFNDEF WS_NO_SSL}
procedure TIdIOHandlerWebsocketSSL.ClearSSLOptions; procedure TIdIOHandlerWebsocket.ClearSSLOptions;
begin begin
self.fxSSLOptions.Free; self.fxSSLOptions.Free;
self.fxSSLOptions := nil; self.fxSSLOptions := nil;
end; end;
{$ENDIF {$ENDIF}
procedure TIdIOHandlerWebsocket.Close; procedure TIdIOHandlerWebsocket.Close;
var var
@ -1152,7 +1152,7 @@ begin
repeat repeat
result := inherited WriteDataToTarget(bdata,iOffset, (iDataLength-ioffset)); result := inherited WriteDataToTarget(bdata,iOffset, (iDataLength-ioffset));
Inc(ioffset, Result); Inc(ioffset, Result);
until ioffset >= iDataLenght; until ioffset >= iDataLength;
// if debughook > 0 then // if debughook > 0 then
// OutputDebugString(PChar(Format('Written (TID:%d, P:%d): %s', // OutputDebugString(PChar(Format('Written (TID:%d, P:%d): %s',

7
IdServerIOHandlerWebsocket.pas
View file

@ -12,7 +12,7 @@ uses
IdIOHandlerWebsocket; IdIOHandlerWebsocket;
type type
{$IFNDEF WS_NO_SSL} {$IFDEF WS_NO_SSL}
TIdServerIOHandlerWebsocket = class(TIdServerIOHandlerStack) TIdServerIOHandlerWebsocket = class(TIdServerIOHandlerStack)
{$ELSE} {$ELSE}
TIdServerIOHandlerWebsocket = class(TIdServerIOHandlersslOpenSSL) TIdServerIOHandlerWebsocket = class(TIdServerIOHandlersslOpenSSL)
@ -33,7 +33,7 @@ function TIdServerIOHandlerWebsocket.Accept(ASocket: TIdSocketHandle;
AListenerThread: TIdThread; AYarn: TIdYarn): TIdIOHandler; AListenerThread: TIdThread; AYarn: TIdYarn): TIdIOHandler;
{$IFNDEF WS_NO_SSL} {$IFNDEF WS_NO_SSL}
var var
LIO: TIdIOHandlerWebsocketSSL; LIO: TIdIOHandlerWebsocket;
{$ENDIF} {$ENDIF}
begin begin
{$IFDEF WS_NO_SSL} {$IFDEF WS_NO_SSL}
@ -75,8 +75,9 @@ end;
procedure TIdServerIOHandlerWebsocket.InitComponent; procedure TIdServerIOHandlerWebsocket.InitComponent;
begin begin
inherited InitComponent; inherited InitComponent;
//TODO: Check if this is necessary for SSL {$IFDEF WS_NO_SSL}
IOHandlerSocketClass := TIdIOHandlerWebsocket; IOHandlerSocketClass := TIdIOHandlerWebsocket;
{$ENDIF}
end; end;
function TIdServerIOHandlerWebsocket.MakeClientIOHandler( function TIdServerIOHandlerWebsocket.MakeClientIOHandler(