From 2d4bac10ae535557c07f389a7a3b84b6f5a7d077 Mon Sep 17 00:00:00 2001
From: robvde <robvde@ROBVDE913.europe.corp.microsoft.com>
Date: Mon, 15 Oct 2012 16:16:59 +0400
Subject: [PATCH] Fixed: Clean up pending certificate request when switching IP
 Mode

---
 .../Code/WebServers/WebServerController.cs            | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/Code/WebServers/WebServerController.cs b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/Code/WebServers/WebServerController.cs
index 4b441ca8..8f5e439e 100644
--- a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/Code/WebServers/WebServerController.cs
+++ b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/Code/WebServers/WebServerController.cs
@@ -682,6 +682,11 @@ namespace WebsitePanel.EnterpriseServer
                     DeleteCertificate(siteItemId, c);
                 }
 
+                certificates = GetPendingCertificates(siteItemId);
+                foreach (SSLCertificate c in certificates)
+                {
+                    DeleteCertificateRequest(siteItemId, c.id);
+                }
                 
                 List<DomainInfo> pointers = GetWebSitePointers(siteItemId);
                 foreach (DomainInfo pointer in pointers)
@@ -790,6 +795,12 @@ namespace WebsitePanel.EnterpriseServer
                     DeleteCertificate(siteItemId, c);
                 }
 
+                certificates = GetPendingCertificates(siteItemId);
+                foreach (SSLCertificate c in certificates)
+                {
+                    DeleteCertificateRequest(siteItemId, c.id);
+                }
+
                 // remove all web site pointers
                 List<DomainInfo> pointers = GetWebSitePointers(siteItemId);
                 foreach (DomainInfo pointer in pointers)