diff --git a/src/Http/Http/ref/Microsoft.AspNetCore.Http.netcoreapp3.0.cs b/src/Http/Http/ref/Microsoft.AspNetCore.Http.netcoreapp3.0.cs index 623cfbb461..c2ac47f401 100644 --- a/src/Http/Http/ref/Microsoft.AspNetCore.Http.netcoreapp3.0.cs +++ b/src/Http/Http/ref/Microsoft.AspNetCore.Http.netcoreapp3.0.cs @@ -523,7 +523,7 @@ namespace System.IO.Pipelines public partial class StreamPipeReader : System.IO.Pipelines.PipeReader, System.IDisposable { public StreamPipeReader(System.IO.Stream readingStream) { } - public StreamPipeReader(System.IO.Stream readingStream, System.IO.Pipelines.StreamPipeReaderOptions options) { } + public StreamPipeReader(System.IO.Stream readingStream, System.IO.Pipelines.StreamPipeReaderAdapterOptions options) { } public System.IO.Stream InnerStream { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } public override void AdvanceTo(System.SequencePosition consumed) { } public override void AdvanceTo(System.SequencePosition consumed, System.SequencePosition examined) { } @@ -535,13 +535,13 @@ namespace System.IO.Pipelines public override System.Threading.Tasks.ValueTask ReadAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } public override bool TryRead(out System.IO.Pipelines.ReadResult result) { throw null; } } - public partial class StreamPipeReaderOptions + public partial class StreamPipeReaderAdapterOptions { public const int DefaultMinimumReadThreshold = 256; public const int DefaultMinimumSegmentSize = 4096; - public static System.IO.Pipelines.StreamPipeReaderOptions DefaultOptions; - public StreamPipeReaderOptions() { } - public StreamPipeReaderOptions(int minimumSegmentSize, int minimumReadThreshold, System.Buffers.MemoryPool memoryPool) { } + public static System.IO.Pipelines.StreamPipeReaderAdapterOptions DefaultOptions; + public StreamPipeReaderAdapterOptions() { } + public StreamPipeReaderAdapterOptions(int minimumSegmentSize, int minimumReadThreshold, System.Buffers.MemoryPool memoryPool) { } public System.Buffers.MemoryPool MemoryPool { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } public int MinimumReadThreshold { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } public int MinimumSegmentSize { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } diff --git a/src/Http/Http/src/StreamPipeReader.cs b/src/Http/Http/src/StreamPipeReader.cs index cbc360ddea..16e3e0ac32 100644 --- a/src/Http/Http/src/StreamPipeReader.cs +++ b/src/Http/Http/src/StreamPipeReader.cs @@ -37,7 +37,7 @@ namespace System.IO.Pipelines /// /// The stream to read from. public StreamPipeReader(Stream readingStream) - : this(readingStream, StreamPipeReaderOptions.DefaultOptions) + : this(readingStream, StreamPipeReaderAdapterOptions.DefaultOptions) { } @@ -46,7 +46,7 @@ namespace System.IO.Pipelines /// /// The stream to read from. /// The options to use. - public StreamPipeReader(Stream readingStream, StreamPipeReaderOptions options) + public StreamPipeReader(Stream readingStream, StreamPipeReaderAdapterOptions options) { InnerStream = readingStream ?? throw new ArgumentNullException(nameof(readingStream)); diff --git a/src/Http/Http/src/StreamPipeReaderOptions.cs b/src/Http/Http/src/StreamPipeReaderOptions.cs index 3a951db7cc..2a932e0c39 100644 --- a/src/Http/Http/src/StreamPipeReaderOptions.cs +++ b/src/Http/Http/src/StreamPipeReaderOptions.cs @@ -8,17 +8,17 @@ using System.Text; namespace System.IO.Pipelines { - public class StreamPipeReaderOptions + public class StreamPipeReaderAdapterOptions { - public static StreamPipeReaderOptions DefaultOptions = new StreamPipeReaderOptions(); + public static StreamPipeReaderAdapterOptions DefaultOptions = new StreamPipeReaderAdapterOptions(); public const int DefaultMinimumSegmentSize = 4096; public const int DefaultMinimumReadThreshold = 256; - public StreamPipeReaderOptions() + public StreamPipeReaderAdapterOptions() { } - public StreamPipeReaderOptions(int minimumSegmentSize, int minimumReadThreshold, MemoryPool memoryPool) + public StreamPipeReaderAdapterOptions(int minimumSegmentSize, int minimumReadThreshold, MemoryPool memoryPool) { MinimumSegmentSize = minimumSegmentSize; MinimumReadThreshold = minimumReadThreshold; diff --git a/src/Http/Http/test/StreamPipeReaderTests.cs b/src/Http/Http/test/StreamPipeReaderTests.cs index 97859f5940..bf76875001 100644 --- a/src/Http/Http/test/StreamPipeReaderTests.cs +++ b/src/Http/Http/test/StreamPipeReaderTests.cs @@ -532,7 +532,7 @@ namespace System.IO.Pipelines.Tests public void SetMinimumReadThresholdOfZeroThrows() { Assert.Throws(() => new StreamPipeReader(Stream, - new StreamPipeReaderOptions(minimumSegmentSize: 4096, minimumReadThreshold: 0, new TestMemoryPool()))); + new StreamPipeReaderAdapterOptions(minimumSegmentSize: 4096, minimumReadThreshold: 0, new TestMemoryPool()))); } [Fact] @@ -686,7 +686,7 @@ namespace System.IO.Pipelines.Tests private void CreateReader(int minimumSegmentSize = 16, int minimumReadThreshold = 4, MemoryPool memoryPool = null) { Reader = new StreamPipeReader(Stream, - new StreamPipeReaderOptions( + new StreamPipeReaderAdapterOptions( minimumSegmentSize, minimumReadThreshold, memoryPool ?? new TestMemoryPool())); diff --git a/src/Http/Http/test/StreamPipeTest.cs b/src/Http/Http/test/StreamPipeTest.cs index f75c5053f1..9c9f1f4b06 100644 --- a/src/Http/Http/test/StreamPipeTest.cs +++ b/src/Http/Http/test/StreamPipeTest.cs @@ -24,7 +24,7 @@ namespace System.IO.Pipelines.Tests Pool = new TestMemoryPool(); Stream = new MemoryStream(); Writer = new StreamPipeWriter(Stream, MinimumSegmentSize, Pool); - Reader = new StreamPipeReader(Stream, new StreamPipeReaderOptions(MinimumSegmentSize, minimumReadThreshold: 256, Pool)); + Reader = new StreamPipeReader(Stream, new StreamPipeReaderAdapterOptions(MinimumSegmentSize, minimumReadThreshold: 256, Pool)); } public void Dispose() diff --git a/src/Servers/Kestrel/Core/src/Internal/Http/HttpProtocol.FeatureCollection.cs b/src/Servers/Kestrel/Core/src/Internal/Http/HttpProtocol.FeatureCollection.cs index ea4d2cad09..4d80e6e14c 100644 --- a/src/Servers/Kestrel/Core/src/Internal/Http/HttpProtocol.FeatureCollection.cs +++ b/src/Servers/Kestrel/Core/src/Internal/Http/HttpProtocol.FeatureCollection.cs @@ -101,7 +101,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http set { RequestBody = value; - var requestPipeReader = new StreamPipeReader(RequestBody, new StreamPipeReaderOptions( + var requestPipeReader = new StreamPipeReader(RequestBody, new StreamPipeReaderAdapterOptions( minimumSegmentSize: KestrelMemoryPool.MinimumSegmentSize, minimumReadThreshold: KestrelMemoryPool.MinimumSegmentSize / 4, _context.MemoryPool));