aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2014-05-07 16:31:54 -0700
committerfriendica <info@friendica.com>2014-05-07 16:31:54 -0700
commit1ca8584390fcfcd75f0a66fb458310d059a29f7d (patch)
tree13c7e339588ad7755f603488e706c37288190fed
parent92be2e108180176d4406aa83fc9cee03f0d117e9 (diff)
downloadvolse-hubzilla-1ca8584390fcfcd75f0a66fb458310d059a29f7d.tar.gz
volse-hubzilla-1ca8584390fcfcd75f0a66fb458310d059a29f7d.tar.bz2
volse-hubzilla-1ca8584390fcfcd75f0a66fb458310d059a29f7d.zip
Do our best to provide sane cookie defaults.
-rwxr-xr-xindex.php10
-rw-r--r--version.inc2
2 files changed, 6 insertions, 6 deletions
diff --git a/index.php b/index.php
index 93dbd1a54..6019cecd3 100755
--- a/index.php
+++ b/index.php
@@ -77,11 +77,11 @@ else {
$arr = session_get_cookie_params();
session_set_cookie_params(
- $arr['lifetime'],
- $arr['path'],
- $arr['domain'],
- (($_SERVER['HTTPS']) ? true : false),
- $arr['httponly']);
+ ((isset($arr['lifetime'])) ? $arr['lifetime'] : 60*5),
+ ((isset($arr['path'])) ? $arr['path'] : '/'),
+ ((isset($arr['domain'])) ? $arr['domain'] : $a->get_hostname()),
+ ((isset($_SERVER['HTTPS'])) ? true : false),
+ ((isset($arr['httponly'])) ? $arr['httponly'] : true));
session_start();
/**
diff --git a/version.inc b/version.inc
index fa61ba81a..101a79e18 100644
--- a/version.inc
+++ b/version.inc
@@ -1 +1 @@
-2014-05-06.667
+2014-05-07.668