Merged revision(s) 3093 from SourceForge:

 Ajustes no AcceptEncoding, ContentEncoding e ContentType dos componentes SocketIndy.

Author: mobius1qwe

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.3-';
- RESTDWRelease              = '3091';
+ RESTDWRelease              = '3093';
  RESTDWCodeProject          = 'Savage Reign - GitHub';
  RESTDWVersao               = RESTDWVersionINFO + RESTDWRelease + '(' + RESTDWCodeProject + ')';
  GOffsetFromUTC             : TDateTime = 0{$IFDEF HAS_DEPRECATED}deprecated{$ENDIF};
@@ -143,6 +143,9 @@
  rsLazarusDWPackage         = 'REST Dataware - Tools';
  rsDwRequestDBGName         = 'REST Dataware - Request Debbuger';
  cDefaultContentType        = 'application/json';
+ cContentTypeFormUrl        = 'application/x-www-form-urlencoded';
+ cContentTypeMultiPart      = 'multipart/form-data';
+ cDefaultContentEncoding    = 'gzip, identity';
  cValueKey                  = '{"serverinforequest":"%s", "inforequest":"%s", "lifecycle":"%s"}';
  cValueKeyToken             = '{"secrets":"%s", "md5":"%s"}';
  cValueToken                = '{%s"exp":"%s", "iat":"%s", "secrets":"%s"}';

CORE/Source/ShellTools/uRESTDWShellServicesDelphi.pas

@@ -123,7 +123,9 @@ interface
  vResponseString := '';
  vStream         := Nil;
  vRedirect       := Redirect;
- ARequest.ReadTotalContent;
+ {$IF CompilerVersion > 21}
+  ARequest.ReadTotalContent;
+ {$IFEND}
  Try
   If CORS Then
    Begin

CORE/Source/Sockets/Indy/uRESTDWIdBase.pas

@@ -396,9 +396,6 @@  TIdHTTPAccess = class(TIdHTTP)
  HttpRequest.ProxyParams.ProxyPassword         := ProxyOptions.ProxyPassword;
  HttpRequest.ProxyParams.ProxyPort             := ProxyOptions.ProxyPort;
  HttpRequest.ReadTimeout                       := RequestTimeout;
- HttpRequest.Request.ContentType               := ContentType;
- HttpRequest.Request.Accept                    := Accept;
- HttpRequest.Request.AcceptEncoding            := AcceptEncoding;
  HttpRequest.AllowCookies                      := AllowCookies;
  HttpRequest.HandleRedirects                   := HandleRedirects;
  HttpRequest.RedirectMaximum                   := RedirectMaximum;
@@ -418,10 +415,10 @@  TIdHTTPAccess = class(TIdHTTP)
    HttpRequest.Request.Charset                  := 'ansi';
    HttpRequest.Request.AcceptCharSet            := HttpRequest.Request.Charset;
   End;
- HttpRequest.Request.ContentType               := ContentType;
  HttpRequest.Request.Accept                    := Accept;
- HttpRequest.Request.ContentEncoding           := ContentEncoding;
  HttpRequest.Request.AcceptEncoding            := AcceptEncoding;
+ HttpRequest.Request.ContentType               := ContentType;
+ HttpRequest.Request.ContentEncoding           := ContentEncoding;
  HttpRequest.Request.UserAgent                 := UserAgent;
  HttpRequest.MaxAuthRetries                    := MaxAuthRetries;
 End;
@@ -2610,10 +2607,10 @@  TIdHTTPAccess = class(TIdHTTP)
 Constructor TRESTDWIdClientREST.Create(AOwner: TComponent);
 Begin
  Inherited;
- ContentType                    := 'application/json';
- ContentEncoding                := 'application/x-www-form-urlencoded'; //'multipart/form-data';
+ //application/json
+ ContentType                    := cContentTypeFormUrl;
+ ContentEncoding                := cDefaultContentEncoding;
  Accept                         := 'text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8';
-// AcceptEncoding                 := 'gzip, deflate, br';
  AcceptEncoding                 := '';
  MaxAuthRetries                 := 0;
  UserAgent                      := cUserAgent;
@@ -2770,7 +2767,6 @@  TIdHTTPAccess = class(TIdHTTP)
 Var
  I : Integer;
 Begin
- HttpRequest.Request.AcceptEncoding := AcceptEncoding;
  HttpRequest.Request.RawHeaders.Clear;
 // HttpRequest.Request.CustomHeaders.Clear;
  If AccessControlAllowOrigin <> '' Then
@@ -2786,6 +2782,7 @@  TIdHTTPAccess = class(TIdHTTP)
      {$ELSE}
       SendParams.AddFormField('Access-Control-Allow-Origin',  AccessControlAllowOrigin);
      {$ENDIF}
+     HttpRequest.Request.ContentEncoding := cContentTypeMultiPart;
     End;
   End;
  If Assigned(AHeaders) Then
@@ -3502,6 +3499,8 @@  TIdHTTPAccess = class(TIdHTTP)
  Inherited;
  HttpRequest            := Nil;
  vCipherList            := '';
+ ContentType            := cContentTypeFormUrl;
+ ContentEncoding        := cDefaultContentEncoding;
 End;
 
 Destructor TRESTDWIdClientPooler.Destroy;
@@ -4596,6 +4595,8 @@  TIdHTTPAccess = class(TIdHTTP)
  HttpRequest            := Nil;
  vCipherList            := '';
  RESTClientPooler       := TRESTDWIdClientPooler.Create(Self);
+ ContentType            := cContentTypeFormUrl;
+ ContentEncoding        := cDefaultContentEncoding;
 End;
 
 Destructor TRESTDWIdDatabase.Destroy;