From e8d85a1ef5966ba89ea88a6d706a066986e1dceb Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Sat, 9 Jan 2010 22:48:05 -0800 Subject: use nickname, not sitename, in domain for SSL --- classes/Status_network.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/classes/Status_network.php b/classes/Status_network.php index dce3e0b8f..96212c465 100644 --- a/classes/Status_network.php +++ b/classes/Status_network.php @@ -158,8 +158,8 @@ class Status_network extends DB_DataObject 0 != strcasecmp($sn->hostname, $servername)) { $sn->redirectTo('http://'.$sn->hostname.$_SERVER['REQUEST_URI']); } else if (!empty($_SERVER['HTTPS']) && - 0 != strcasecmp($sn->sitename.'.'.$wildcard, $servername)) { - $sn->redirectTo('https://'.$sn->sitename.'.'.$wildcard.$_SERVER['REQUEST_URI']); + 0 != strcasecmp($sn->nickname.'.'.$wildcard, $servername)) { + $sn->redirectTo('https://'.$sn->nickname.'.'.$wildcard.$_SERVER['REQUEST_URI']); } $dbhost = (empty($sn->dbhost)) ? 'localhost' : $sn->dbhost; -- cgit v1.2.3-54-g00ecf From 3d723ed1ed0755a4ad30e1d3388d663f53193295 Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Sat, 9 Jan 2010 22:49:26 -0800 Subject: allow hostname with SSL --- classes/Status_network.php | 1 + 1 file changed, 1 insertion(+) diff --git a/classes/Status_network.php b/classes/Status_network.php index 96212c465..1f0e602cf 100644 --- a/classes/Status_network.php +++ b/classes/Status_network.php @@ -158,6 +158,7 @@ class Status_network extends DB_DataObject 0 != strcasecmp($sn->hostname, $servername)) { $sn->redirectTo('http://'.$sn->hostname.$_SERVER['REQUEST_URI']); } else if (!empty($_SERVER['HTTPS']) && + 0 != strcasecmp($sn->hostname, $servername) && 0 != strcasecmp($sn->nickname.'.'.$wildcard, $servername)) { $sn->redirectTo('https://'.$sn->nickname.'.'.$wildcard.$_SERVER['REQUEST_URI']); } -- cgit v1.2.3-54-g00ecf