tk/Ocelot
1
0
Fork 0
mirror of https://github.com/nsnail/Ocelot.git synced 2025-06-19 17:08:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

Got the forwarding http content properly tests working, way to much going on in the requester

Browse Source
This commit is contained in:
TomPallister
2016-09-19 16:26:44 +01:00
parent f3128cffe0
commit 741fcc644d
5 changed files with 49 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/Ocelot.Library/Infrastructure/Requester/HttpClientHttpRequester.cs
View File

@ -1,5 +1,6 @@
using System.IO;
using System.Net.Http;
using System.Net.Http.Headers;
using System.Threading.Tasks;
using Flurl;
using Flurl.Http;
@ -15,17 +16,30 @@ namespace Ocelot.Library.Infrastructure.Requester
Stream content,
IHeaderDictionary headers,
IRequestCookieCollection cookies,
IQueryCollection queryString)
IQueryCollection queryString,
string contentType)
{
var method = new HttpMethod(httpMethod);
var streamContent = new StreamContent(content);
if (!string.IsNullOrEmpty(contentType))
{
var splitCt = contentType.Split(';');
var cT = splitCt[0];
streamContent.Headers.ContentType = new MediaTypeHeaderValue(cT);
}
if (headers != null)
{
headers.Remove("Content-Type");
}
if (content.Length > 0)
{
return await downstreamUrl
.SetQueryParams(queryString)
.WithCookies(cookies)
.WithHeaders(streamContent.Headers)
.WithHeaders(headers)
.SendAsync(method, streamContent);
}

3
src/Ocelot.Library/Infrastructure/Requester/IHttpRequester.cs
View File

@ -14,6 +14,7 @@ namespace Ocelot.Library.Infrastructure.Requester
Stream content,
IHeaderDictionary headers,
IRequestCookieCollection cookies,
IQueryCollection queryString);
IQueryCollection queryString,
string contentType);
}
}

2
src/Ocelot.Library/Middleware/ProxyMiddleware.cs
View File

@ -49,7 +49,7 @@ namespace Ocelot.Library.Middleware
var response = await _requester
.GetResponse(context.Request.Method, downstreamUrl, context.Request.Body,
context.Request.Headers, context.Request.Cookies, context.Request.Query);
context.Request.Headers, context.Request.Cookies, context.Request.Query, context.Request.ContentType);
await _responder.CreateResponse(context, response);