zydronium/websitepanel
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert SSL Binding Changes

Browse source
This commit is contained in:
Virtuworks 2012-10-02 00:09:02 -04:00
parent 4cb79c25c7
commit 464c53d3ac
2 changed files with 1 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

5
WebsitePanel/Sources/WebsitePanel.EnterpriseServer/Code/WebServers/WebServerController.cs
View file

@ -275,7 +275,6 @@ namespace WebsitePanel.EnterpriseServer
{ {
// DEDICATED IP // DEDICATED IP
bindings.Add(new ServerBinding(ipAddr, "80", "")); bindings.Add(new ServerBinding(ipAddr, "80", ""));
bindings.Add(new ServerBinding(ipAddr, "443", ""));
} }
UserInfo user = PackageController.GetPackageOwner(packageId); UserInfo user = PackageController.GetPackageOwner(packageId);
@ -685,10 +684,6 @@ namespace WebsitePanel.EnterpriseServer
ServerBinding srvBinding = new ServerBinding(ipAddr, "80", ""); ServerBinding srvBinding = new ServerBinding(ipAddr, "80", "");
newBindings.Add(srvBinding); newBindings.Add(srvBinding);
srvBinding = new ServerBinding(ipAddr, "443", "");
newBindings.Add(srvBinding);
foreach (ServerBinding b in web.GetSiteBindings(siteItem.SiteId)) foreach (ServerBinding b in web.GetSiteBindings(siteItem.SiteId))
{ {
if (!((b.Host == srvBinding.Host) & if (!((b.Host == srvBinding.Host) &

14
WebsitePanel/Sources/WebsitePanel.Providers.Web.IIS70/WebObjects/WebObjectsModuleService.cs
View file

@ -437,7 +437,7 @@ namespace WebsitePanel.Providers.Web.Iis.WebObjects
// //
lock (((ICollection)iisObject.ChildElements).SyncRoot) lock (((ICollection)iisObject.ChildElements).SyncRoot)
{ {
// remove all "http" and "https" bindings // remove all "http" bindings
int i = 0; int i = 0;
while (i < iisObject.Bindings.Count) while (i < iisObject.Bindings.Count)
{ {
@ -446,11 +446,6 @@ namespace WebsitePanel.Providers.Web.Iis.WebObjects
iisObject.Bindings.RemoveAt(i); iisObject.Bindings.RemoveAt(i);
continue; continue;
} }
else if (String.Equals(iisObject.Bindings[i].Protocol, Uri.UriSchemeHttps, StringComparison.InvariantCultureIgnoreCase))
{
iisObject.Bindings.RemoveAt(i);
continue;
}
else else
{ {
i++; i++;
@ -459,17 +454,10 @@ namespace WebsitePanel.Providers.Web.Iis.WebObjects
// Create HTTP bindings received // Create HTTP bindings received
foreach (var serverBinding in bindings) foreach (var serverBinding in bindings)
if (serverBinding.Port != "443")
{ {
var bindingInformation = String.Format("{0}:{1}:{2}", serverBinding.IP, serverBinding.Port, serverBinding.Host); var bindingInformation = String.Format("{0}:{1}:{2}", serverBinding.IP, serverBinding.Port, serverBinding.Host);
iisObject.Bindings.Add(bindingInformation, Uri.UriSchemeHttp); 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(); srvman.CommitChanges();