From cd733daaa4689dc1c07fd85422acace7a56a5f31 Mon Sep 17 00:00:00 2001 From: michael Date: Mon, 24 Sep 2012 09:00:52 +0000 Subject: [PATCH] * Take care of locking when reading a file. git-svn-id: trunk@22447 - --- packages/fcl-web/src/base/fphttpclient.pp | 2 +- packages/fcl-web/src/base/fpwebfile.pp | 2 +- packages/fcl-web/src/base/httpdefs.pp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/fcl-web/src/base/fphttpclient.pp b/packages/fcl-web/src/base/fphttpclient.pp index a1bee02fe8..35b379e6bd 100644 --- a/packages/fcl-web/src/base/fphttpclient.pp +++ b/packages/fcl-web/src/base/fphttpclient.pp @@ -935,7 +935,7 @@ begin SS:=TStringStream.Create(s); try SS.Seek(0,soFromEnd); - F:=TFileStream.Create(AFileName,fmOpenRead); + F:=TFileStream.Create(AFileName,fmOpenRead or fmShareDenyWrite); try SS.CopyFrom(F,F.Size); finally diff --git a/packages/fcl-web/src/base/fpwebfile.pp b/packages/fcl-web/src/base/fpwebfile.pp index 56a2f1340c..a5c74cbc20 100644 --- a/packages/fcl-web/src/base/fpwebfile.pp +++ b/packages/fcl-web/src/base/fpwebfile.pp @@ -129,7 +129,7 @@ begin AResponse.ContentType:=MimeTypes.GetMimeType(ExtractFileExt(AFileName)); If (AResponse.ContentType='') then AResponse.ContentType:='Application/octet-stream'; - F:=TFileStream.Create(AFileName,fmOpenRead); + F:=TFileStream.Create(AFileName,fmOpenRead or fmShareDenyWrite); try AResponse.ContentLength:=F.Size; AResponse.ContentStream:=F; diff --git a/packages/fcl-web/src/base/httpdefs.pp b/packages/fcl-web/src/base/httpdefs.pp index 0d91f3a586..5d8a2e9df3 100644 --- a/packages/fcl-web/src/base/httpdefs.pp +++ b/packages/fcl-web/src/base/httpdefs.pp @@ -1469,7 +1469,7 @@ begin begin If (FLocalFileName='') then Raise HTTPError.Create(SErrInternalUploadedFileError); - FStream:=TFileStream.Create(FLocalFileName,fmOpenRead); + FStream:=TFileStream.Create(FLocalFileName,fmOpenRead or fmShareDenyWrite); end; Result:=FStream; end;