- Ajuste de versionamento

 + Exportação de propriedades para ajuste fino de limites no Indy, FpHttp e Sagui
 - Correção de nomenclatura de arquivo de strings pt-br

Author: mobius1qwe

src/base/RALConsts.pas

@@ -13,7 +13,7 @@ interface
 
 const
   // Versionamento
-  RALVERSION = '0.11.0-9 alpha';
+  RALVERSION = '0.11.0-11 alpha';
   RALVERSION_MAJOR = 0;
   RALVERSION_MINOR = 11;
   RALVERSION_PATCH = 0;
@@ -69,7 +69,7 @@ interface
 
 resourcestring
   {$IF DEFINED(LANG_PTBR)}
-    {$I ralconsts_prbr.inc}
+    {$I ralconsts_ptbr.inc}
   {$ELSEIF DEFINED(LANG_ESES)}
     {$I ralconsts_eses.inc}
   {$ELSE}

src/base/ralconsts_eses.inc

@@ -1,8 +1,9 @@
 
 { @abstract constant internal messages
-  am = alert messages
-  em = error messages
-  wm = warning messages
+  am = alert messages: middle severity messages, might raise exception
+  em = error messages: high severity messages, raises exception
+  wm = warning messages: low severity messages, doesn't raise exception
+  cm = common messages: usually used in descriptions or labels
   these are strings that are present through the internal code of RAL, stored here
   for localization purposes, allowing the user to customise their side of the component
 

src/base/ralconsts_prbr.inc src/base/ralconsts_ptbr.incsrc/base/ralconsts_prbr.inc renamed to src/base/ralconsts_ptbr.inc

@@ -10,23 +10,23 @@
   Do NOT replace wildcards starting with '%' or your package will throw errors
 }
   // general error messages
-emCompressInvalidFormat = 'Formato de compressão inválido.';
-emCompressLibFilesError = 'Os arquivos binários das seguintes classes não foram encontrados: %s.';
-emContentCheckError = 'Erro de verificação de conteúdo.';
-emCryptEmptyKey = 'A chave deve ser fornecida.';
-emDBConnectionUndefined = 'Conexão não definida.';
-emDBDriverMissing = 'Driver de conexão não encontrado.';
-emDBEmptyBody = 'O "body" está vazio.';
-emDBLinkMissing = 'Propriedade DBLink ausente.';
-emDBUpdateSQLMissing = 'SQL para UpdateTable/UpdateSQL não pode estar vazio.';
-emInvalidFormat = 'Formato Inválido.';
-emInvalidJSONFormat = 'Formato JSON inválido.';
-emQueryVersionError = 'Versão de estrutura inválida.';
-emRouteAlreadyExists = 'A rota já existe.';
-emStorageClassNotFound = 'Classe do Storage não encontrada.';
-emStorageInvalidBinary = 'Formato binário inválido.';
-emStorageLinkNotFound = 'Storage %s não está declarado em "uses".';
-emStorageNotFound = 'Nenhum TRALStorageLink encontrado.';
+  emCompressInvalidFormat = 'Formato de compressão inválido.';
+  emCompressLibFilesError = 'Os arquivos binários das seguintes classes não foram encontrados: %s.';
+  emContentCheckError = 'Erro de verificação de conteúdo.';
+  emCryptEmptyKey = 'A chave deve ser fornecida.';
+  emDBConnectionUndefined = 'Conexão não definida.';
+  emDBDriverMissing = 'Driver de conexão não encontrado.';
+  emDBEmptyBody = 'O "body" está vazio.';
+  emDBLinkMissing = 'Propriedade DBLink ausente.';
+  emDBUpdateSQLMissing = 'SQL para UpdateTable/UpdateSQL não pode estar vazio.';
+  emInvalidFormat = 'Formato Inválido.';
+  emInvalidJSONFormat = 'Formato JSON inválido.';
+  emQueryVersionError = 'Versão de estrutura inválida.';
+  emRouteAlreadyExists = 'A rota já existe.';
+  emStorageClassNotFound = 'Classe do Storage não encontrada.';
+  emStorageInvalidBinary = 'Formato binário inválido.';
+  emStorageLinkNotFound = 'Storage %s não está declarado em "uses".';
+  emStorageNotFound = 'Nenhum TRALStorageLink encontrado.';
 
   // sagui error messages
   emSaguiLibraryLoadError = 'Erro ao tentar carregar libsagui.';

src/engine/fpHTTP/RALfpHTTPServer.pas

@@ -75,7 +75,7 @@   TRALfpHttpServerThread = class(TThread)
     property Active: boolean read GetActive write SetActive;
     property Port: IntegerRAL read GetPort write SetPort;
     property SessionTimeout: IntegerRAL read GetSessionTimeout write SetSessionTimeout;
-    property QueueSize : IntegerRAL read GetQueueSize write SetQueueSize;
+    property QueueSize: IntegerRAL read GetQueueSize write SetQueueSize;
   end;
 
   TRALfpHttpServer = class(TRALServer)
@@ -413,7 +413,7 @@ constructor TRALfpHttpServerThread.Create(AOwner: TRALfpHttpServer);
   FreeOnTerminate := False;
 
   FHttp := TFPHttpServer.Create(AOwner);
-  FHttp.QueueSize := 15;
+  QueueSize := -1;
   FHttp.Threaded := True;
   FHttp.OnRequest := @OnCommandProcess;
 

src/engine/indy/RALIndyServer.pas

@@ -36,6 +36,10 @@   TRALIndyServer = class(TRALServer)
   private
     FHttp: TIdHTTPServer;
     FHandlerSSL: TIdServerIOHandlerSSLOpenSSL;
+    FMaxConnections: IntegerRAL;
+    FListenQueue: IntegerRAL;
+    procedure SetListenQueue(const Value: IntegerRAL);
+    procedure SetMaxConnections(const Value: IntegerRAL);
   protected
     function CreateRALSSL: TRALSSL; override;
     function IPv6IsImplemented: Boolean; override;
@@ -55,6 +59,8 @@   TRALIndyServer = class(TRALServer)
     constructor Create(AOwner: TComponent); override;
     destructor Destroy; override;
   published
+    property ListenQueue: IntegerRAL read FListenQueue write SetListenQueue;
+    property MaxConnections: IntegerRAL read FMaxConnections write SetMaxConnections;
     property SSL: TRALIndySSL read GetSSL write SetSSL;
   end;
 
@@ -70,6 +76,8 @@ constructor TRALIndyServer.Create(AOwner: TComponent);
   FHttp := TIdHTTPServer.Create(nil);
   FHttp.SessionState := False;
   FHttp.AutoStartSession := True;
+  MaxConnections := -1;
+  ListenQueue := -1;
   FHandlerSSL := TIdServerIOHandlerSSLOpenSSL.Create(nil);
 
 {$IFDEF FPC}
@@ -333,6 +341,18 @@ procedure TRALIndyServer.SetActive(const AValue: Boolean);
   FHttp.Active := AValue;
 end;
 
+procedure TRALIndyServer.SetListenQueue(const Value: IntegerRAL);
+begin
+  FListenQueue := Value;
+  FHttp.ListenQueue := Value;
+end;
+
+procedure TRALIndyServer.SetMaxConnections(const Value: IntegerRAL);
+begin
+  FMaxConnections := Value;
+  FHttp.MaxConnections := Value;
+end;
+
 procedure TRALIndyServer.SetSessionTimeout(const AValue: IntegerRAL);
 begin
   inherited;

src/engine/sagui/RALSaguiServer.pas

@@ -49,7 +49,8 @@   TRALSaguiServer = class(TRALServer)
   private
     FHandle: Psg_httpsrv;
     FLibPath: TFileName;
-
+    FPoolCount: IntegerRAL;
+    FConnectionLimit: Int64RAL;
     class procedure DecodeAuth(AAuthorization: StringRAL; AResult: TRALRequest);
     class procedure DoClientConnectionCallback(Acls: Pcvoid; const Aclient: Pcvoid;
       Aclosed: Pcbool); cdecl; static;
@@ -60,6 +61,10 @@   TRALSaguiServer = class(TRALServer)
       Asize: csize_t): cssize_t; cdecl; static;
     class procedure DoStreamFree(Acls: Pcvoid); cdecl; static;
     class function GetSaguiIP(AReq: Psg_httpreq): StringRAL;
+    procedure SetConnectionLimit(const Value: Int64RAL);
+    procedure SetPoolCount(const Value: IntegerRAL);
+    function GetPoolCount: IntegerRAL;
+    function GetConnectionLimit: Int64RAL;
   protected
     function CreateRALSSL: TRALSSL; override;
     procedure CreateServerHandle;
@@ -78,7 +83,9 @@   TRALSaguiServer = class(TRALServer)
     constructor Create(AOwner: TComponent); override;
     destructor Destroy; override;
   published
+    property ConnectionLimit: Int64RAL read GetConnectionLimit write SetConnectionLimit default 1000;
     property LibPath: TFileName read FLibPath write SetLibPath;
+    property PoolCount: IntegerRAL read GetPoolCount write SetPoolCount default 32;
     property SSL: TRALSaguiSSL read GetSSL write SetSSL;
   end;
 
@@ -186,6 +193,9 @@ constructor TRALSaguiServer.Create(AOwner: TComponent);
   {$ELSE}
     FLibPath := SgLib.GetLastName;
   {$ENDIF}
+
+  ConnectionLimit := -4;
+  PoolCount := -1;
 end;
 
 function TRALSaguiServer.CreateRALSSL: TRALSSL;
@@ -410,6 +420,16 @@ procedure TRALSaguiServer.FreeServerHandle;
   FHandle := nil;
 end;
 
+function TRALSaguiServer.GetConnectionLimit: Int64RAL;
+begin
+  Result := FConnectionLimit;
+end;
+
+function TRALSaguiServer.GetPoolCount: IntegerRAL;
+begin
+  Result := FPoolCount;
+end;
+
 class function TRALSaguiServer.GetSaguiIP(AReq: Psg_httpreq): StringRAL;
 var
   vIP: array[0..45] of cchar;
@@ -456,7 +476,7 @@ function TRALSaguiServer.GetSSL: TRALSaguiSSL;
 
 procedure TRALSaguiServer.SetActive(const AValue: boolean);
 var
-  vActive : boolean;
+  vActive: boolean;
 begin
   vActive := Active;
 
@@ -481,6 +501,8 @@ procedure TRALSaguiServer.SetActive(const AValue: boolean);
     CreateServerHandle;
     if not InitializeServer then
       FreeServerHandle;
+    SetConnectionLimit(ConnectionLimit);
+    SetPoolCount(PoolCount);
   end
   else
   begin
@@ -489,6 +511,13 @@ procedure TRALSaguiServer.SetActive(const AValue: boolean);
   end;
 end;
 
+procedure TRALSaguiServer.SetConnectionLimit(const Value: Int64RAL);
+begin
+  FConnectionLimit := Value;
+  if FHandle <> nil then
+    sg_httpsrv_set_con_limit(FHandle, Value);
+end;
+
 procedure TRALSaguiServer.SetLibPath(const AValue: TFileName);
 begin
   if AValue = FLibPath then
@@ -514,6 +543,13 @@ procedure TRALSaguiServer.ShutdownServerHandle;
     sg_httpsrv_shutdown(FHandle);
 end;
 
+procedure TRALSaguiServer.SetPoolCount(const Value: IntegerRAL);
+begin
+  FPoolCount := Value;
+  if FHandle <> nil then
+    sg_httpsrv_set_thr_pool_size(FHandle, Value);
+end;
+
 procedure TRALSaguiServer.SetPort(const AValue: IntegerRAL);
 var
   vActive: boolean;