From 42e4c6e34d9ba18eebf16ef3b0c0af290c3d58d1 Mon Sep 17 00:00:00 2001 From: Florian Schaal <florian@schaal-24.de> Date: Wed, 10 Feb 2016 16:04:30 -0500 Subject: [PATCH] Merge branch 'master' of http://git.ispconfig.org/ispconfig/ispconfig3 --- interface/lib/app.inc.php | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/interface/lib/app.inc.php b/interface/lib/app.inc.php index e23b6ca..f9ef167 100755 --- a/interface/lib/app.inc.php +++ b/interface/lib/app.inc.php @@ -71,6 +71,13 @@ $this->uses('session'); $sess_timeout = $this->conf('interface', 'session_timeout'); $cookie_domain = (isset($_SERVER['SERVER_NAME']) ? $_SERVER['SERVER_NAME'] : $_SERVER['HTTP_HOST']); + + // Workaround for Nginx servers + if($cookie_domain == '_') { + $tmp = explode(':',$_SERVER["HTTP_HOST"]); + $cookie_domain = $tmp[0]; + unset($tmp); + } $cookie_secure = ($_SERVER["HTTPS"] == 'on')?true:false; if($sess_timeout) { /* check if user wants to stay logged in */ -- Gitblit v1.9.1