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

Merge branch 'benaadams/mono-keepalive' into dev

This commit is contained in:
Cesar Blum Silveira 2015-12-29 15:22:48 -08:00
parent acc80bcbc5 4e9f8366cf
commit 39a4e098d1
2 changed files with 87 additions and 129 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

129
test/Microsoft.AspNet.Server.Kestrel.FunctionalTests/ReuseStreamsTests.cs
View File

@ -1,129 +0,0 @@
// Copyright (c) .NET Foundation. All rights reserved.
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
using System;
using System.Collections.Generic;
using System.IO;
using System.Net.Http;
using System.Threading.Tasks;
using Microsoft.AspNet.Builder;
using Microsoft.AspNet.Hosting;
using Microsoft.AspNet.Http.Features;
using Microsoft.Extensions.Configuration;
using Xunit;
namespace Microsoft.AspNet.Server.Kestrel.FunctionalTests
{
public class ReuseStreamsTests
{
[Fact]
public async Task ReuseStreamsOn()
{
var streamCount = 0;
var loopCount = 20;
Stream lastStream = null;
var config = new ConfigurationBuilder()
.AddInMemoryCollection(new Dictionary<string, string>
{
{ "server.urls", "http://localhost:8801/" },
{ "kestrel.reuseStreams", "true" }
})
.Build();
var builder = new WebApplicationBuilder()
.UseConfiguration(config)
.UseServerFactory("Microsoft.AspNet.Server.Kestrel")
.Configure(app =>
{
var serverInfo = app.ServerFeatures.Get<IKestrelServerInformation>();
app.Run(context =>
{
if (context.Request.Body != lastStream)
{
lastStream = context.Request.Body;
streamCount++;
}
return context.Request.Body.CopyToAsync(context.Response.Body);
});
});
using (var app = builder.Build().Start())
{
using (var client = new HttpClient())
{
for (int i = 0; i < loopCount; i++)
{
var content = $"{i} Hello World {i}";
var request = new HttpRequestMessage()
{
RequestUri = new Uri("http://localhost:8801/"),
Method = HttpMethod.Post,
Content = new StringContent(content)
};
request.Headers.Add("Connection", new string[] { "Keep-Alive" });
var responseMessage = await client.SendAsync(request);
var result = await responseMessage.Content.ReadAsStringAsync();
Assert.Equal(content, result);
}
}
}
Assert.True(streamCount < loopCount);
}
[Fact]
public async Task ReuseStreamsOff()
{
var streamCount = 0;
var loopCount = 20;
Stream lastStream = null;
var config = new ConfigurationBuilder()
.AddInMemoryCollection(new Dictionary<string, string>
{
{ "server.urls", "http://localhost:8802/" },
{ "kestrel.reuseStreams", "false" }
})
.Build();
var hostBuilder = new WebApplicationBuilder()
.UseConfiguration(config)
.UseServerFactory("Microsoft.AspNet.Server.Kestrel")
.Configure(app =>
{
var serverInfo = app.ServerFeatures.Get<IKestrelServerInformation>();
app.Run(context =>
{
if (context.Request.Body != lastStream)
{
lastStream = context.Request.Body;
streamCount++;
}
return context.Request.Body.CopyToAsync(context.Response.Body);
});
});
using (var app = hostBuilder.Build().Start())
{
using (var client = new HttpClient())
{
for (int i = 0; i < loopCount; i++)
{
var content = $"{i} Hello World {i}";
var request = new HttpRequestMessage()
{
RequestUri = new Uri("http://localhost:8802/"),
Method = HttpMethod.Post,
Content = new StringContent(content)
};
request.Headers.Add("Connection", new string[] { "Keep-Alive" });
var responseMessage = await client.SendAsync(request);
var result = await responseMessage.Content.ReadAsStringAsync();
Assert.Equal(content, result);
}
}
}
Assert.Equal(loopCount, streamCount);
}
}
}

87
test/Microsoft.AspNet.Server.KestrelTests/EngineTests.cs
View File

@ -2,6 +2,7 @@
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
using System;
using System.Linq;
using System.IO;
using System.Net;
using System.Net.Sockets;
@ -182,6 +183,92 @@ namespace Microsoft.AspNet.Server.KestrelTests
}
}
[ConditionalTheory]
[MemberData(nameof(ConnectionFilterData))]
public async Task ReuseStreamsOn(ServiceContext testContext)
{
testContext.ReuseStreams = true;
var streamCount = 0;
var loopCount = 20;
Stream lastStream = null;
using (var server = new TestServer(
context =>
{
if (context.Request.Body != lastStream)
{
lastStream = context.Request.Body;
streamCount++;
}
context.Response.Headers.Clear();
return context.Request.Body.CopyToAsync(context.Response.Body);
},
testContext))
{
using (var connection = new TestConnection())
{
var requestData =
Enumerable.Repeat("GET / HTTP/1.1\r\n", loopCount)
.Concat(new[] { "GET / HTTP/1.1\r\nConnection: close\r\n\r\nGoodbye" });
var responseData =
Enumerable.Repeat("HTTP/1.1 200 OK\r\nContent-Length: 0\r\n", loopCount)
.Concat(new[] { "HTTP/1.1 200 OK\r\nConnection: close\r\n\r\nGoodbye" });
await connection.SendEnd(requestData.ToArray());
await connection.ReceiveEnd(responseData.ToArray());
}
Assert.Equal(1, streamCount);
}
}
[ConditionalTheory]
[MemberData(nameof(ConnectionFilterData))]
public async Task ReuseStreamsOff(ServiceContext testContext)
{
testContext.ReuseStreams = false;
var streamCount = 0;
var loopCount = 20;
Stream lastStream = null;
using (var server = new TestServer(
context =>
{
if (context.Request.Body != lastStream)
{
lastStream = context.Request.Body;
streamCount++;
}
context.Response.Headers.Clear();
return context.Request.Body.CopyToAsync(context.Response.Body);
},
testContext))
{
using (var connection = new TestConnection())
{
var requestData =
Enumerable.Repeat("GET / HTTP/1.1\r\n", loopCount)
.Concat(new[] { "GET / HTTP/1.1\r\nConnection: close\r\n\r\nGoodbye" });
var responseData =
Enumerable.Repeat("HTTP/1.1 200 OK\r\nContent-Length: 0\r\n", loopCount)
.Concat(new[] { "HTTP/1.1 200 OK\r\nConnection: close\r\n\r\nGoodbye" });
await connection.SendEnd(requestData.ToArray());
await connection.ReceiveEnd(responseData.ToArray());
}
Assert.Equal(loopCount + 1, streamCount);
}
}
[ConditionalTheory]
[MemberData(nameof(ConnectionFilterData))]
[FrameworkSkipCondition(RuntimeFrameworks.Mono, SkipReason = "Test hangs after execution on Mono.")]