Feedback

jkotalik · jkotalik · commit fd2cae5b6558 · 2020-02-24T11:41:21.000-08:00
diff --git a/src/Servers/Connections.Abstractions/ref/Microsoft.AspNetCore.Connections.Abstractions.netcoreapp.cs b/src/Servers/Connections.Abstractions/ref/Microsoft.AspNetCore.Connections.Abstractions.netcoreapp.cs
@@ -142,7 +142,7 @@ public partial interface IMultiplexedConnectionFactory
     public partial interface IMultiplexedConnectionListener : System.IAsyncDisposable
     {
         System.Net.EndPoint EndPoint { get; }
-        System.Threading.Tasks.ValueTask<Microsoft.AspNetCore.Connections.MultiplexedConnectionContext> AcceptAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
+        System.Threading.Tasks.ValueTask<Microsoft.AspNetCore.Connections.MultiplexedConnectionContext> AcceptAsync(Microsoft.AspNetCore.Http.Features.IFeatureCollection features = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
         System.Threading.Tasks.ValueTask UnbindAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
     }
     public partial interface IMultiplexedConnectionListenerFactory
@@ -156,11 +156,6 @@ public MultiplexedConnectionBuilder(System.IServiceProvider applicationServices)
         public Microsoft.AspNetCore.Connections.MultiplexedConnectionDelegate Build() { throw null; }
         public Microsoft.AspNetCore.Connections.IMultiplexedConnectionBuilder Use(System.Func<Microsoft.AspNetCore.Connections.MultiplexedConnectionDelegate, Microsoft.AspNetCore.Connections.MultiplexedConnectionDelegate> middleware) { throw null; }
     }
-    public static partial class MultiplexedConnectionBuilderExtensions
-    {
-        public static Microsoft.AspNetCore.Connections.IMultiplexedConnectionBuilder Run(this Microsoft.AspNetCore.Connections.IMultiplexedConnectionBuilder connectionBuilder, System.Func<Microsoft.AspNetCore.Connections.MultiplexedConnectionContext, System.Threading.Tasks.Task> middleware) { throw null; }
-        public static Microsoft.AspNetCore.Connections.IMultiplexedConnectionBuilder UseMultiplexed(this Microsoft.AspNetCore.Connections.IMultiplexedConnectionBuilder connectionBuilder, System.Func<Microsoft.AspNetCore.Connections.MultiplexedConnectionContext, System.Func<System.Threading.Tasks.Task>, System.Threading.Tasks.Task> middleware) { throw null; }
-    }
     public abstract partial class MultiplexedConnectionContext : Microsoft.AspNetCore.Connections.BaseConnectionContext, System.IAsyncDisposable
     {
         protected MultiplexedConnectionContext() { }
@@ -171,7 +166,7 @@ protected MultiplexedConnectionContext() { }
     public abstract partial class StreamContext : Microsoft.AspNetCore.Connections.ConnectionContext
     {
         protected StreamContext() { }
-        public abstract long StreamId { get; }
+        public abstract string StreamId { get; }
     }
     [System.FlagsAttribute]
     public enum TransferFormat
@@ -244,6 +239,10 @@ public partial interface IStreamDirectionFeature
         bool CanRead { get; }
         bool CanWrite { get; }
     }
+    public partial interface IStreamIdFeature
+    {
+        long StreamId { get; }
+    }
     public partial interface ITlsHandshakeFeature
     {
         System.Security.Authentication.CipherAlgorithmType CipherAlgorithm { get; }
diff --git a/src/Servers/Connections.Abstractions/ref/Microsoft.AspNetCore.Connections.Abstractions.netstandard2.0.cs b/src/Servers/Connections.Abstractions/ref/Microsoft.AspNetCore.Connections.Abstractions.netstandard2.0.cs
@@ -142,7 +142,7 @@ public partial interface IMultiplexedConnectionFactory
     public partial interface IMultiplexedConnectionListener : System.IAsyncDisposable
     {
         System.Net.EndPoint EndPoint { get; }
-        System.Threading.Tasks.ValueTask<Microsoft.AspNetCore.Connections.MultiplexedConnectionContext> AcceptAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
+        System.Threading.Tasks.ValueTask<Microsoft.AspNetCore.Connections.MultiplexedConnectionContext> AcceptAsync(Microsoft.AspNetCore.Http.Features.IFeatureCollection features = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
         System.Threading.Tasks.ValueTask UnbindAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
     }
     public partial interface IMultiplexedConnectionListenerFactory
@@ -156,11 +156,6 @@ public MultiplexedConnectionBuilder(System.IServiceProvider applicationServices)
         public Microsoft.AspNetCore.Connections.MultiplexedConnectionDelegate Build() { throw null; }
         public Microsoft.AspNetCore.Connections.IMultiplexedConnectionBuilder Use(System.Func<Microsoft.AspNetCore.Connections.MultiplexedConnectionDelegate, Microsoft.AspNetCore.Connections.MultiplexedConnectionDelegate> middleware) { throw null; }
     }
-    public static partial class MultiplexedConnectionBuilderExtensions
-    {
-        public static Microsoft.AspNetCore.Connections.IMultiplexedConnectionBuilder Run(this Microsoft.AspNetCore.Connections.IMultiplexedConnectionBuilder connectionBuilder, System.Func<Microsoft.AspNetCore.Connections.MultiplexedConnectionContext, System.Threading.Tasks.Task> middleware) { throw null; }
-        public static Microsoft.AspNetCore.Connections.IMultiplexedConnectionBuilder UseMultiplexed(this Microsoft.AspNetCore.Connections.IMultiplexedConnectionBuilder connectionBuilder, System.Func<Microsoft.AspNetCore.Connections.MultiplexedConnectionContext, System.Func<System.Threading.Tasks.Task>, System.Threading.Tasks.Task> middleware) { throw null; }
-    }
     public abstract partial class MultiplexedConnectionContext : Microsoft.AspNetCore.Connections.BaseConnectionContext, System.IAsyncDisposable
     {
         protected MultiplexedConnectionContext() { }
@@ -171,7 +166,7 @@ protected MultiplexedConnectionContext() { }
     public abstract partial class StreamContext : Microsoft.AspNetCore.Connections.ConnectionContext
     {
         protected StreamContext() { }
-        public abstract long StreamId { get; }
+        public abstract string StreamId { get; }
     }
     [System.FlagsAttribute]
     public enum TransferFormat
@@ -244,6 +239,10 @@ public partial interface IStreamDirectionFeature
         bool CanRead { get; }
         bool CanWrite { get; }
     }
+    public partial interface IStreamIdFeature
+    {
+        long StreamId { get; }
+    }
     public partial interface ITlsHandshakeFeature
     {
         System.Security.Authentication.CipherAlgorithmType CipherAlgorithm { get; }
diff --git a/src/Servers/Connections.Abstractions/ref/Microsoft.AspNetCore.Connections.Abstractions.netstandard2.1.cs b/src/Servers/Connections.Abstractions/ref/Microsoft.AspNetCore.Connections.Abstractions.netstandard2.1.cs
@@ -142,7 +142,7 @@ public partial interface IMultiplexedConnectionFactory
     public partial interface IMultiplexedConnectionListener : System.IAsyncDisposable
     {
         System.Net.EndPoint EndPoint { get; }
-        System.Threading.Tasks.ValueTask<Microsoft.AspNetCore.Connections.MultiplexedConnectionContext> AcceptAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
+        System.Threading.Tasks.ValueTask<Microsoft.AspNetCore.Connections.MultiplexedConnectionContext> AcceptAsync(Microsoft.AspNetCore.Http.Features.IFeatureCollection features = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
         System.Threading.Tasks.ValueTask UnbindAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
     }
     public partial interface IMultiplexedConnectionListenerFactory
@@ -156,11 +156,6 @@ public MultiplexedConnectionBuilder(System.IServiceProvider applicationServices)
         public Microsoft.AspNetCore.Connections.MultiplexedConnectionDelegate Build() { throw null; }
         public Microsoft.AspNetCore.Connections.IMultiplexedConnectionBuilder Use(System.Func<Microsoft.AspNetCore.Connections.MultiplexedConnectionDelegate, Microsoft.AspNetCore.Connections.MultiplexedConnectionDelegate> middleware) { throw null; }
     }
-    public static partial class MultiplexedConnectionBuilderExtensions
-    {
-        public static Microsoft.AspNetCore.Connections.IMultiplexedConnectionBuilder Run(this Microsoft.AspNetCore.Connections.IMultiplexedConnectionBuilder connectionBuilder, System.Func<Microsoft.AspNetCore.Connections.MultiplexedConnectionContext, System.Threading.Tasks.Task> middleware) { throw null; }
-        public static Microsoft.AspNetCore.Connections.IMultiplexedConnectionBuilder UseMultiplexed(this Microsoft.AspNetCore.Connections.IMultiplexedConnectionBuilder connectionBuilder, System.Func<Microsoft.AspNetCore.Connections.MultiplexedConnectionContext, System.Func<System.Threading.Tasks.Task>, System.Threading.Tasks.Task> middleware) { throw null; }
-    }
     public abstract partial class MultiplexedConnectionContext : Microsoft.AspNetCore.Connections.BaseConnectionContext, System.IAsyncDisposable
     {
         protected MultiplexedConnectionContext() { }
@@ -171,7 +166,7 @@ protected MultiplexedConnectionContext() { }
     public abstract partial class StreamContext : Microsoft.AspNetCore.Connections.ConnectionContext
     {
         protected StreamContext() { }
-        public abstract long StreamId { get; }
+        public abstract string StreamId { get; }
     }
     [System.FlagsAttribute]
     public enum TransferFormat
@@ -244,6 +239,10 @@ public partial interface IStreamDirectionFeature
         bool CanRead { get; }
         bool CanWrite { get; }
     }
+    public partial interface IStreamIdFeature
+    {
+        long StreamId { get; }
+    }
     public partial interface ITlsHandshakeFeature
     {
         System.Security.Authentication.CipherAlgorithmType CipherAlgorithm { get; }
diff --git a/src/Servers/Connections.Abstractions/src/Features/IStreamIdFeature.cs b/src/Servers/Connections.Abstractions/src/Features/IStreamIdFeature.cs
@@ -0,0 +1,10 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+namespace Microsoft.AspNetCore.Connections.Features
+{
+    public interface IStreamIdFeature
+    {
+        long StreamId { get; }
+    }
+}
diff --git a/src/Servers/Connections.Abstractions/src/IMulitplexedConnectionListener.cs b/src/Servers/Connections.Abstractions/src/IMulitplexedConnectionListener.cs
@@ -5,6 +5,7 @@
 using System.Net;
 using System.Threading;
 using System.Threading.Tasks;
+using Microsoft.AspNetCore.Http.Features;
 
 namespace Microsoft.AspNetCore.Connections
 {
@@ -28,8 +29,9 @@ public interface IMultiplexedConnectionListener : IAsyncDisposable
         /// <summary>
         /// Begins an asynchronous operation to accept an incoming connection.
         /// </summary>
+        /// <param name="features">A feature collection to pass options when accepting a connection.</param>
         /// <param name="cancellationToken">The token to monitor for cancellation requests.</param>
         /// <returns>A <see cref="ValueTask{ConnectionContext}"/> that completes when a connection is accepted, yielding the <see cref="MultiplexedConnectionContext" /> representing the connection.</returns>
-        ValueTask<MultiplexedConnectionContext> AcceptAsync(CancellationToken cancellationToken = default);
+        ValueTask<MultiplexedConnectionContext> AcceptAsync(IFeatureCollection features = null, CancellationToken cancellationToken = default);
     }
 }
diff --git a/src/Servers/Connections.Abstractions/src/StreamContext.cs b/src/Servers/Connections.Abstractions/src/StreamContext.cs
@@ -8,6 +8,6 @@ public abstract class StreamContext : ConnectionContext
         /// <summary>
         /// Gets the id assigned to the stream.
         /// </summary>
-        public abstract long StreamId { get; }
+        public abstract string StreamId { get; }
     }
 }
diff --git a/src/Servers/Kestrel/Core/src/Internal/Http3/Http3Connection.cs b/src/Servers/Kestrel/Core/src/Internal/Http3/Http3Connection.cs
@@ -205,13 +205,14 @@ internal async Task InnerProcessRequestsAsync<TContext>(IHttpApplication<TContex
                         break;
                     }
 
-                    var streamDirectionFeature = streamContext.Features.Get<IStreamDirectionFeature>();
+                    var quicStreamFeature = streamContext.Features.Get<IStreamDirectionFeature>();
+                    var streamIdFeature = streamContext.Features.Get<IStreamIdFeature>();
 
-                    Debug.Assert(streamDirectionFeature != null);
+                    Debug.Assert(quicStreamFeature != null);
 
                     var httpConnectionContext = new Http3StreamContext
                     {
-                        ConnectionId = streamContext.StreamId.ToString(),
+                        ConnectionId = streamContext.StreamId,
                         StreamContext = streamContext,
                         // TODO connection context is null here. Should we set it to anything?
                         ServiceContext = _context.ServiceContext,
@@ -223,7 +224,7 @@ internal async Task InnerProcessRequestsAsync<TContext>(IHttpApplication<TContex
                         RemoteEndPoint = streamContext.RemoteEndPoint as IPEndPoint
                     };
 
-                    if (!streamDirectionFeature.CanWrite)
+                    if (!quicStreamFeature.CanWrite)
                     {
                         // Unidirectional stream
                         var stream = new Http3ControlStream<TContext>(application, this, httpConnectionContext);
@@ -232,7 +233,7 @@ internal async Task InnerProcessRequestsAsync<TContext>(IHttpApplication<TContex
                     else
                     {
                         // Keep track of highest stream id seen for GOAWAY
-                        var streamId = streamContext.StreamId;
+                        var streamId = streamIdFeature.StreamId;
                         HighestStreamId = streamId;
 
                         var http3Stream = new Http3Stream<TContext>(application, this, httpConnectionContext);
diff --git a/src/Servers/Kestrel/Transport.Quic/src/Internal/QuicConnectionListener.cs b/src/Servers/Kestrel/Transport.Quic/src/Internal/QuicConnectionListener.cs
@@ -9,6 +9,7 @@
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Connections;
+using Microsoft.AspNetCore.Http.Features;
 
 namespace Microsoft.AspNetCore.Server.Kestrel.Transport.Quic.Internal
 {
@@ -36,7 +37,7 @@ public QuicConnectionListener(QuicTransportOptions options, IQuicTrace log, EndP
 
         public EndPoint EndPoint { get; set; }
 
-        public async ValueTask<MultiplexedConnectionContext> AcceptAsync(CancellationToken cancellationToken = default)
+        public async ValueTask<MultiplexedConnectionContext> AcceptAsync(IFeatureCollection features = null, CancellationToken cancellationToken = default)
         {
             var quicConnection = await _listener.AcceptConnectionAsync(cancellationToken);
             try
diff --git a/src/Servers/Kestrel/Transport.Quic/src/Internal/QuicStreamContext.cs b/src/Servers/Kestrel/Transport.Quic/src/Internal/QuicStreamContext.cs
@@ -14,7 +14,7 @@
 
 namespace Microsoft.AspNetCore.Server.Kestrel.Transport.Quic.Internal
 {
-    internal class QuicStreamContext : TransportStream, IStreamDirectionFeature, IProtocolErrorCodeFeature
+    internal class QuicStreamContext : TransportStream, IStreamDirectionFeature, IProtocolErrorCodeFeature, IStreamIdFeature
     {
         private readonly Task _processingTask;
         private readonly QuicStream _stream;
@@ -67,14 +67,22 @@ public QuicStreamContext(QuicStream stream, QuicConnectionContext connection, Qu
         public bool CanRead { get; }
         public bool CanWrite { get; }
 
-        public override long StreamId
+        long IStreamIdFeature.StreamId
         {
             get
             {
                 return _stream.StreamId;
             }
         }
 
+        public override string StreamId
+        {
+            get
+            {
+                return _stream.StreamId.ToString();
+            }
+        }
+
         public override string ConnectionId
         {
             get
diff --git a/src/Servers/Kestrel/test/InMemory.FunctionalTests/Http3/Http3TestBase.cs b/src/Servers/Kestrel/test/InMemory.FunctionalTests/Http3/Http3TestBase.cs
@@ -479,18 +479,20 @@ public override ValueTask<StreamContext> ConnectAsync(IFeatureCollection feature
             }
         }
 
-        private class TestStreamContext : StreamContext
+        private class TestStreamContext : StreamContext, IStreamDirectionFeature, IStreamIdFeature
         {
             private DuplexPipePair _pair;
             public TestStreamContext(bool canRead, bool canWrite, DuplexPipePair pair, IProtocolErrorCodeFeature feature)
             {
                 _pair = pair;
                 Features = new FeatureCollection();
-                Features.Set<IStreamDirectionFeature>(new DefaultStreamDirectionFeature(canRead, canWrite));
+                Features.Set<IStreamDirectionFeature>(this);
+                CanRead = canRead;
+                CanWrite = canWrite;
                 Features.Set<IProtocolErrorCodeFeature>(feature);
             }
 
-            public override long StreamId { get; }
+            public override string StreamId { get; }
 
             public override string ConnectionId { get; set; }
 
@@ -510,6 +512,12 @@ public override IDuplexPipe Transport
                 }
             }
 
+            public bool CanRead { get; }
+
+            public bool CanWrite { get; }
+
+            long IStreamIdFeature.StreamId { get; }
+
             public override void Abort(ConnectionAbortedException abortReason)
             {
                 _pair.Application.Output.Complete(abortReason);

Original file line number	Diff line number	Diff line change
`@@ -142,7 +142,7 @@ public partial interface IMultiplexedConnectionFactory`
`142`	`142`	`public partial interface IMultiplexedConnectionListener : System.IAsyncDisposable`
`143`	`143`	`{`
`144`	`144`	`System.Net.EndPoint EndPoint { get; }`
`145`		`- System.Threading.Tasks.ValueTask<Microsoft.AspNetCore.Connections.MultiplexedConnectionContext> AcceptAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));`
	`145`	`+ System.Threading.Tasks.ValueTask<Microsoft.AspNetCore.Connections.MultiplexedConnectionContext> AcceptAsync(Microsoft.AspNetCore.Http.Features.IFeatureCollection features = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));`
`146`	`146`	`System.Threading.Tasks.ValueTask UnbindAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));`
`147`	`147`	`}`
`148`	`148`	`public partial interface IMultiplexedConnectionListenerFactory`
`@@ -156,11 +156,6 @@ public MultiplexedConnectionBuilder(System.IServiceProvider applicationServices)`
`156`	`156`	`public Microsoft.AspNetCore.Connections.MultiplexedConnectionDelegate Build() { throw null; }`
`157`	`157`	`public Microsoft.AspNetCore.Connections.IMultiplexedConnectionBuilder Use(System.Func<Microsoft.AspNetCore.Connections.MultiplexedConnectionDelegate, Microsoft.AspNetCore.Connections.MultiplexedConnectionDelegate> middleware) { throw null; }`
`158`	`158`	`}`
`159`		`- public static partial class MultiplexedConnectionBuilderExtensions`
`160`		`- {`
`161`		`- public static Microsoft.AspNetCore.Connections.IMultiplexedConnectionBuilder Run(this Microsoft.AspNetCore.Connections.IMultiplexedConnectionBuilder connectionBuilder, System.Func<Microsoft.AspNetCore.Connections.MultiplexedConnectionContext, System.Threading.Tasks.Task> middleware) { throw null; }`
`162`		`- public static Microsoft.AspNetCore.Connections.IMultiplexedConnectionBuilder UseMultiplexed(this Microsoft.AspNetCore.Connections.IMultiplexedConnectionBuilder connectionBuilder, System.Func<Microsoft.AspNetCore.Connections.MultiplexedConnectionContext, System.Func<System.Threading.Tasks.Task>, System.Threading.Tasks.Task> middleware) { throw null; }`
`163`		`- }`
`164`	`159`	`public abstract partial class MultiplexedConnectionContext : Microsoft.AspNetCore.Connections.BaseConnectionContext, System.IAsyncDisposable`
`165`	`160`	`{`
`166`	`161`	`protected MultiplexedConnectionContext() { }`
`@@ -171,7 +166,7 @@ protected MultiplexedConnectionContext() { }`
`171`	`166`	`public abstract partial class StreamContext : Microsoft.AspNetCore.Connections.ConnectionContext`
`172`	`167`	`{`
`173`	`168`	`protected StreamContext() { }`
`174`		`- public abstract long StreamId { get; }`
	`169`	`+ public abstract string StreamId { get; }`
`175`	`170`	`}`
`176`	`171`	`[System.FlagsAttribute]`
`177`	`172`	`public enum TransferFormat`
`@@ -244,6 +239,10 @@ public partial interface IStreamDirectionFeature`
`244`	`239`	`bool CanRead { get; }`
`245`	`240`	`bool CanWrite { get; }`
`246`	`241`	`}`
	`242`	`+ public partial interface IStreamIdFeature`
	`243`	`+ {`
	`244`	`+ long StreamId { get; }`
	`245`	`+ }`
`247`	`246`	`public partial interface ITlsHandshakeFeature`
`248`	`247`	`{`
`249`	`248`	`System.Security.Authentication.CipherAlgorithmType CipherAlgorithm { get; }`
Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,7 @@`
`5`	`5`	`using System.Net;`
`6`	`6`	`using System.Threading;`
`7`	`7`	`using System.Threading.Tasks;`
	`8`	`+using Microsoft.AspNetCore.Http.Features;`
`8`	`9`
`9`	`10`	`namespace Microsoft.AspNetCore.Connections`
`10`	`11`	`{`
`@@ -28,8 +29,9 @@ public interface IMultiplexedConnectionListener : IAsyncDisposable`
`28`	`29`	`/// <summary>`
`29`	`30`	`/// Begins an asynchronous operation to accept an incoming connection.`
`30`	`31`	`/// </summary>`
	`32`	`+ /// <param name="features">A feature collection to pass options when accepting a connection.</param>`
`31`	`33`	`/// <param name="cancellationToken">The token to monitor for cancellation requests.</param>`
`32`	`34`	`/// <returns>A <see cref="ValueTask{ConnectionContext}"/> that completes when a connection is accepted, yielding the <see cref="MultiplexedConnectionContext" /> representing the connection.</returns>`
`33`		`- ValueTask<MultiplexedConnectionContext> AcceptAsync(CancellationToken cancellationToken = default);`
	`35`	`+ ValueTask<MultiplexedConnectionContext> AcceptAsync(IFeatureCollection features = null, CancellationToken cancellationToken = default);`
`34`	`36`	`}`
`35`	`37`	`}`
Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,6 @@ public abstract class StreamContext : ConnectionContext`
`8`	`8`	`/// <summary>`
`9`	`9`	`/// Gets the id assigned to the stream.`
`10`	`10`	`/// </summary>`
`11`		`- public abstract long StreamId { get; }`
	`11`	`+ public abstract string StreamId { get; }`
`12`	`12`	`}`
`13`	`13`	`}`
Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,7 @@`
`9`	`9`	`using System.Threading;`
`10`	`10`	`using System.Threading.Tasks;`
`11`	`11`	`using Microsoft.AspNetCore.Connections;`
	`12`	`+using Microsoft.AspNetCore.Http.Features;`
`12`	`13`
`13`	`14`	`namespace Microsoft.AspNetCore.Server.Kestrel.Transport.Quic.Internal`
`14`	`15`	`{`
`@@ -36,7 +37,7 @@ public QuicConnectionListener(QuicTransportOptions options, IQuicTrace log, EndP`
`36`	`37`
`37`	`38`	`public EndPoint EndPoint { get; set; }`
`38`	`39`
`39`		`- public async ValueTask<MultiplexedConnectionContext> AcceptAsync(CancellationToken cancellationToken = default)`
	`40`	`+ public async ValueTask<MultiplexedConnectionContext> AcceptAsync(IFeatureCollection features = null, CancellationToken cancellationToken = default)`
`40`	`41`	`{`
`41`	`42`	`var quicConnection = await _listener.AcceptConnectionAsync(cancellationToken);`
`42`	`43`	`try`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@`
`14`	`14`
`15`	`15`	`namespace Microsoft.AspNetCore.Server.Kestrel.Transport.Quic.Internal`
`16`	`16`	`{`
`17`		`- internal class QuicStreamContext : TransportStream, IStreamDirectionFeature, IProtocolErrorCodeFeature`
	`17`	`+ internal class QuicStreamContext : TransportStream, IStreamDirectionFeature, IProtocolErrorCodeFeature, IStreamIdFeature`
`18`	`18`	`{`
`19`	`19`	`private readonly Task _processingTask;`
`20`	`20`	`private readonly QuicStream _stream;`
`@@ -67,14 +67,22 @@ public QuicStreamContext(QuicStream stream, QuicConnectionContext connection, Qu`
`67`	`67`	`public bool CanRead { get; }`
`68`	`68`	`public bool CanWrite { get; }`
`69`	`69`
`70`		`- public override long StreamId`
	`70`	`+ long IStreamIdFeature.StreamId`
`71`	`71`	`{`
`72`	`72`	`get`
`73`	`73`	`{`
`74`	`74`	`return _stream.StreamId;`
`75`	`75`	`}`
`76`	`76`	`}`
`77`	`77`
	`78`	`+ public override string StreamId`
	`79`	`+ {`
	`80`	`+ get`
	`81`	`+ {`
	`82`	`+ return _stream.StreamId.ToString();`
	`83`	`+ }`
	`84`	`+ }`
	`85`	`+`
`78`	`86`	`public override string ConnectionId`
`79`	`87`	`{`
`80`	`88`	`get`
Original file line number	Diff line number	Diff line change
`@@ -479,18 +479,20 @@ public override ValueTask<StreamContext> ConnectAsync(IFeatureCollection feature`
`479`	`479`	`}`
`480`	`480`	`}`
`481`	`481`
`482`		`- private class TestStreamContext : StreamContext`
	`482`	`+ private class TestStreamContext : StreamContext, IStreamDirectionFeature, IStreamIdFeature`
`483`	`483`	`{`
`484`	`484`	`private DuplexPipePair _pair;`
`485`	`485`	`public TestStreamContext(bool canRead, bool canWrite, DuplexPipePair pair, IProtocolErrorCodeFeature feature)`
`486`	`486`	`{`
`487`	`487`	`_pair = pair;`
`488`	`488`	`Features = new FeatureCollection();`
`489`		`- Features.Set<IStreamDirectionFeature>(new DefaultStreamDirectionFeature(canRead, canWrite));`
	`489`	`+ Features.Set<IStreamDirectionFeature>(this);`
	`490`	`+ CanRead = canRead;`
	`491`	`+ CanWrite = canWrite;`
`490`	`492`	`Features.Set<IProtocolErrorCodeFeature>(feature);`
`491`	`493`	`}`
`492`	`494`
`493`		`- public override long StreamId { get; }`
	`495`	`+ public override string StreamId { get; }`
`494`	`496`
`495`	`497`	`public override string ConnectionId { get; set; }`
`496`	`498`
`@@ -510,6 +512,12 @@ public override IDuplexPipe Transport`
`510`	`512`	`}`
`511`	`513`	`}`
`512`	`514`
	`515`	`+ public bool CanRead { get; }`
	`516`	`+`
	`517`	`+ public bool CanWrite { get; }`
	`518`	`+`
	`519`	`+ long IStreamIdFeature.StreamId { get; }`
	`520`	`+`
`513`	`521`	`public override void Abort(ConnectionAbortedException abortReason)`
`514`	`522`	`{`
`515`	`523`	`_pair.Application.Output.Complete(abortReason);`