huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

React to string[] -> StringValues changes.

This commit is contained in:
Chris R 2015-08-31 09:21:35 -07:00
parent 2af06269df
commit 4aab903b18
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Microsoft.AspNet.HttpOverrides/HttpMethodOverrideMiddleware.cs
View File

@ -38,7 +38,7 @@ namespace Microsoft.AspNet.HttpOverrides
} }
else else
{ {
var xHttpMethodOverrideValue = context.Request.Headers.Get(xHttpMethodOverride); var xHttpMethodOverrideValue = context.Request.Headers[xHttpMethodOverride];
if (!string.IsNullOrEmpty(xHttpMethodOverrideValue)) if (!string.IsNullOrEmpty(xHttpMethodOverrideValue))
{ {
context.Request.Method = xHttpMethodOverrideValue; context.Request.Method = xHttpMethodOverrideValue;

12
src/Microsoft.AspNet.HttpOverrides/OverrideHeaderMiddleware.cs
View File

@ -32,7 +32,7 @@ namespace Microsoft.AspNet.HttpOverrides
if ((_options.ForwardedOptions & ForwardedHeaders.XForwardedFor) != 0) if ((_options.ForwardedOptions & ForwardedHeaders.XForwardedFor) != 0)
{ {
var xForwardedForHeaderValue = context.Request.Headers.GetCommaSeparatedValues(XForwardedForHeaderName); var xForwardedForHeaderValue = context.Request.Headers.GetCommaSeparatedValues(XForwardedForHeaderName);
if (xForwardedForHeaderValue != null && xForwardedForHeaderValue.Count > 0) if (xForwardedForHeaderValue != null && xForwardedForHeaderValue.Length > 0)
{ {
IPAddress ipFromHeader; IPAddress ipFromHeader;
if (IPAddress.TryParse(xForwardedForHeaderValue[0], out ipFromHeader)) if (IPAddress.TryParse(xForwardedForHeaderValue[0], out ipFromHeader))
@ -40,7 +40,7 @@ namespace Microsoft.AspNet.HttpOverrides
var remoteIPString = context.Connection.RemoteIpAddress?.ToString(); var remoteIPString = context.Connection.RemoteIpAddress?.ToString();
if (!string.IsNullOrEmpty(remoteIPString)) if (!string.IsNullOrEmpty(remoteIPString))
{ {
context.Request.Headers.Set(XOriginalIPName, remoteIPString); context.Request.Headers[XOriginalIPName] = remoteIPString;
} }
context.Connection.RemoteIpAddress = ipFromHeader; context.Connection.RemoteIpAddress = ipFromHeader;
} }
@ -49,13 +49,13 @@ namespace Microsoft.AspNet.HttpOverrides
if ((_options.ForwardedOptions & ForwardedHeaders.XForwardedHost) != 0) if ((_options.ForwardedOptions & ForwardedHeaders.XForwardedHost) != 0)
{ {
var xForwardHostHeaderValue = context.Request.Headers.Get(XForwardedHostHeaderName); var xForwardHostHeaderValue = context.Request.Headers[XForwardedHostHeaderName];
if (!string.IsNullOrEmpty(xForwardHostHeaderValue)) if (!string.IsNullOrEmpty(xForwardHostHeaderValue))
{ {
var hostString = context.Request.Host.ToString(); var hostString = context.Request.Host.ToString();
if (!string.IsNullOrEmpty(hostString)) if (!string.IsNullOrEmpty(hostString))
{ {
context.Request.Headers.Set(XOriginalHostName, hostString); context.Request.Headers[XOriginalHostName] = hostString;
} }
context.Request.Host = HostString.FromUriComponent(xForwardHostHeaderValue); context.Request.Host = HostString.FromUriComponent(xForwardHostHeaderValue);
} }
@ -63,12 +63,12 @@ namespace Microsoft.AspNet.HttpOverrides
if ((_options.ForwardedOptions & ForwardedHeaders.XForwardedProto) != 0) if ((_options.ForwardedOptions & ForwardedHeaders.XForwardedProto) != 0)
{ {
var xForwardProtoHeaderValue = context.Request.Headers.Get(XForwardedProtoHeaderName); var xForwardProtoHeaderValue = context.Request.Headers[XForwardedProtoHeaderName];
if (!string.IsNullOrEmpty(xForwardProtoHeaderValue)) if (!string.IsNullOrEmpty(xForwardProtoHeaderValue))
{ {
if (!string.IsNullOrEmpty(context.Request.Scheme)) if (!string.IsNullOrEmpty(context.Request.Scheme))
{ {
context.Request.Headers.Set(XOriginalProtoName, context.Request.Scheme); context.Request.Headers[XOriginalProtoName] = context.Request.Scheme;
} }
context.Request.Scheme = xForwardProtoHeaderValue; context.Request.Scheme = xForwardProtoHeaderValue;
} }

2
src/Microsoft.AspNet.HttpOverrides/project.json
View File

@ -7,7 +7,7 @@
}, },
"dependencies": { "dependencies": {
"Microsoft.CSharp": "4.0.0-*", "Microsoft.CSharp": "4.0.0-*",
"Microsoft.AspNet.Http.Abstractions": "1.0.0-*", "Microsoft.AspNet.Http.Extensions": "1.0.0-*",
"Microsoft.Framework.NotNullAttribute.Sources": { "version": "1.0.0-*", "type": "build" } "Microsoft.Framework.NotNullAttribute.Sources": { "version": "1.0.0-*", "type": "build" }
}, },
"frameworks": { "frameworks": {