From d8a76e9484a04626af7a7c88123d62e1abc9fd7f Mon Sep 17 00:00:00 2001 From: feodor_fitsner Date: Wed, 3 Oct 2012 15:47:43 -0700 Subject: [PATCH 1/4] Fixed "Arithmetic overflow" in VirtualizationServerController.GetSubnetMaskCidr method. --- .../Code/Virtualization/VirtualizationServerController.cs | 2 +- WebsitePanel/Sources/WebsitePanel.EnterpriseServer/Web.config | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/Code/Virtualization/VirtualizationServerController.cs b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/Code/Virtualization/VirtualizationServerController.cs index f8f24345..5f8abb8d 100644 --- a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/Code/Virtualization/VirtualizationServerController.cs +++ b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/Code/Virtualization/VirtualizationServerController.cs @@ -3266,7 +3266,7 @@ namespace WebsitePanel.EnterpriseServer var ip = IPAddress.Parse(subnetMask); if (ip.V4) { int cidr = 32; - long mask = (long)ip.Address; + var mask = ip.Address; while ((mask & 1) == 0 && cidr > 0) { mask >>= 1; cidr -= 1; diff --git a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/Web.config b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/Web.config index b78330c8..4df2c0f1 100644 --- a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/Web.config +++ b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/Web.config @@ -5,11 +5,11 @@ - + - + From 4cc46bcb049004685803e22bb44bac1ca878ea66 Mon Sep 17 00:00:00 2001 From: Virtuworks Date: Wed, 3 Oct 2012 19:45:52 -0400 Subject: [PATCH 2/4] Added tag build-2.0.0.86 for changeset 69969f39b74e From b8c66d2dc873cc55993d93f4fadcfeb2249fd6f6 Mon Sep 17 00:00:00 2001 From: feodor_fitsner Date: Wed, 3 Oct 2012 17:53:07 -0700 Subject: [PATCH 3/4] Hide SSL tab and control --- .../DesktopModules/WebsitePanel/WebSitesEditSite.ascx.cs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/WebSitesEditSite.ascx.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/WebSitesEditSite.ascx.cs index d8621dcf..5a5ba76e 100644 --- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/WebSitesEditSite.ascx.cs +++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/WebSitesEditSite.ascx.cs @@ -276,11 +276,13 @@ namespace WebsitePanel.Portal if (site.IsDedicatedIP) { IsDedicatedIP = true; + WebsitesSSLControl.Visible = true; WebsitesSSLControl.BindWebItem(site); } else { IsDedicatedIP = false; + WebsitesSSLControl.Visible = false; } BindVirtualDirectories(); From 1a8a4a9542c3e9012a34ecaf8deb4d9d8beb63bb Mon Sep 17 00:00:00 2001 From: Virtuworks Date: Wed, 3 Oct 2012 21:06:13 -0400 Subject: [PATCH 4/4] Added tag build-2.0.0.87 for changeset deb8f27f19d4