From ce528e180884da9a9881e7a73a30fd73df33ff2b Mon Sep 17 00:00:00 2001 From: michael Date: Sat, 22 Jun 2019 07:16:19 +0000 Subject: [PATCH] * Make sure error content is sent git-svn-id: trunk@42262 - --- packages/fcl-web/src/restbridge/sqldbrestbridge.pp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/packages/fcl-web/src/restbridge/sqldbrestbridge.pp b/packages/fcl-web/src/restbridge/sqldbrestbridge.pp index 6dc839c2f1..d8dfb615ab 100644 --- a/packages/fcl-web/src/restbridge/sqldbrestbridge.pp +++ b/packages/fcl-web/src/restbridge/sqldbrestbridge.pp @@ -817,6 +817,9 @@ begin IO.Response.Code:=aCode; IO.Response.CodeText:=aExtraMessage; IO.RestOutput.CreateErrorContent(aCode,aExtraMessage); + IO.RESTOutput.FinalizeOutput; + IO.Response.ContentStream.Position:=0; + IO.Response.ContentLength:=IO.Response.ContentStream.Size; IO.Response.SendResponse; end; @@ -1971,7 +1974,7 @@ begin // Make sure there is a document in case of error if (aResponse.ContentStream.Size=0) and Not ((aResponse.Code div 100)=2) then IO.RESTOutput.CreateErrorContent(aResponse.Code,aResponse.CodeText); - if Not (IO.Operation in [roOptions,roHEAD]) then + if Not ((IO.Operation in [roOptions,roHEAD]) or aResponse.ContentSent) then IO.RestOutput.FinalizeOutput; aResponse.ContentStream.Position:=0; aResponse.ContentLength:=aResponse.ContentStream.Size;