Skip to content

Commit 6eb2a96

Browse files
authored
Dev (#421)
2 parents c102b5b + c46315a commit 6eb2a96

16 files changed

Lines changed: 620 additions & 480 deletions

CORE/Packages/Delphi/Connectors/Indy/RESTDWSocketIndy.cfg

Lines changed: 0 additions & 44 deletions
This file was deleted.

CORE/Packages/Delphi/Connectors/Indy/RESTDWSocketIndyDesign.cfg

Lines changed: 0 additions & 40 deletions
This file was deleted.

CORE/Packages/Delphi/Drivers/Zeos/RESTDWZEOSDriver.cfg

Lines changed: 0 additions & 39 deletions
This file was deleted.

CORE/Packages/Delphi/RESTDWCore.cfg

Lines changed: 0 additions & 45 deletions
This file was deleted.

CORE/Packages/Delphi/RESTDWCoreDesign.cfg

Lines changed: 0 additions & 41 deletions
This file was deleted.

CORE/Packages/Delphi/ShellTools/RESTDWShellServicesDesign.cfg

Lines changed: 0 additions & 41 deletions
This file was deleted.

CORE/Source/Basic/uRESTDWBasic.pas

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -200,12 +200,12 @@ TRESTDWServerIpVersionConfig = class(TPersistent)
200200
vFailOverReplaceDefaults,
201201
vEncodeStrings,
202202
vDatacompress,
203-
vUseSSL,
204203
vAuthentication : Boolean;
205204
{$IFDEF FPC}
206205
vDatabaseCharSet : TDatabaseCharSet;
207206
{$ENDIF}
208207
vFailOverConnections : TFailOverConnections;
208+
aSSLMethod : TRESTDWSSLVersion;
209209
vSSLVersions : TRESTDWSSLVersions;
210210
Function SendEvent (EventData : String) : String;Overload;
211211
Procedure SetDataRoute (Value : String);
@@ -272,14 +272,14 @@ TRESTDWServerIpVersionConfig = class(TPersistent)
272272
Property OnBeforeExecute : TOnBeforeExecute Read vOnBeforeExecute Write vOnBeforeExecute;
273273
Property OnBeforeGetToken : TOnBeforeGetToken Read vOnBeforeGetToken Write vOnBeforeGetToken;
274274
Property FailOver : Boolean Read vFailOver Write vFailOver;
275-
Property UseSSL : Boolean Read vUseSSL Write vUseSSL;
275+
Property SSLMethod : TRESTDWSSLVersion Read aSSLMethod Write aSSLMethod;
276+
Property SSLVersions : TRESTDWSSLVersions Read vSSLVersions Write vSSLVersions;
276277
Property FailOverConnections : TFailOverConnections Read vFailOverConnections Write vFailOverConnections;
277278
Property FailOverReplaceDefaults : Boolean Read vFailOverReplaceDefaults Write vFailOverReplaceDefaults;
278279
Property BinaryRequest : Boolean Read vBinaryRequest Write vBinaryRequest;
279280
Property CriptOptions : TCripto Read vCripto Write vCripto;
280281
Property UserAgent : String Read vUserAgent Write vUserAgent;
281282
Property PoolerNotFoundMessage : String Read vPoolerNotFoundMessage Write vPoolerNotFoundMessage;
282-
Property SSLVersions : TRESTDWSSLVersions Read vSSLVersions Write vSSLVersions;
283283
{$IFDEF FPC}
284284
Property DatabaseCharSet : TDatabaseCharSet Read vDatabaseCharSet Write vDatabaseCharSet;
285285
{$ENDIF}
@@ -1530,7 +1530,6 @@ procedure TRESTClientPoolerBase.SetIpVersion(IpV: TRESTDWClientIpVersions);
15301530
vFailOver := False;
15311531
vFailOverReplaceDefaults := False;
15321532
vPropThreadRequest := False;
1533-
vUseSSL := False;
15341533
vFailOverConnections := TFailOverConnections.Create(Self, TRESTDWConnectionServerCP);
15351534
vPoolerNotFoundMessage := cPoolerNotFound;
15361535
vClientIpVersion := civIPv4;

0 commit comments

Comments
 (0)