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

Merge+rename+rename resolve

This commit is contained in:
Ben Adams 2016-01-26 02:24:44 +00:00
parent 9f2d685cbf
commit 00b8a13b55
5 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/Microsoft.AspNetCore.Server.Kestrel/Http/Frame.FeatureCollection.cs
View File

@ -312,10 +312,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Http
} }
} }
await ProduceStartAndFireOnStarting(); await FlushAsync(CancellationToken.None);
// Force flush
await SocketOutput.WriteAsync(_emptyData);
return DuplexStream; return DuplexStream;
} }

2
src/Microsoft.AspNetCore.Server.Kestrel/Http/FrameRequestStream.cs
View File

@ -5,7 +5,7 @@ using System;
using System.IO; using System.IO;
using System.Threading; using System.Threading;
using System.Threading.Tasks; using System.Threading.Tasks;
using Microsoft.AspNet.Server.Kestrel.Infrastructure; using Microsoft.AspNetCore.Server.Kestrel.Infrastructure;
namespace Microsoft.AspNetCore.Server.Kestrel.Http namespace Microsoft.AspNetCore.Server.Kestrel.Http
{ {

2
src/Microsoft.AspNetCore.Server.Kestrel/Http/FrameResponseStream.cs
View File

@ -5,7 +5,7 @@ using System;
using System.IO; using System.IO;
using System.Threading; using System.Threading;
using System.Threading.Tasks; using System.Threading.Tasks;
using Microsoft.AspNet.Server.Kestrel.Infrastructure; using Microsoft.AspNetCore.Server.Kestrel.Infrastructure;
namespace Microsoft.AspNetCore.Server.Kestrel.Http namespace Microsoft.AspNetCore.Server.Kestrel.Http
{ {

4
test/Microsoft.AspNetCore.Server.KestrelTests/SocketOutputTests.cs
View File

@ -155,7 +155,7 @@ namespace Microsoft.AspNetCore.Server.KestrelTests
var halfWriteBehindBuffer = new ArraySegment<byte>(data, 0, bufferSize); var halfWriteBehindBuffer = new ArraySegment<byte>(data, 0, bufferSize);
// Act // Act
var writeTask1 = socketOutput.WriteAsync(halfWriteBehindBuffer); var writeTask1 = socketOutput.WriteAsync(halfWriteBehindBuffer, CancellationToken.None);
// Assert // Assert
// The first write should pre-complete since it is <= _maxBytesPreCompleted. // The first write should pre-complete since it is <= _maxBytesPreCompleted.
Assert.Equal(TaskStatus.RanToCompletion, writeTask1.Status); Assert.Equal(TaskStatus.RanToCompletion, writeTask1.Status);
@ -168,7 +168,7 @@ namespace Microsoft.AspNetCore.Server.KestrelTests
socketOutput.ProducingComplete(iter); socketOutput.ProducingComplete(iter);
// Act // Act
var writeTask2 = socketOutput.WriteAsync(halfWriteBehindBuffer); var writeTask2 = socketOutput.WriteAsync(halfWriteBehindBuffer, CancellationToken.None);
// Assert // Assert
// Too many bytes are already pre-completed for the fourth write to pre-complete. // Too many bytes are already pre-completed for the fourth write to pre-complete.
Assert.True(writeRequestedWh.Wait(1000)); Assert.True(writeRequestedWh.Wait(1000));

7
test/Microsoft.AspNet.Server.KestrelTests/TestHelpers/MockConnection.cs → test/Microsoft.AspNetCore.Server.KestrelTests/TestHelpers/MockConnection.cs
View File

@ -1,8 +1,9 @@
using System;
using System.Threading; using System.Threading;
using Microsoft.AspNet.Server.Kestrel.Http; using Microsoft.AspNetCore.Server.Kestrel.Networking;
using Microsoft.AspNet.Server.Kestrel.Networking; using Microsoft.AspNetCore.Server.Kestrel.Http;
namespace Microsoft.AspNet.Server.KestrelTests.TestHelpers namespace Microsoft.AspNetCore.Server.KestrelTests.TestHelpers
{ {
public class MockConnection : Connection public class MockConnection : Connection
{ {