diff options
| author | Florian Pritz <bluewind@xinu.at> | 2011-09-24 18:43:02 +0200 |
|---|---|---|
| committer | Florian Pritz <bluewind@xinu.at> | 2011-09-24 18:43:02 +0200 |
| commit | 793e29e1245d079f89505294bef47f01c9111e8b (patch) | |
| tree | 70c66381ebb5221547e881c99dc2b435e26e97e4 /lib/base.php | |
| parent | f65d0e4f80eba0d24ee48f16a22d290fb1f334b3 (diff) | |
| parent | 842ce24d2b17685c27eabdd2d0bb01899efdbc6f (diff) | |
| download | nextcloud-server-793e29e1245d079f89505294bef47f01c9111e8b.tar.gz nextcloud-server-793e29e1245d079f89505294bef47f01c9111e8b.zip | |
Merge branch 'working'
Diffstat (limited to 'lib/base.php')
| -rw-r--r-- | lib/base.php | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/lib/base.php b/lib/base.php index 9b777800764..de2e7a36eee 100644 --- a/lib/base.php +++ b/lib/base.php @@ -80,8 +80,6 @@ class OC{ date_default_timezone_set('Europe/Berlin'); ini_set('arg_separator.output','&'); - ini_set('session.cookie_httponly','1;'); - session_start(); // calculate the documentroot OC::$DOCUMENTROOT=realpath($_SERVER['DOCUMENT_ROOT']); @@ -102,6 +100,7 @@ class OC{ // redirect to https site if configured if( OC_Config::getValue( "forcessl", false )){ + ini_set("session.cookie_secure", "on"); if(!isset($_SERVER['HTTPS']) or $_SERVER['HTTPS'] != 'on') { $url = "https://". $_SERVER['SERVER_NAME'] . $_SERVER['REQUEST_URI']; header("Location: $url"); @@ -109,8 +108,11 @@ class OC{ } } + ini_set('session.cookie_httponly','1;'); + session_start(); + // Add the stuff we need always - OC_Util::addScript( "jquery-1.6.2.min" ); + OC_Util::addScript( "jquery-1.6.4.min" ); OC_Util::addScript( "jquery-ui-1.8.14.custom.min" ); OC_Util::addScript( "jquery-showpassword" ); OC_Util::addScript( "jquery-tipsy" ); |