From c8003c03055e629ace7ebfdec636bb790c480471 Mon Sep 17 00:00:00 2001
From: John Luo <jt.luo@mail.utoronto.ca>
Date: Tue, 28 Feb 2017 15:49:33 -0800
Subject: [PATCH] Remove addition of default address to IServerAddressesFeature
 when none is specified

---
 src/Microsoft.AspNetCore.Hosting/Internal/WebHost.cs    | 6 ------
 test/Microsoft.AspNetCore.Hosting.Tests/WebHostTests.cs | 5 ++---
 2 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/src/Microsoft.AspNetCore.Hosting/Internal/WebHost.cs b/src/Microsoft.AspNetCore.Hosting/Internal/WebHost.cs
index 297f819b13..7f77d50024 100644
--- a/src/Microsoft.AspNetCore.Hosting/Internal/WebHost.cs
+++ b/src/Microsoft.AspNetCore.Hosting/Internal/WebHost.cs
@@ -238,12 +238,6 @@ namespace Microsoft.AspNetCore.Hosting.Internal
                             addresses.Add(value);
                         }
                     }
-
-                    if (addresses.Count == 0)
-                    {
-                        // Provide a default address if there aren't any configured.
-                        addresses.Add("http://localhost:5000");
-                    }
                 }
             }
         }
diff --git a/test/Microsoft.AspNetCore.Hosting.Tests/WebHostTests.cs b/test/Microsoft.AspNetCore.Hosting.Tests/WebHostTests.cs
index c9ee4ac9ef..5cb06f69e6 100644
--- a/test/Microsoft.AspNetCore.Hosting.Tests/WebHostTests.cs
+++ b/test/Microsoft.AspNetCore.Hosting.Tests/WebHostTests.cs
@@ -67,12 +67,11 @@ namespace Microsoft.AspNetCore.Hosting
         }
 
         [Fact]
-        public void CanDefaultAddressesIfNotConfigured()
+        public void NoDefaultAddressesIfNotConfigured()
         {
             var host = CreateBuilder().UseServer(this).Build();
             host.Start();
-            Assert.NotNull(host.Services.GetService<IHostingEnvironment>());
-            Assert.Equal("http://localhost:5000", host.ServerFeatures.Get<IServerAddressesFeature>().Addresses.First());
+            Assert.Equal(false, host.ServerFeatures.Get<IServerAddressesFeature>().Addresses.Any());
         }
 
         [Fact]