Skip to content

Commit 1c5fdcb

Browse files
committed
Revert "add multipart/form-data support"
This reverts commit 72cb5e6.
1 parent 72cb5e6 commit 1c5fdcb

File tree

2 files changed

+6
-42
lines changed

2 files changed

+6
-42
lines changed

src/Ocelot/Multiplexer/MultiplexingMiddleware.cs

-1
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,6 @@ private HttpContext Copy(HttpContext source)
178178
target.Request.PathBase = source.Request.PathBase;
179179
target.Request.Protocol = source.Request.Protocol;
180180
target.Request.Query = source.Request.Query;
181-
target.Request.Form = source.Request.Form;
182181
target.Request.QueryString = source.Request.QueryString;
183182
target.Request.Scheme = source.Request.Scheme;
184183
target.Request.IsHttps = source.Request.IsHttps;

src/Ocelot/Request/Mapper/RequestMapper.cs

+6-41
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,7 @@ public async Task<Response<HttpRequestMessage>> Map(HttpRequest request, Downstr
3737
return new ErrorResponse<HttpRequestMessage>(new UnmappableRequestError(ex));
3838
}
3939
}
40-
private bool IsMultipartContentType(string contentType)
41-
{
42-
return !string.IsNullOrEmpty(contentType)
43-
&& contentType.IndexOf("multipart/form-data", StringComparison.OrdinalIgnoreCase) >= 0;
44-
}
40+
4541
private async Task<HttpContent> MapContent(HttpRequest request)
4642
{
4743
if (request.Body == null || (request.Body.CanSeek && request.Body.Length <= 0))
@@ -50,43 +46,12 @@ private async Task<HttpContent> MapContent(HttpRequest request)
5046
}
5147

5248
// Never change this to StreamContent again, I forgot it doesnt work in #464.
53-
HttpContent content = null;
54-
// Never change this to StreamContent again, I forgot it doesnt work in #464.
55-
56-
57-
if (this.IsMultipartContentType(request.ContentType))
58-
{
59-
content = new MultipartFormDataContent();
60-
if (request.Form != null && request.Form.Files != null)
61-
{
62-
foreach (var f in request.Form.Files)
63-
{
64-
using (var memStream = new MemoryStream())
65-
{
66-
await f.CopyToAsync(memStream);
67-
var fileContent = new ByteArrayContent(memStream.ToArray());
68-
((MultipartFormDataContent)content).Add(fileContent, f.Name, f.FileName);
69-
}
70-
71-
}
72-
}
73-
if (request.Form != null)
74-
{
75-
foreach (var key in request.Form.Keys)
76-
{
77-
var strContent = new StringContent(request.Form[key]);
78-
((MultipartFormDataContent)content).Add(strContent, key);
79-
}
80-
}
81-
}
82-
else
49+
var content = new ByteArrayContent(await ToByteArray(request.Body));
50+
51+
if (!string.IsNullOrEmpty(request.ContentType))
8352
{
84-
content = new ByteArrayContent(await ToByteArray(request.Body));
85-
if (!string.IsNullOrEmpty(request.ContentType))
86-
{
87-
content.Headers
88-
.TryAddWithoutValidation("Content-Type", new[] { request.ContentType });
89-
}
53+
content.Headers
54+
.TryAddWithoutValidation("Content-Type", new[] { request.ContentType });
9055
}
9156

9257
AddHeaderIfExistsOnRequest("Content-Language", content, request);

0 commit comments

Comments
 (0)