From ad6e4b838a5daad0b9a36870e5d0e3f586e9ca06 Mon Sep 17 00:00:00 2001
From: Hao Kung <haok@microsoft.com>
Date: Wed, 12 Aug 2015 13:13:27 -0700
Subject: [PATCH] Goodbye HttpContextAccessor

---
 .../IHttpContextAccessor.cs                   | 12 -----
 .../HttpContextAccessor.cs                    | 48 -------------------
 .../WebHostBuilder.cs                         |  2 +
 3 files changed, 2 insertions(+), 60 deletions(-)
 delete mode 100644 src/Microsoft.AspNet.Hosting.Abstractions/IHttpContextAccessor.cs
 delete mode 100644 src/Microsoft.AspNet.Hosting/HttpContextAccessor.cs

diff --git a/src/Microsoft.AspNet.Hosting.Abstractions/IHttpContextAccessor.cs b/src/Microsoft.AspNet.Hosting.Abstractions/IHttpContextAccessor.cs
deleted file mode 100644
index eab12b1344..0000000000
--- a/src/Microsoft.AspNet.Hosting.Abstractions/IHttpContextAccessor.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-// 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.
-
-using Microsoft.AspNet.Http;
-
-namespace Microsoft.AspNet.Hosting
-{
-    public interface IHttpContextAccessor
-    {
-        HttpContext HttpContext { get; set; }
-    }
-}
\ No newline at end of file
diff --git a/src/Microsoft.AspNet.Hosting/HttpContextAccessor.cs b/src/Microsoft.AspNet.Hosting/HttpContextAccessor.cs
deleted file mode 100644
index f649d95016..0000000000
--- a/src/Microsoft.AspNet.Hosting/HttpContextAccessor.cs
+++ /dev/null
@@ -1,48 +0,0 @@
-// 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.
-
-using System;
-#if DNX451
-using System.Runtime.Remoting.Messaging;
-using System.Runtime.Remoting;
-#elif DNXCORE50
-using System.Threading;
-#endif
-using Microsoft.AspNet.Http;
-
-namespace Microsoft.AspNet.Hosting
-{
-    public class HttpContextAccessor : IHttpContextAccessor
-    {
-#if DNX451
-        private const string LogicalDataKey = "__HttpContext_Current__";
-
-        public HttpContext HttpContext
-        {
-            get
-            {
-                var handle = CallContext.LogicalGetData(LogicalDataKey) as ObjectHandle;
-                return handle != null ? handle.Unwrap() as HttpContext : null;
-            }
-            set
-            {
-                CallContext.LogicalSetData(LogicalDataKey, new ObjectHandle(value));
-            }
-        }
-
-#elif DNXCORE50
-        private AsyncLocal<HttpContext> _httpContextCurrent = new AsyncLocal<HttpContext>();
-        public HttpContext HttpContext
-        {
-            get
-            {
-                return _httpContextCurrent.Value;
-            }
-            set
-            {
-                _httpContextCurrent.Value = value;
-            }
-        }
-#endif
-    }
-}
diff --git a/src/Microsoft.AspNet.Hosting/WebHostBuilder.cs b/src/Microsoft.AspNet.Hosting/WebHostBuilder.cs
index c9edac597a..f6ec3b3e0c 100644
--- a/src/Microsoft.AspNet.Hosting/WebHostBuilder.cs
+++ b/src/Microsoft.AspNet.Hosting/WebHostBuilder.cs
@@ -7,6 +7,8 @@ using Microsoft.AspNet.Hosting.Builder;
 using Microsoft.AspNet.Hosting.Internal;
 using Microsoft.AspNet.Hosting.Server;
 using Microsoft.AspNet.Hosting.Startup;
+using Microsoft.AspNet.Http;
+using Microsoft.AspNet.Http.Internal;
 using Microsoft.Dnx.Runtime;
 using Microsoft.Framework.Configuration;
 using Microsoft.Framework.DependencyInjection;