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

React to breaking changes in StringValues

This commit is contained in:
Ryan Nowak 2015-10-23 15:05:09 -07:00
parent 151b0f3a16
commit f88631efb3
4 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Microsoft.AspNet.Server.Kestrel/Http/FrameHeaders.cs
View File

@ -123,7 +123,7 @@ namespace Microsoft.AspNet.Server.Kestrel.Http
StringValues value; StringValues value;
return return
TryGetValueFast(item.Key, out value) && TryGetValueFast(item.Key, out value) &&
object.Equals(value, item.Value); value.Equals(item.Value);
} }
bool IDictionary<string, StringValues>.ContainsKey(string key) bool IDictionary<string, StringValues>.ContainsKey(string key)
@ -152,7 +152,7 @@ namespace Microsoft.AspNet.Server.Kestrel.Http
StringValues value; StringValues value;
return return
TryGetValueFast(item.Key, out value) && TryGetValueFast(item.Key, out value) &&
object.Equals(value, item.Value) && value.Equals(item.Value) &&
RemoveFast(item.Key); RemoveFast(item.Key);
} }

2
src/Microsoft.AspNet.Server.Kestrel/Http/MessageBody.cs
View File

@ -78,7 +78,7 @@ namespace Microsoft.AspNet.Server.Kestrel.Http
public static bool TryGet(IDictionary<string, StringValues> headers, string name, out string value) public static bool TryGet(IDictionary<string, StringValues> headers, string name, out string value)
{ {
StringValues values; StringValues values;
if (!headers.TryGetValue(name, out values) || values == null) if (!headers.TryGetValue(name, out values) || values.Count == 0)
{ {
value = null; value = null;
return false; return false;

4
test/Microsoft.AspNet.Server.KestrelTests/FrameRequestHeadersTests.cs
View File

@ -121,8 +121,8 @@ namespace Microsoft.AspNet.Server.KestrelTests
IDictionary<string, StringValues> headers = new FrameRequestHeaders(); IDictionary<string, StringValues> headers = new FrameRequestHeaders();
var kv1 = new KeyValuePair<string, StringValues>("host", new[] { "localhost" }); var kv1 = new KeyValuePair<string, StringValues>("host", new[] { "localhost" });
var kv2 = new KeyValuePair<string, StringValues>("custom", new[] { "value" }); var kv2 = new KeyValuePair<string, StringValues>("custom", new[] { "value" });
var kv1b = new KeyValuePair<string, StringValues>("host", new[] { "localhost" }); var kv1b = new KeyValuePair<string, StringValues>("host", new[] { "not-localhost" });
var kv2b = new KeyValuePair<string, StringValues>("custom", new[] { "value" }); var kv2b = new KeyValuePair<string, StringValues>("custom", new[] { "not-value" });
Assert.False(headers.ContainsKey("host")); Assert.False(headers.ContainsKey("host"));
Assert.False(headers.ContainsKey("custom")); Assert.False(headers.ContainsKey("custom"));

7
test/Microsoft.AspNet.Server.KestrelTests/Program.cs
View File

@ -14,23 +14,20 @@ namespace Microsoft.AspNet.Server.KestrelTests
private readonly IApplicationEnvironment env; private readonly IApplicationEnvironment env;
private readonly IServiceProvider sp; private readonly IServiceProvider sp;
private readonly ILibraryManager _libraryManager; private readonly ILibraryManager _libraryManager;
private readonly IApplicationShutdown _shutdown;
public Program( public Program(
IApplicationEnvironment env, IApplicationEnvironment env,
IServiceProvider sp, IServiceProvider sp,
ILibraryManager libraryManager, ILibraryManager libraryManager)
IApplicationShutdown shutown)
{ {
this.env = env; this.env = env;
this.sp = sp; this.sp = sp;
_libraryManager = libraryManager; _libraryManager = libraryManager;
_shutdown = shutown;
} }
public int Main() public int Main()
{ {
return new Xunit.Runner.Dnx.Program(env, sp, _libraryManager, _shutdown).Main(new string[] return new Xunit.Runner.Dnx.Program(env, sp, _libraryManager).Main(new string[]
{ {
"-class", "-class",
typeof(MultipleLoopTests).FullName typeof(MultipleLoopTests).FullName