summaryrefslogtreecommitdiff
path: root/includes
diff options
context:
space:
mode:
authorGreg Roach <fisharebest@gmail.com>2016-02-18 23:07:53 +0000
committerGreg Roach <fisharebest@gmail.com>2016-02-18 23:07:53 +0000
commit854037bae3a6100031f013535e66e0369d95a66a (patch)
treefe2c487307534df37fde1e77f8d2484a0e9c4269 /includes
parente0310b2453f48476041222abbab9d3b5552e9b64 (diff)
parentd660d54f526c74c9b4a54c0e38af46d00ec4473a (diff)
downloadwebtrees-854037bae3a6100031f013535e66e0369d95a66a.tar.gz
webtrees-854037bae3a6100031f013535e66e0369d95a66a.tar.bz2
webtrees-854037bae3a6100031f013535e66e0369d95a66a.zip
Merge pull request #833 from magicsunday/patch-1
Update session.php
Diffstat (limited to 'includes')
-rw-r--r--includes/session.php3
1 files changed, 3 insertions, 0 deletions
diff --git a/includes/session.php b/includes/session.php
index c7a20df38a..644f3ce201 100644
--- a/includes/session.php
+++ b/includes/session.php
@@ -171,6 +171,9 @@ $protocol = Filter::server('HTTP_X_FORWARDED_PROTO', 'https?', $protocol);
// For CLI scripts, use localhost.
$host = Filter::server('SERVER_NAME', null, 'localhost');
+if (empty($host)) {
+ $host = Filter::server('SERVER_ADDR', null, '127.0.0.1');
+}
$port = Filter::server('HTTP_X_FORWARDED_PORT', '80|443', Filter::server('SERVER_PORT', null, '80'));