* Fixed mime-multipart processing for solutions that do

   not support chunked processing of content. (like CGI)

git-svn-id: trunk@49408 -

packages/fcl-web/src/base/httpdefs.pp

@@ -253,6 +253,7 @@ type
   protected
     FLocalFilename: string;
 
+    Function CreateUploadedFileStreaming(Files : TUploadedFiles) : TUploadedFile; virtual;
     Function CreateUploadedFile(Files : TUploadedFiles) : TUploadedFile; virtual;
     function CreateFile(Files: TUploadedFiles): TUploadedFile; virtual;
     Function ProcessHeader(Const AHeader,AValue : String) : Boolean; virtual;
@@ -286,7 +287,10 @@ type
   Protected
     Procedure CreateUploadFiles(Files : TUploadedFiles; Vars : TStrings); virtual;
     procedure FormSplit(var Cnt: String; boundary: String); virtual;
-    procedure ProcessStreamingMultiPart(const State: TContentStreamingState; const Buf; const Size: Integer); virtual; abstract;
+    procedure ProcessStreamingMultiPart(const State: TContentStreamingState; const Buf; const Size: Integer); virtual;
+    // With streaming is meant that the incoming data is processed in smaller
+    // chunks. To support streaming descendents have to implement
+    // ProcessStreamingMultiPart
     class function SupportsStreamingProcessing: Boolean; virtual;
     procedure SetBoundary(AValue: string); virtual;
   Public
@@ -1116,10 +1120,13 @@ begin
       end;
     Line:=GetLine(D);
     end;
-  // Now Data contains the rest of the data, plus a CR/LF. Strip the CR/LF
+  // Now D contains the rest of the data, plus a CR/LF. Strip the CR/LF
   Len:=Length(D);
   If (len>2) then
-    Data:=Copy(D,1,Len-2)
+    begin
+    FDataSize := Len-2;
+    Data:=Copy(D,1,FDataSize)
+    end
   else
     Data:='';
   {$ifdef CGIDEBUG}SendMethodExit('THTTPMimeItem.Process');{$ENDIF}
@@ -1867,7 +1874,7 @@ begin
       begin
       Value:=P.FileName;
       if SupportsStreamingProcessing then
-        P.CreateFile(Files)
+        P.CreateUploadedFileStreaming(Files)
       else
         P.CreateUploadedFile(Files);
       end;
@@ -1951,6 +1958,18 @@ begin
    end;
 end;
 
+function TMimeItem.CreateUploadedFileStreaming(Files: TUploadedFiles): TUploadedFile;
+begin
+  if FLocalFilename='' then
+    // Even though this class supports streaming procesing of data, does not
+    // mean it is being used that way. In those cases the non-streaming file-
+    // creation has to take place: (For example, CGI does not use the
+    // streaming capabilities (may 2021))
+    CreateUploadedFile(Files)
+  else
+    CreateFile(Files);
+end;
+
 
 {
   This needs MASSIVE improvements for large files.
@@ -2024,6 +2043,11 @@ begin
   FBoundary := AValue;
 end;
 
+procedure TMimeItems.ProcessStreamingMultiPart(const State: TContentStreamingState; const Buf; const Size: Integer);
+begin
+  raise Exception.Create('Streaming processing of data not supported');
+end;
+
 { -------------------------------------------------------------------
   TRequest
   -------------------------------------------------------------------}