Use null instead of -1 to make buffer size unlimited

Author: mikeharder

src/Microsoft.AspNetCore.Server.Kestrel/Internal/Http/Connection.cs

@@ -49,13 +49,13 @@ public Connection(ListenerContext context, UvStreamHandle socket) : base(context
 
             ConnectionId = GenerateConnectionId(Interlocked.Increment(ref _lastConnectionId));
 
-            if (ServerOptions.MaxInputBufferLength == -1)
+            if (ServerOptions.MaxInputBufferLength.HasValue)
             {
-                _rawSocketInput = new SocketInput(Memory, ThreadPool);
+                _rawSocketInput = new SocketInput(Memory, ThreadPool, ServerOptions.MaxInputBufferLength.Value, this, Thread);
             }
             else
             {
-                _rawSocketInput = new SocketInput(Memory, ThreadPool, ServerOptions.MaxInputBufferLength, this, Thread);
+                _rawSocketInput = new SocketInput(Memory, ThreadPool);
             }
 
             _rawSocketOutput = new SocketOutput(Thread, _socket, Memory, this, ConnectionId, Log, ThreadPool, WriteReqPool);

src/Microsoft.AspNetCore.Server.Kestrel/KestrelServerOptions.cs

@@ -17,18 +17,18 @@ public class KestrelServerOptions
 
         public IConnectionFilter ConnectionFilter { get; set; }
 
-        private int _maxInputBufferLength = 1024 * 1024;
-        public int MaxInputBufferLength
+        private int? _maxInputBufferLength = 1024 * 1024;
+        public int? MaxInputBufferLength
         {
             get
             {
                 return _maxInputBufferLength;
             }
             set
             {
-                if (value < -1 || value == 0)
+                if (value.HasValue && value.Value <= 0)
                 {
-                    throw new ArgumentOutOfRangeException("value", "Value must be positive or -1.");
+                    throw new ArgumentOutOfRangeException("value", "Value must be null or a positive integer.");
                 }
                 _maxInputBufferLength = value;
             }

test/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests/MaxInputBufferLengthTests.cs

@@ -24,9 +24,9 @@ public class MaxInputBufferLengthTests
         [InlineData(10 * 1024 * 1024, false, false)]
         [InlineData(Int32.MaxValue, true, false)]
         [InlineData(Int32.MaxValue, false, false)]
-        [InlineData(-1, true, false)]
-        [InlineData(-1, false, false)]
-        public async Task LargeUpload(int maxInputBufferLength, bool sendContentLengthHeader, bool expectPause)
+        [InlineData(null, true, false)]
+        [InlineData(null, false, false)]
+        public async Task LargeUpload(int? maxInputBufferLength, bool sendContentLengthHeader, bool expectPause)
         {
             // Parameters
             var data = new byte[10 * 1024 * 1024];
@@ -76,7 +76,7 @@ public async Task LargeUpload(int maxInputBufferLength, bool sendContentLengthHe
                         // and server, which allow the client to send more than maxInputBufferLength before getting
                         // paused.  We assume the combined buffers are smaller than the difference between
                         // data.Length and maxInputBufferLength.                          
-                        Assert.InRange(bytesWritten, maxInputBufferLength - maxSendSize + 1, data.Length - 1);
+                        Assert.InRange(bytesWritten, maxInputBufferLength.Value - maxSendSize + 1, data.Length - 1);
 
                         // Tell server to start reading request body
                         startReadingRequestBody.Set();
@@ -100,7 +100,7 @@ public async Task LargeUpload(int maxInputBufferLength, bool sendContentLengthHe
             }
         }
 
-        private static IWebHost StartWebHost(int maxInputBufferLength, byte[] expectedBody, ManualResetEvent startReadingRequestBody,
+        private static IWebHost StartWebHost(int? maxInputBufferLength, byte[] expectedBody, ManualResetEvent startReadingRequestBody,
             ManualResetEvent clientFinishedSendingRequestBody)
         {
             var host = new WebHostBuilder()

test/Microsoft.AspNetCore.Server.KestrelTests/KestrelServerOptionsTests.cs

@@ -18,7 +18,7 @@ public void MaxInputBufferLengthDefault()
         }
 
         [Theory]
-        [InlineData(-2)]
+        [InlineData(-1)]
         [InlineData(0)]
         public void MaxInputBufferInvalid(int value)
         {
@@ -29,9 +29,9 @@ public void MaxInputBufferInvalid(int value)
         }
 
         [Theory]
-        [InlineData(-1)]
+        [InlineData(null)]
         [InlineData(1)]
-        public void MaxInputBufferValid(int value)
+        public void MaxInputBufferValid(int? value)
         {
             var o = new KestrelServerOptions();
             o.MaxInputBufferLength = value;