Merged revision(s) 3051-3053 from SourceForge:

 Correção para Lazarus de AV.
 Correção no pacote DriverZEOS.
 Ajuste de AV no ServerContext
 Ajuste de path no include na uRESTDWJSON
 Adição da função GetMIMEType para o ServerContext

Author: mobius1qwe

CORE/Packages/Lazarus/Connectors/Indy/RestDatawareIndySockets.lpk

@@ -19,6 +19,11 @@
         </Optimizations>
         <SmallerCode Value="True"/>
       </CodeGeneration>
+      <Linking>
+        <Debugging>
+          <DebugInfoType Value="dsDwarf2"/>
+        </Debugging>
+      </Linking>
       <Other>
         <CustomOptions Value="-dNOGUI
 -dUseCThreads"/>

CORE/Packages/Lazarus/Drivers/zeos/restdwdriverzeos.lpk

@@ -9,10 +9,10 @@
       <Version Value="11"/>
       <PathDelim Value="\"/>
       <SearchPaths>
-        <IncludeFiles Value="..\..\..\..;..\..\..\..\Includes;..\..\..\..\Source\Includes"/>
+        <IncludeFiles Value="..\..\..\..;..\..\..\..\Includes"/>
         <Libraries Value="..\..\..\..\static\$(TargetCPU)-$(TargetOS)"/>
         <OtherUnitFiles Value="..\..\libs;..\..;..\..\libs\JSON;..\..\..\..\Source\Database_Drivers"/>
-        <UnitOutputDirectory Value="..\..\..\..\Source\compiledlaz"/>
+        <UnitOutputDirectory Value="..\..\..\..\compiledlaz"/>
       </SearchPaths>
       <CodeGeneration>
         <Optimizations>
@@ -26,12 +26,13 @@
     <Version Major="2"/>
     <Files Count="3">
       <Item1>
-        <Filename Value="restdwdriverzeos.lrs"/>
-        <Type Value="LRS"/>
+        <Filename Value="uRESTDWDriverZEOSReg.pas"/>
+        <HasRegisterProc Value="True"/>
+        <UnitName Value="uRESTDWDriverZEOSReg"/>
       </Item1>
       <Item2>
-        <Filename Value="..\..\..\..\Source\Includes\uRESTDWPlataform.inc"/>
-        <Type Value="Include"/>
+        <Filename Value="restdwdriverzeos.lrs"/>
+        <Type Value="LRS"/>
       </Item2>
       <Item3>
         <Filename Value="..\..\..\..\Source\Database_Drivers\uRESTDWDriverZEOS.pas"/>
@@ -40,16 +41,19 @@
       </Item3>
     </Files>
     <CompatibilityMode Value="True"/>
-    <RequiredPkgs Count="3">
+    <RequiredPkgs Count="4">
       <Item1>
         <PackageName Value="restdatawarecomponents"/>
       </Item1>
       <Item2>
         <PackageName Value="LR_ZeosDB"/>
       </Item2>
       <Item3>
-        <PackageName Value="FCL"/>
+        <PackageName Value="indylaz"/>
       </Item3>
+      <Item4>
+        <PackageName Value="FCL"/>
+      </Item4>
     </RequiredPkgs>
     <UsageOptions>
       <UnitPath Value="$(PkgOutDir)"/>

CORE/Packages/Lazarus/Drivers/zeos/restdwdriverzeos.pas

@@ -8,12 +8,13 @@
 interface
 
 uses
-  uRESTDWDriverZEOS, LazarusPackageIntf;
+  uRESTDWDriverZEOSReg, uRESTDWDriverZEOS, LazarusPackageIntf;
 
 implementation
 
 procedure Register;
 begin
+  RegisterUnit('uRESTDWDriverZEOSReg', @uRESTDWDriverZEOSReg.Register);
   RegisterUnit('uRESTDWDriverZEOS', @uRESTDWDriverZEOS.Register);
 end;
 

CORE/Packages/Lazarus/restdatawarecomponents.lpk

@@ -19,6 +19,11 @@
         </Optimizations>
         <SmallerCode Value="True"/>
       </CodeGeneration>
+      <Linking>
+        <Debugging>
+          <DebugInfoType Value="dsDwarf2"/>
+        </Debugging>
+      </Linking>
       <Other>
         <CustomOptions Value="-dNOGUI
 -dUseCThreads"/>

CORE/Source/Basic/uRESTDWBasic.pas

@@ -1946,6 +1946,7 @@ interface
   AuthPassword := AuthenticationString;
  End;
 Begin
+ ResultStream          := Nil;
  Result                := True;
  vRDWAuthOptionParam   := Nil;
  decoder               := Nil;
@@ -3827,6 +3828,8 @@ interface
                StatusCode             := vErrorCode;
                If ServerContextStream <> Nil Then
                 Begin
+                 If Not (Assigned(ResultStream)) Then
+                   ResultStream := TStringStream.Create('');  //Anderson
                  WriteStream(ServerContextStream, ResultStream);
                  FreeAndNil(ServerContextStream);
                 End

CORE/Source/Consts/uRESTDWConsts.pas

@@ -71,7 +71,7 @@
  monthnames                 : Array [1 .. 12] Of string = ('Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', {do not localize}
                                                            'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec'); {do not localize}
  RESTDWVersionINFO          = 'v2.0.0-';
- RESTDWRelease              = '3048';
+ RESTDWRelease              = '3050';
  RESTDWCodeProject          = 'Savage Reign - GitHub';
  RESTDWVersao               = RESTDWVersionINFO + RESTDWRelease + '(' + RESTDWCodeProject + ')';
  GOffsetFromUTC             : TDateTime = 0{$IFDEF HAS_DEPRECATED}deprecated{$ENDIF};
@@ -376,7 +376,7 @@
  Function  BuildStringFloat         (Value              : String;
                                      DataModeD          : TDataMode = dmDataware;
                                      FloatDecimalFormat : String = '')            : String;
-// Function  GetMIMEType              (sFile              : TFileName)              : string;
+ Function  GetMIMEType              (sFile              : TFileName)              : string;
  Function  Scripttags               (Value              : String)                 : Boolean;
  Function  RESTDWFileExists             (sFile,
                                      BaseFilePath       : String)                 : Boolean;
@@ -643,6 +643,19 @@ implementation
   End;
 End;
 
+Function GetMIMEType(sFile: TFileName): string;
+Var
+ Mime : TMimeTable;
+Begin
+ Mime := nil;
+ Mime := TMimeTable.Create();
+ try
+   Result := Mime.GetFileMIMEType(sFile);
+ finally
+   FreeAndNil(Mime);
+ end;
+End;
+
 Function scripttags(Value: String): Boolean;
 var
  I : Integer;

CORE/Source/Sockets/Indy/uRESTDWIdBase.pas

@@ -3127,9 +3127,12 @@  TIdHTTPAccess = class(TIdHTTP)
       Else
        ResultStream  := TStringStream.Create(ErrorMessage);
      End;
-    AResponseInfo.FreeContentStream      := True;
-    AResponseInfo.ContentStream          := ResultStream;
-    AResponseInfo.ContentStream.Position := 0;
+    if Assigned(ResultStream)  then    //anderson
+    begin
+      AResponseInfo.FreeContentStream      := True;
+      AResponseInfo.ContentStream          := ResultStream;
+      AResponseInfo.ContentStream.Position := 0;
+    end;
     {$IFNDEF FPC}
      AResponseInfo.ContentLength         := ResultStream.Size;
     {$ELSE}

CORE/Source/libs/JSON/uRESTDWJSON.pas

@@ -1,6 +1,6 @@
 unit uRESTDWJSON;
 
-{$I ..\..\Source\Includes\uRESTDWPlataform.inc}
+{$I ..\..\..\Source\Includes\uRESTDWPlataform.inc}
 
 Interface