PR feedback.

Author: Cesar Blum Silveira

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

@@ -103,7 +103,10 @@ internal static BadHttpRequestException GetException(RequestRejectionReason reas
                     ex = new BadHttpRequestException($"Final transfer coding is not \"chunked\": \"{value}\"", 400);
                     break;
                 case RequestRejectionReason.LengthRequired:
-                    ex = new BadHttpRequestException($"{value} request contains no length indication (no Content-Length or Transfer-Encoding header)", 411);
+                    ex = new BadHttpRequestException($"{value} request contains no Content-Length or Transfer-Encoding header", 411);
+                    break;
+                case RequestRejectionReason.LengthRequiredHttp10:
+                    ex = new BadHttpRequestException($"{value} request contains no Content-Length header", 400);
                     break;
                 default:
                     ex = new BadHttpRequestException("Bad request.", 400);

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

@@ -270,22 +270,23 @@ public static MessageBody For(
             var unparsedContentLength = headers.HeaderContentLength;
             if (unparsedContentLength.Count > 0)
             {
-                long contentLength;
-                if (!long.TryParse(unparsedContentLength.ToString(), out contentLength) || contentLength < 0)
+                try
                 {
-                    context.RejectRequest(RequestRejectionReason.InvalidContentLength, unparsedContentLength);
+                    var contentLength = FrameHeaders.ParseContentLength(unparsedContentLength);
+                    return new ForContentLength(keepAlive, contentLength, context);
                 }
-                else
+                catch (InvalidOperationException)
                 {
-                    return new ForContentLength(keepAlive, contentLength, context);
+                    context.RejectRequest(RequestRejectionReason.InvalidContentLength, unparsedContentLength);
                 }
             }
 
             // If we got here, request contains no Content-Length or Transfer-Encoding header.
             // Reject with 411 Length Required.
             if (HttpMethods.IsPost(context.Method) || HttpMethods.IsPut(context.Method))
             {
-                context.RejectRequest(RequestRejectionReason.LengthRequired, context.Method);
+                var requestRejectionReason = httpVersion == HttpVersion.Http11 ? RequestRejectionReason.LengthRequired : RequestRejectionReason.LengthRequiredHttp10;
+                context.RejectRequest(requestRejectionReason, context.Method);
             }
 
             return new ForContentLength(keepAlive, 0, context);

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

@@ -28,6 +28,7 @@ public enum RequestRejectionReason
         TooManyHeaders,
         RequestTimeout,
         FinalTransferCodingNotChunked,
-        LengthRequired
+        LengthRequired,
+        LengthRequiredHttp10,
     }
 }

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

@@ -189,6 +189,21 @@ public async Task BadRequestIfMethodRequiresLengthButNoContentLengthOrTransferEn
             }
         }
 
+        [Theory]
+        [InlineData("POST")]
+        [InlineData("PUT")]
+        public async Task BadRequestIfMethodRequiresLengthButNoContentLengthInHttp10Request(string method)
+        {
+            using (var server = new TestServer(context => { return Task.FromResult(0); }))
+            {
+                using (var connection = server.CreateConnection())
+                {
+                    await connection.SendEnd($"{method} / HTTP/1.0\r\n\r\n");
+                    await ReceiveBadRequestResponse(connection, "400 Bad Request", server.Context.DateHeaderValue);
+                }
+            }
+        }
+
         private async Task ReceiveBadRequestResponse(TestConnection connection, string expectedResponseStatusCode, string expectedDateHeaderValue)
         {
             await connection.ReceiveForcedEnd(

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

@@ -215,7 +215,23 @@ public void ForThrowsWhenMethodRequiresLengthButNoContentLengthOrTransferEncodin
                     MessageBody.For(HttpVersion.Http11, new FrameRequestHeaders(), input.FrameContext));
 
                 Assert.Equal(411, ex.StatusCode);
-                Assert.Equal($"{method} request contains no length indication (no Content-Length or Transfer-Encoding header)", ex.Message);
+                Assert.Equal($"{method} request contains no Content-Length or Transfer-Encoding header", ex.Message);
+            }
+        }
+
+        [Theory]
+        [InlineData("POST")]
+        [InlineData("PUT")]
+        public void ForThrowsWhenMethodRequiresLengthButNoContentLengthSetHttp10(string method)
+        {
+            using (var input = new TestInput())
+            {
+                input.FrameContext.Method = method;
+                var ex = Assert.Throws<BadHttpRequestException>(() =>
+                    MessageBody.For(HttpVersion.Http10, new FrameRequestHeaders(), input.FrameContext));
+
+                Assert.Equal(400, ex.StatusCode);
+                Assert.Equal($"{method} request contains no Content-Length header", ex.Message);
             }
         }