From 047e39ed33f3c0cbe1c5c242fc93129f05669cb4 Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Mon, 6 Aug 2018 20:37:53 +0000 Subject: [PATCH 1/6] Update dependencies.props [auto-updated: dependencies] --- build/dependencies.props | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/build/dependencies.props b/build/dependencies.props index fc63291133..0c48776d04 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -4,14 +4,14 @@ 2.2.0-preview1-20180731.1 - 2.2.0-preview1-34882 - 2.2.0-preview1-34882 - 2.2.0-preview1-34882 - 2.2.0-preview1-34882 + 2.2.0-preview1-34896 + 2.2.0-preview1-34896 + 2.2.0-preview1-34896 + 2.2.0-preview1-34896 2.0.9 2.1.2 2.2.0-preview1-26618-02 - 2.2.0-preview1-34882 + 2.2.0-preview1-34896 15.6.1 4.5.0 2.0.3 From 0cf53e7d3489eb3c2298fb78f3c83443a3aaf8fd Mon Sep 17 00:00:00 2001 From: "Chris Ross (ASP.NET)" Date: Tue, 7 Aug 2018 14:38:44 -0700 Subject: [PATCH 2/6] Show HTTP/2 status on requests #106 --- .../Microsoft.AspNetCore.HttpSys.Sources/Constants.cs | 1 + .../NativeInterop/HttpApiTypes.cs | 11 ++++++++++- .../RequestProcessing/NativeRequestContext.cs | 6 ++++++ .../FeatureContext.cs | 9 +++++++-- 4 files changed, 24 insertions(+), 3 deletions(-) diff --git a/shared/Microsoft.AspNetCore.HttpSys.Sources/Constants.cs b/shared/Microsoft.AspNetCore.HttpSys.Sources/Constants.cs index 0982badab8..6f861c239f 100644 --- a/shared/Microsoft.AspNetCore.HttpSys.Sources/Constants.cs +++ b/shared/Microsoft.AspNetCore.HttpSys.Sources/Constants.cs @@ -17,5 +17,6 @@ namespace Microsoft.AspNetCore.HttpSys.Internal internal static Version V1_0 = new Version(1, 0); internal static Version V1_1 = new Version(1, 1); + internal static Version V2 = new Version(2, 0); } } diff --git a/shared/Microsoft.AspNetCore.HttpSys.Sources/NativeInterop/HttpApiTypes.cs b/shared/Microsoft.AspNetCore.HttpSys.Sources/NativeInterop/HttpApiTypes.cs index 6b3a3b6908..f05d089b9f 100644 --- a/shared/Microsoft.AspNetCore.HttpSys.Sources/NativeInterop/HttpApiTypes.cs +++ b/shared/Microsoft.AspNetCore.HttpSys.Sources/NativeInterop/HttpApiTypes.cs @@ -434,10 +434,19 @@ namespace Microsoft.AspNetCore.HttpSys.Internal internal HTTP_REQUEST_AUTH_INFO* pInfo; } + [Flags] + internal enum HTTP_REQUEST_FLAGS + { + None = 0, + MoreEntityBodyExists = 1, + IPRouted = 2, + Http2 = 4, + } + [StructLayout(LayoutKind.Sequential)] internal struct HTTP_REQUEST { - internal uint Flags; + internal HTTP_REQUEST_FLAGS Flags; internal ulong ConnectionId; internal ulong RequestId; internal ulong UrlContext; diff --git a/shared/Microsoft.AspNetCore.HttpSys.Sources/RequestProcessing/NativeRequestContext.cs b/shared/Microsoft.AspNetCore.HttpSys.Sources/RequestProcessing/NativeRequestContext.cs index a0985c87ce..ef15d80394 100644 --- a/shared/Microsoft.AspNetCore.HttpSys.Sources/RequestProcessing/NativeRequestContext.cs +++ b/shared/Microsoft.AspNetCore.HttpSys.Sources/RequestProcessing/NativeRequestContext.cs @@ -88,6 +88,8 @@ namespace Microsoft.AspNetCore.HttpSys.Internal } } + internal bool IsHttp2 => NativeRequest->Flags.HasFlag(HttpApiTypes.HTTP_REQUEST_FLAGS.Http2); + internal uint Size { get { return (uint)_backingBuffer.Length - AlignmentPadding; } @@ -156,6 +158,10 @@ namespace Microsoft.AspNetCore.HttpSys.Internal internal Version GetVersion() { + if (IsHttp2) + { + return Constants.V2; + } var major = NativeRequest->Version.MajorVersion; var minor = NativeRequest->Version.MinorVersion; if (major == 1 && minor == 1) diff --git a/src/Microsoft.AspNetCore.Server.HttpSys/FeatureContext.cs b/src/Microsoft.AspNetCore.Server.HttpSys/FeatureContext.cs index 9acef96deb..193b87f969 100644 --- a/src/Microsoft.AspNetCore.Server.HttpSys/FeatureContext.cs +++ b/src/Microsoft.AspNetCore.Server.HttpSys/FeatureContext.cs @@ -13,6 +13,7 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Http.Features; using Microsoft.AspNetCore.Http.Features.Authentication; +using Microsoft.AspNetCore.HttpSys.Internal; using Microsoft.Net.Http.Headers; namespace Microsoft.AspNetCore.Server.HttpSys @@ -168,11 +169,15 @@ namespace Microsoft.AspNetCore.Server.HttpSys if (IsNotInitialized(Fields.Protocol)) { var protocol = Request.ProtocolVersion; - if (protocol.Major == 1 && protocol.Minor == 1) + if (protocol == Constants.V2) + { + _httpProtocolVersion = "HTTP/2"; + } + else if (protocol == Constants.V1_1) { _httpProtocolVersion = "HTTP/1.1"; } - else if (protocol.Major == 1 && protocol.Minor == 0) + else if (protocol == Constants.V1_0) { _httpProtocolVersion = "HTTP/1.0"; } From 9f6f5730fd152f65a703880d901b75f15e9d94ad Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Sun, 12 Aug 2018 19:14:42 +0000 Subject: [PATCH 3/6] Update dependencies.props [auto-updated: dependencies] --- build/dependencies.props | 12 ++++++------ korebuild-lock.txt | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/build/dependencies.props b/build/dependencies.props index 0c48776d04..d3908a57ee 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -3,15 +3,15 @@ $(MSBuildAllProjects);$(MSBuildThisFileFullPath) - 2.2.0-preview1-20180731.1 - 2.2.0-preview1-34896 - 2.2.0-preview1-34896 - 2.2.0-preview1-34896 - 2.2.0-preview1-34896 + 2.2.0-preview1-20180807.2 + 2.2.0-preview1-34967 + 2.2.0-preview1-34967 + 2.2.0-preview1-34967 + 2.2.0-preview1-34967 2.0.9 2.1.2 2.2.0-preview1-26618-02 - 2.2.0-preview1-34896 + 2.2.0-preview1-34967 15.6.1 4.5.0 2.0.3 diff --git a/korebuild-lock.txt b/korebuild-lock.txt index c7af2292c7..3fbcc80189 100644 --- a/korebuild-lock.txt +++ b/korebuild-lock.txt @@ -1,2 +1,2 @@ -version:2.2.0-preview1-20180731.1 -commithash:29fde58465439f4bb9df40830635ed758e063daf +version:2.2.0-preview1-20180807.2 +commithash:11495dbd236104434e08cb1152fcb58cf2a20923 From d6f2e8085f933213e31d63ad3c2ea9cf7a432b75 Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Tue, 21 Aug 2018 13:33:50 -0700 Subject: [PATCH 4/6] Update package branding for 2.2.0-preview2 --- build/dependencies.props | 2 +- version.props | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/dependencies.props b/build/dependencies.props index d3908a57ee..bf7752a647 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -20,6 +20,6 @@ 2.3.1 2.4.0 - + diff --git a/version.props b/version.props index 44985cedb3..15637ba785 100644 --- a/version.props +++ b/version.props @@ -1,7 +1,7 @@ 2.2.0 - preview1 + preview2 $(VersionPrefix) $(VersionPrefix)-$(VersionSuffix)-final t000 From 85a8aa21f17abc3d9e017b4ba37ce5c6a5cdec7c Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Sun, 2 Sep 2018 12:13:51 -0700 Subject: [PATCH 5/6] Update dependencies.props [auto-updated: dependencies] --- build/dependencies.props | 12 ++++++------ korebuild-lock.txt | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/build/dependencies.props b/build/dependencies.props index bf7752a647..4561ab65ef 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -3,15 +3,15 @@ $(MSBuildAllProjects);$(MSBuildThisFileFullPath) - 2.2.0-preview1-20180807.2 - 2.2.0-preview1-34967 - 2.2.0-preview1-34967 - 2.2.0-preview1-34967 - 2.2.0-preview1-34967 + 2.2.0-preview1-20180821.1 + 2.2.0-preview2-35143 + 2.2.0-preview2-35143 + 2.2.0-preview2-35143 + 2.2.0-preview2-35143 2.0.9 2.1.2 2.2.0-preview1-26618-02 - 2.2.0-preview1-34967 + 2.2.0-preview2-35143 15.6.1 4.5.0 2.0.3 diff --git a/korebuild-lock.txt b/korebuild-lock.txt index 3fbcc80189..ad704918df 100644 --- a/korebuild-lock.txt +++ b/korebuild-lock.txt @@ -1,2 +1,2 @@ -version:2.2.0-preview1-20180807.2 -commithash:11495dbd236104434e08cb1152fcb58cf2a20923 +version:2.2.0-preview1-20180821.1 +commithash:c8d0cc52cd1abb697be24e288ffd54f8fae8bf17 From 5b8a1ab329058da136367d8c130f73e04f57bccc Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Wed, 5 Sep 2018 16:34:43 -0700 Subject: [PATCH 6/6] Update branding to 2.2.0-preview3 --- version.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.props b/version.props index 15637ba785..704cac087b 100644 --- a/version.props +++ b/version.props @@ -1,7 +1,7 @@ 2.2.0 - preview2 + preview3 $(VersionPrefix) $(VersionPrefix)-$(VersionSuffix)-final t000