Fixed multipart form data boundries - uploading files works again.

Author: vincentparrett

Source/VSoft.HttpClient.MultipartFormData.pas

@@ -797,8 +797,8 @@ procedure TMultipartFormData.AddStream(const fieldName: string; stream: TStream;
   if sContentType = '' then
     sContentType := GetMimeType(fileName);
   WriteString(cContentTypeHeader + ': ' + sContentType + #13#10);
-  FDataStream.CopyFrom(stream, 0);
-  WriteString('');
+  stream.Seek(0, soFromBeginning);
+  FDataStream.CopyFrom(stream, stream.Size);
 end;
 
 class procedure TMultipartFormData.AddWindowsMimeTypes;
@@ -889,17 +889,16 @@ destructor TMultipartFormData.Destroy;
 function TMultipartFormData.Generate: TStream;
 begin
   //add the final boundary
-  WriteString('--' + FBoundary + '--');
+  WriteString(#13#10 + '--' + FBoundary + '--');
   FDataStream.Seek(0,soFromBeginning); //this is required as the http request doesn't rewind the stream
 
   result := FDataStream;
-//  FDataStream := nil;
-  GenerateUniqueBoundry;
+  FDataStream := nil;    //this is important as the caller takes ownership.
 end;
 
 procedure TMultipartFormData.GenerateUniqueBoundry;
 begin
-  FBoundary := '----------------------' + FormatDateTime('mmddyyhhnnsszzz', Now);
+  FBoundary := '-----------' + FormatDateTime('mmddyyhhnnsszzz', Now) + '-----------';
 end;
 
 function TMultipartFormData.GetBoundary: string;

Source/VSoft.HttpClient.WinHttpClient.pas

@@ -411,9 +411,9 @@ function THttpClient.OnHeadersAvailable(hRequest : HINTERNET;  dwInternetStatus:
   if statusCode = HTTP_STATUS_PROXY_AUTH_REQ then
     HandleProxyAuthResponse(hRequest)
   else if statusCode = HTTP_STATUS_DENIED then
-    HandleAccessDeniedResponse(hRequest)
-  else if ((statusCode div 100) <> 2) then //any 2xx is good
-    exit(ERROR_WINHTTP_INVALID_HEADER);
+    HandleAccessDeniedResponse(hRequest);
+//  else if ((statusCode div 100) <> 2) then //any 2xx is good
+//    exit(ERROR_WINHTTP_INVALID_HEADER);
 
   FLastStatusCode := statusCode;
 
@@ -676,6 +676,8 @@ function THttpClient.Send(const request: TRequest; const cancellationToken: ICan
       if Assigned(pCallBack) then
         raise Exception.Create('Callback was already set!');
 
+      FDataLength := request.ContentLength;    //need to do this before configurerequest as if there are files it will set the content type.
+
       hr := ConfigureWinHttpRequest(hRequest, request);
       if hr <> S_OK then
         raise Exception.Create('Could not configure request : ' + SysErrorMessage(GetLastError) );
@@ -688,7 +690,6 @@ function THttpClient.Send(const request: TRequest; const cancellationToken: ICan
          Inc(handleCount);
       end;
 
-      FDataLength := request.ContentLength;
 
       if (request.HtttpMethod <> THttpMethod.GET) and (FDataLength > 0) then
       begin
@@ -842,7 +843,7 @@ function THttpClient.WriteHeaders(hRequest: HINTERNET; const headers: TStrings):
     else
       sHeaders := sHeaders + headers.Names[i] + ': ' +headers.ValueFromIndex[i];
 
-    if i < headers.count -1 then
+//    if i < headers.count -1 then
       sHeaders := sHeaders + #13#10;
   end;
 

Source/VSoft.HttpClient.pas

@@ -409,6 +409,8 @@ destructor TRequest.Destroy;
   FHeaders.Free;
   FRequestParams.Free;
   FUrlSegments.Free;
+  if FContent <> nil then
+    FContent.Free;
   inherited;
 end;
 
@@ -489,11 +491,11 @@ function TRequest.GetBody: TStream;
       if j > 0 then
         formdata.AddFile(Copy(sFileName, 1, j-1),  Copy(sFileName, j+1, Length(sFileName)),FFiles.ValueFromIndex[i])
       else
-        formdata.AddFile('files',  Copy(sFileName, j+1, Length(sFileName)),FFiles.ValueFromIndex[i]);
+        formdata.AddFile('file' + IntToStr(i),  Copy(sFileName, j+1, Length(sFileName)),FFiles.ValueFromIndex[i]);
     end;
-    //generate creates a new boundary so we need to upate the contentype before generating
+    FContent := formdata.Generate; //taking ownership here!
     SetContentType(formdata.ContentType);
-    result := formdata.Generate;
+    result := FContent;
   end
   else if FRequestParams.Count > 0 then
   begin
@@ -787,7 +789,7 @@ function TRequest.WithFile(const filePath, fieldName,  contentType: string): TRe
    if fieldName <> '' then
     FFiles.Add(fieldName + ',' + filePath + '=' + contentType)
   else
-    FFiles.Add('files,' + filePath + '=' + contentType);
+    FFiles.Add(ExtractFileName(filePath) + ',' + filePath + '=' + contentType);
 end;
 
 function TRequest.WithHeader(const name, value: string): TRequest;