From 5e7b30c04b89441df4b60c0bc49a3b05c3a642db Mon Sep 17 00:00:00 2001
From: Chris R <Tratcher@outlook.com>
Date: Thu, 11 Feb 2016 14:21:47 -0800
Subject: [PATCH] #542 Add IHttpConnectionFeature.ConnectionId

---
 .../IHttpConnectionFeature.cs                 | 23 +++++++++++++++++++
 .../Features/HttpConnectionFeature.cs         |  2 ++
 .../OwinConstants.cs                          |  1 +
 .../OwinEnvironment.cs                        |  3 +++
 .../OwinFeatureCollection.cs                  |  6 +++++
 5 files changed, 35 insertions(+)

diff --git a/src/Microsoft.AspNetCore.Http.Features/IHttpConnectionFeature.cs b/src/Microsoft.AspNetCore.Http.Features/IHttpConnectionFeature.cs
index ac30742a..932e9bfe 100644
--- a/src/Microsoft.AspNetCore.Http.Features/IHttpConnectionFeature.cs
+++ b/src/Microsoft.AspNetCore.Http.Features/IHttpConnectionFeature.cs
@@ -5,11 +5,34 @@
 
 namespace Microsoft.AspNetCore.Http.Features
 {
+    /// <summary>
+    /// Information regarding the TCP/IP connection carrying the request.
+    /// </summary>
     public interface IHttpConnectionFeature
     {
+        /// <summary>
+        /// The unique identifier for the connection the request was received on. This is primarily for diagnostic purposes.
+        /// </summary>
+        string ConnectionId { get; set; }
+
+        /// <summary>
+        /// The IPAddress of the client making the request. Note this may be for a proxy rather than the end user.
+        /// </summary>
         IPAddress RemoteIpAddress { get; set; }
+
+        /// <summary>
+        /// The local IPAddress on which the request was received.
+        /// </summary>
         IPAddress LocalIpAddress { get; set; }
+
+        /// <summary>
+        /// The remote port of the client making the request.
+        /// </summary>
         int RemotePort { get; set; }
+
+        /// <summary>
+        /// The local port on which the request was received.
+        /// </summary>
         int LocalPort { get; set; }
     }
 }
\ No newline at end of file
diff --git a/src/Microsoft.AspNetCore.Http/Features/HttpConnectionFeature.cs b/src/Microsoft.AspNetCore.Http/Features/HttpConnectionFeature.cs
index 05fc485c..ab688ec7 100644
--- a/src/Microsoft.AspNetCore.Http/Features/HttpConnectionFeature.cs
+++ b/src/Microsoft.AspNetCore.Http/Features/HttpConnectionFeature.cs
@@ -11,6 +11,8 @@ public HttpConnectionFeature()
         {
         }
 
+        public string ConnectionId { get; set; }
+
         public IPAddress LocalIpAddress { get; set; }
 
         public int LocalPort { get; set; }
diff --git a/src/Microsoft.AspNetCore.Owin/OwinConstants.cs b/src/Microsoft.AspNetCore.Owin/OwinConstants.cs
index 028866ba..ca14cf9c 100644
--- a/src/Microsoft.AspNetCore.Owin/OwinConstants.cs
+++ b/src/Microsoft.AspNetCore.Owin/OwinConstants.cs
@@ -73,6 +73,7 @@ internal static class CommonKeys
             public const string RemotePort = "server.RemotePort";
             public const string LocalIpAddress = "server.LocalIpAddress";
             public const string LocalPort = "server.LocalPort";
+            public const string ConnectionId = "server.ConnectionId";
             public const string TraceOutput = "host.TraceOutput";
             public const string Addresses = "host.Addresses";
             public const string AppName = "host.AppName";
diff --git a/src/Microsoft.AspNetCore.Owin/OwinEnvironment.cs b/src/Microsoft.AspNetCore.Owin/OwinEnvironment.cs
index 11f3e2fa..a69bcde2 100644
--- a/src/Microsoft.AspNetCore.Owin/OwinEnvironment.cs
+++ b/src/Microsoft.AspNetCore.Owin/OwinEnvironment.cs
@@ -74,6 +74,9 @@ public OwinEnvironment(HttpContext context)
                     }))
                 },
 
+                { OwinConstants.CommonKeys.ConnectionId, new FeatureMap<IHttpConnectionFeature>(feature => feature.ConnectionId,
+                    (feature, value) => feature.ConnectionId = Convert.ToString(value, CultureInfo.InvariantCulture)) },
+
                 { OwinConstants.CommonKeys.LocalPort, new FeatureMap<IHttpConnectionFeature>(feature => feature.LocalPort.ToString(CultureInfo.InvariantCulture),
                     (feature, value) => feature.LocalPort = Convert.ToInt32(value, CultureInfo.InvariantCulture)) },
                 { OwinConstants.CommonKeys.RemotePort, new FeatureMap<IHttpConnectionFeature>(feature => feature.RemotePort.ToString(CultureInfo.InvariantCulture),
diff --git a/src/Microsoft.AspNetCore.Owin/OwinFeatureCollection.cs b/src/Microsoft.AspNetCore.Owin/OwinFeatureCollection.cs
index e2b7a8f8..6809d5c4 100644
--- a/src/Microsoft.AspNetCore.Owin/OwinFeatureCollection.cs
+++ b/src/Microsoft.AspNetCore.Owin/OwinFeatureCollection.cs
@@ -190,6 +190,12 @@ int IHttpConnectionFeature.LocalPort
             set { Prop(OwinConstants.CommonKeys.LocalPort, value.ToString(CultureInfo.InvariantCulture)); }
         }
 
+        string IHttpConnectionFeature.ConnectionId
+        {
+            get { return Prop<string>(OwinConstants.CommonKeys.ConnectionId); }
+            set { Prop(OwinConstants.CommonKeys.ConnectionId, value); }
+        }
+
         private bool SupportsSendFile
         {
             get