set the session name to the instance id - which is unique

Conflicts:
	lib/base.php

diff --git a/lib/base.php b/lib/base.php
index 88628452613df53cf7b316792199a5e56bab3242..0b75f6f085ef1b8ba65202febc1cd395ce5decd4 100644 (file)
--- a/lib/base.php
+++ b/lib/base.php
@@ -289,6 +289,9 @@ class OC{
                // prevents javascript from accessing php session cookies
                ini_set('session.cookie_httponly', '1;');
 
+               // set the session name to the instance id - which is unique
+               session_name(OC_Util::getInstanceId());
+
                // (re)-initialize session
                session_start();