From d64b4c7acb5840fbd279faa8362e1da84df8c16b Mon Sep 17 00:00:00 2001 From: Cesar Blum Silveira Date: Mon, 24 Oct 2016 11:07:06 -0700 Subject: [PATCH] Control-flow simplification in Frame.CreateResponseHeader() (#1168). --- .../Internal/Http/Frame.cs | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/src/Microsoft.AspNetCore.Server.Kestrel/Internal/Http/Frame.cs b/src/Microsoft.AspNetCore.Server.Kestrel/Internal/Http/Frame.cs index 0953726458..8f996d0c71 100644 --- a/src/Microsoft.AspNetCore.Server.Kestrel/Internal/Http/Frame.cs +++ b/src/Microsoft.AspNetCore.Server.Kestrel/Internal/Http/Frame.cs @@ -865,13 +865,16 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Internal.Http responseHeaders.SetReadOnly(); - if (!_keepAlive && !hasConnection) + if (!hasConnection) { - responseHeaders.SetRawConnection("close", _bytesConnectionClose); - } - else if (_keepAlive && !hasConnection && _httpVersion == Http.HttpVersion.Http10) - { - responseHeaders.SetRawConnection("keep-alive", _bytesConnectionKeepAlive); + if (!_keepAlive) + { + responseHeaders.SetRawConnection("close", _bytesConnectionClose); + } + else if (_httpVersion == Http.HttpVersion.Http10) + { + responseHeaders.SetRawConnection("keep-alive", _bytesConnectionKeepAlive); + } } if (ServerOptions.AddServerHeader && !responseHeaders.HasServer)