From bad6edb2ab64d36d70dae3e81edf16e01f489d63 Mon Sep 17 00:00:00 2001
From: Mobius One <mobius1qwe@yahoo.com.br>
Date: Wed, 17 May 2023 15:11:06 -0300
Subject: [PATCH 1/2] =?UTF-8?q?-=20Corre=C3=A7=C3=A3o=20de=20instala=C3=A7?=
 =?UTF-8?q?=C3=A3o=20no=20Lazarus?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CORE/Source/Basic/uRESTDWBasic.pas | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/CORE/Source/Basic/uRESTDWBasic.pas b/CORE/Source/Basic/uRESTDWBasic.pas
index d5f2a1d0..780b4320 100644
--- a/CORE/Source/Basic/uRESTDWBasic.pas
+++ b/CORE/Source/Basic/uRESTDWBasic.pas
@@ -2732,7 +2732,7 @@ procedure TRESTClientPoolerBase.SetIpVersion(IpV: TRESTDWClientIpVersions);
               vRequestHeader.Add(Url + '?' + QueryParams);
               TRESTDWDataUtils.ParseRESTURL (Url + '?' + QueryParams, vEncoding, vmark, vDatabaseCharSet, DWParams);
               If DWParams.ItemsString['dwwelcomemessage'] <> Nil Then  // Ico Menezes - Post Receber WelcomeMessage   - 20-12-2018
-               vWelcomeMessage := DecodeStrings(DWParams.ItemsString['dwwelcomemessage'].AsString, vDatabaseCharSet;
+               vWelcomeMessage := DecodeStrings(DWParams.ItemsString['dwwelcomemessage'].AsString, vDatabaseCharSet);
              End;
            End
           Else
@@ -3322,7 +3322,7 @@ procedure TRESTClientPoolerBase.SetIpVersion(IpV: TRESTDWClientIpVersions);
             End
             Else
             Begin
-              {$IFDEF RESTDWLAZARUS}
+              {$IF Defined(RESTDWLAZARUS)}
               If vEncoding = esUtf8 Then
                 mb := TStringStream.Create(Utf8Encode(JSONStr))
               Else

From 5c2f562ff8f40b7a1cf4de128d7469a75fc96ba5 Mon Sep 17 00:00:00 2001
From: Mobius One <mobius1qwe@yahoo.com.br>
Date: Wed, 17 May 2023 15:20:15 -0300
Subject: [PATCH 2/2] - Ajuste de merge

---
 CORE/Source/Basic/uRESTDWBasic.pas | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/CORE/Source/Basic/uRESTDWBasic.pas b/CORE/Source/Basic/uRESTDWBasic.pas
index 7ceea5f7..780b4320 100644
--- a/CORE/Source/Basic/uRESTDWBasic.pas
+++ b/CORE/Source/Basic/uRESTDWBasic.pas
@@ -3109,17 +3109,6 @@ procedure TRESTClientPoolerBase.SetIpVersion(IpV: TRESTDWClientIpVersions);
 
          If (vTempServerMethods.ClassType = TServerMethodDatamodule)             Or
              vTempServerMethods.ClassType.InheritsFrom(TServerMethodDatamodule) Then
-        if not WelcomeAccept then
-            begin
-             if vErrorMessage <> EmptyStr then
-               vReplyString := vErrorMessage
-             else
-               vReplyString := cInvalidWelcomeMessage;
-
-             vErrorCode   := 401;
-             ContentType  := 'text/html';
-            end
-        else
          Begin
            TServerMethodDatamodule(vTempServerMethods).SetClientInfo(ClientIP,
                                    UserAgent, vUrlToExec, ClientPort);