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

Merge branch 'master' into develop

Browse Source
This commit is contained in:
Tom Gardham-Pallister 2018-05-24 22:40:31 +01:00
commit 900c18908f
2 changed files with 39 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/Ocelot/Requester/HttpClientBuilder.cs
View File

@ -42,15 +42,29 @@ namespace Ocelot.Requester
{ {
return httpClient; return httpClient;
} }
bool useCookies = context.DownstreamReRoute.HttpHandlerOptions.UseCookieContainer;
var httpclientHandler = new HttpClientHandler HttpClientHandler httpclientHandler;
// Dont' create the CookieContainer if UseCookies is not set ot the HttpClient will complain
// under .Net Full Framework
if (useCookies)
{ {
AllowAutoRedirect = context.DownstreamReRoute.HttpHandlerOptions.AllowAutoRedirect, httpclientHandler = new HttpClientHandler
UseCookies = context.DownstreamReRoute.HttpHandlerOptions.UseCookieContainer, {
CookieContainer = new CookieContainer() AllowAutoRedirect = context.DownstreamReRoute.HttpHandlerOptions.AllowAutoRedirect,
}; UseCookies = context.DownstreamReRoute.HttpHandlerOptions.UseCookieContainer,
CookieContainer = new CookieContainer()
};
}
else
{
httpclientHandler = new HttpClientHandler
{
AllowAutoRedirect = context.DownstreamReRoute.HttpHandlerOptions.AllowAutoRedirect,
UseCookies = context.DownstreamReRoute.HttpHandlerOptions.UseCookieContainer,
};
}
if(context.DownstreamReRoute.DangerousAcceptAnyServerCertificateValidator) if (context.DownstreamReRoute.DangerousAcceptAnyServerCertificateValidator)
{ {
httpclientHandler.ServerCertificateCustomValidationCallback = (request, certificate, chain, errors) => true; httpclientHandler.ServerCertificateCustomValidationCallback = (request, certificate, chain, errors) => true;

19
src/Ocelot/Requester/HttpClientHttpRequester.cs
View File

@ -32,7 +32,24 @@ namespace Ocelot.Requester
try try
{ {
var response = await httpClient.SendAsync(context.DownstreamRequest.ToHttpRequestMessage()); var message = context.DownstreamRequest.ToHttpRequestMessage();
/**
* According to https://tools.ietf.org/html/rfc7231
* GET,HEAD,DELETE,CONNECT,TRACE
* Can have body but server can reject the request.
* And MS HttpClient in Full Framework actually rejects it.
* see #366 issue
**/
if (message.Method == HttpMethod.Get ||
message.Method == HttpMethod.Head ||
message.Method == HttpMethod.Delete ||
message.Method == HttpMethod.Trace)
{
message.Content = null;
}
_logger.LogDebug(string.Format("Sending {0}", message));
var response = await httpClient.SendAsync(message);
return new OkResponse<HttpResponseMessage>(response); return new OkResponse<HttpResponseMessage>(response);
} }
catch (TimeoutRejectedException exception) catch (TimeoutRejectedException exception)