From dbab36dbd900433e71739f08531cd69edf00d521 Mon Sep 17 00:00:00 2001 From: robvde Date: Mon, 29 Oct 2012 20:55:52 +0400 Subject: [PATCH] fixed hostheader import: subdomain pointer gets assigned to parent instead of subdomain --- .../Code/WebServers/WebServerController.cs | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/Code/WebServers/WebServerController.cs b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/Code/WebServers/WebServerController.cs index 5b29543a..4cc1373f 100644 --- a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/Code/WebServers/WebServerController.cs +++ b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/Code/WebServers/WebServerController.cs @@ -3760,19 +3760,21 @@ Please ensure the space has been allocated {0} IP address as a dedicated one and private static int FindDomainForHeader(string header, List domains) { int domainId = 0; - - while (header.IndexOf(".") != -1) + int counter = 0; + while ((header.IndexOf(".") != -1) & (counter < 2)) { - header = header.Substring(header.IndexOf(".") + 1); foreach (DomainInfo d in domains) { if ((header == d.DomainName.ToLower()) && (!d.IsDomainPointer)) { - domainId = d.DomainId; - break; + return d.DomainId; } } + + header = header.Substring(header.IndexOf(".") + 1); + counter++; + } return domainId;