aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2014-11-26 13:20:36 +0100
committerMarc Alexander <admin@m-a-styles.de>2014-11-26 13:20:36 +0100
commit6ac088ea2f17c7a003250511049a725c7e3decae (patch)
tree854c0487125c6209acd26a1cdf0a73bddb085f2e /phpBB/phpbb
parentaa3a46a35f086fa3462c9a7b32da5dbad08aa350 (diff)
parent30f292f5a2b3db5a1feb86790da1a3685b2f5fb3 (diff)
downloadforums-6ac088ea2f17c7a003250511049a725c7e3decae.tar
forums-6ac088ea2f17c7a003250511049a725c7e3decae.tar.gz
forums-6ac088ea2f17c7a003250511049a725c7e3decae.tar.bz2
forums-6ac088ea2f17c7a003250511049a725c7e3decae.tar.xz
forums-6ac088ea2f17c7a003250511049a725c7e3decae.zip
Merge pull request #3075 from Senky/ticket/11613
[ticket/11613] Cookies do not work for netbios domain
Diffstat (limited to 'phpBB/phpbb')
-rw-r--r--phpBB/phpbb/session.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/phpbb/session.php b/phpBB/phpbb/session.php
index dc90d942c3..691d0d5bef 100644
--- a/phpBB/phpbb/session.php
+++ b/phpBB/phpbb/session.php
@@ -1063,7 +1063,7 @@ class session
$name_data = rawurlencode($config['cookie_name'] . '_' . $name) . '=' . rawurlencode($cookiedata);
$expire = gmdate('D, d-M-Y H:i:s \\G\\M\\T', $cookietime);
- $domain = (!$config['cookie_domain'] || $config['cookie_domain'] == 'localhost' || $config['cookie_domain'] == '127.0.0.1') ? '' : '; domain=' . $config['cookie_domain'];
+ $domain = (!$config['cookie_domain'] || $config['cookie_domain'] == '127.0.0.1' || strpos($config['cookie_domain'], '.') === false) ? '' : '; domain=' . $config['cookie_domain'];
header('Set-Cookie: ' . $name_data . (($cookietime) ? '; expires=' . $expire : '') . '; path=' . $config['cookie_path'] . $domain . ((!$config['cookie_secure']) ? '' : '; secure') . ';' . (($httponly) ? ' HttpOnly' : ''), false);
}