Skip to content
Permalink
Browse files

fixed some comments

  • Loading branch information
Arnaud Bouchez
Arnaud Bouchez committed Jan 23, 2020
1 parent 106571c commit 2678a545eb0e5c214571048df9b335a763b37246
Showing with 9 additions and 9 deletions.
  1. +3 −3 SQLite3/mORMotHttpClient.pas
  2. +2 −4 SQLite3/mORMotHttpServer.pas
  3. +3 −1 SynWinSock.pas
  4. +1 −1 SynopseCommit.inc
@@ -293,6 +293,7 @@ TSQLHttpClientWinSock = class(TSQLHttpClientGeneric)
protected
/// internal HTTP/1.1 compatible client
fSocketClass: THttpClientSocketClass;
/// either THttpClientSocket or THttpClientWebSockets
fSocket: THttpClientSocket;
/// call fSocket.Request()
function InternalRequest(const url, method: RawUTF8;
@@ -820,9 +821,8 @@ function TSQLHttpClientWebsockets.FakeCallbackRegister(Sender: TServiceFactoryCl
ParamValue,TInterfaceFactory.Get(ParamInfo.ArgTypeInfo));
end;

function TSQLHttpClientWebsockets.FakeCallbackUnregister(
Factory: TInterfaceFactory; FakeCallbackID: integer;
Instance: pointer): boolean;
function TSQLHttpClientWebsockets.FakeCallbackUnregister(Factory: TInterfaceFactory;
FakeCallbackID: integer; Instance: pointer): boolean;
var body,head,resp: RawUTF8;
begin
if (FakeCallbackID=0) or not WebSocketsConnected then begin
@@ -310,10 +310,8 @@ TSQLHttpServer = class(TSynPersistentLock)
function GetDBServerNames: RawUTF8;
function HttpApiAddUri(const aRoot,aDomainName: RawByteString;
aSecurity: TSQLHttpServerSecurity; aRegisterURI,aRaiseExceptionOnError: boolean): RawUTF8;
function NotifyCallback(aSender: TSQLRestServer;
const aInterfaceDotMethodName,aParams: RawUTF8;
aConnectionID: Int64; aFakeCallID: integer;
aResult, aErrorMsg: PRawUTF8): boolean;
function NotifyCallback(aSender: TSQLRestServer; const aInterfaceDotMethodName,aParams: RawUTF8;
aConnectionID: Int64; aFakeCallID: integer; aResult, aErrorMsg: PRawUTF8): boolean;
public
/// create a Server instance, binded and listening on a TCP port to HTTP requests
// - raise a EHttpServer exception if binding failed
@@ -58,6 +58,7 @@
Version 1.18
- fixed ticket [f79ff5714b] about potential finalization issues as .bpl in IDE
- fixed Win64 compatibility issue
- includes SChannel API process for TLS connection
}
@@ -845,6 +846,7 @@ TSecPkgContextStreamSizes = record
PSecPkgContextStreamSizes = ^TSecPkgContextStreamSizes;

ESChannel = class(Exception);

{$ifdef UNICODE}TSChannelClient = record{$else}TSChannelClient = object{$endif}
private
Cred: TCredHandle;
@@ -1533,7 +1535,7 @@ function InitSocketInterface(const Stack: TFileName = ''): Boolean;
SockSChannelApi := Assigned(AcquireCredentialsHandle) and
Assigned(InitializeSecurityContext) and
Assigned(QueryContextAttributes) and
Assigned(EncryptMessage);
Assigned(EncryptMessage) and Assigned(DecryptMessage);
end;
end;
result := True;
@@ -1 +1 @@
'1.18.5588'
'1.18.5589'

0 comments on commit 2678a54

Please sign in to comment.
You can’t perform that action at this time.