From 464c53d3ac32897cbec38439e4e36d1d6000794b Mon Sep 17 00:00:00 2001 From: Virtuworks Date: Tue, 2 Oct 2012 00:09:02 -0400 Subject: [PATCH] Revert SSL Binding Changes --- .../Code/WebServers/WebServerController.cs | 5 ----- .../WebObjects/WebObjectsModuleService.cs | 14 +------------- 2 files changed, 1 insertion(+), 18 deletions(-) diff --git a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/Code/WebServers/WebServerController.cs b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/Code/WebServers/WebServerController.cs index 109f7aca..2047a356 100644 --- a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/Code/WebServers/WebServerController.cs +++ b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/Code/WebServers/WebServerController.cs @@ -275,7 +275,6 @@ namespace WebsitePanel.EnterpriseServer { // DEDICATED IP bindings.Add(new ServerBinding(ipAddr, "80", "")); - bindings.Add(new ServerBinding(ipAddr, "443", "")); } UserInfo user = PackageController.GetPackageOwner(packageId); @@ -685,10 +684,6 @@ namespace WebsitePanel.EnterpriseServer ServerBinding srvBinding = new ServerBinding(ipAddr, "80", ""); newBindings.Add(srvBinding); - srvBinding = new ServerBinding(ipAddr, "443", ""); - newBindings.Add(srvBinding); - - foreach (ServerBinding b in web.GetSiteBindings(siteItem.SiteId)) { if (!((b.Host == srvBinding.Host) & diff --git a/WebsitePanel/Sources/WebsitePanel.Providers.Web.IIS70/WebObjects/WebObjectsModuleService.cs b/WebsitePanel/Sources/WebsitePanel.Providers.Web.IIS70/WebObjects/WebObjectsModuleService.cs index 185b90f7..d41f99f2 100644 --- a/WebsitePanel/Sources/WebsitePanel.Providers.Web.IIS70/WebObjects/WebObjectsModuleService.cs +++ b/WebsitePanel/Sources/WebsitePanel.Providers.Web.IIS70/WebObjects/WebObjectsModuleService.cs @@ -437,7 +437,7 @@ namespace WebsitePanel.Providers.Web.Iis.WebObjects // lock (((ICollection)iisObject.ChildElements).SyncRoot) { - // remove all "http" and "https" bindings + // remove all "http" bindings int i = 0; while (i < iisObject.Bindings.Count) { @@ -446,11 +446,6 @@ namespace WebsitePanel.Providers.Web.Iis.WebObjects iisObject.Bindings.RemoveAt(i); continue; } - else if (String.Equals(iisObject.Bindings[i].Protocol, Uri.UriSchemeHttps, StringComparison.InvariantCultureIgnoreCase)) - { - iisObject.Bindings.RemoveAt(i); - continue; - } else { i++; @@ -459,17 +454,10 @@ namespace WebsitePanel.Providers.Web.Iis.WebObjects // Create HTTP bindings received foreach (var serverBinding in bindings) - if (serverBinding.Port != "443") { var bindingInformation = String.Format("{0}:{1}:{2}", serverBinding.IP, serverBinding.Port, serverBinding.Host); iisObject.Bindings.Add(bindingInformation, Uri.UriSchemeHttp); } - else - { - var bindingInformation = String.Format("{0}:{1}:{2}", serverBinding.IP, serverBinding.Port, serverBinding.Host); - iisObject.Bindings.Add(bindingInformation, Uri.UriSchemeHttps); - } - } // srvman.CommitChanges();