gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Weblate 2014-01-22 10:21:21 +01:00
commit 0f7dd558d7
2 changed files with 23 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libraries/Config.class.php
View File

@ -753,9 +753,17 @@ class PMA_Config
curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, 5);
curl_setopt($ch, CURLOPT_USERAGENT, 'phpMyAdmin/' . PMA_VERSION);
curl_setopt($ch, CURLOPT_TIMEOUT, 5);
session_write_close();
if (! defined('TESTSUITE')) {
session_write_close();
}
$data = @curl_exec($ch);
session_start();
if (! defined('TESTSUITE')) {
ini_set('session.use_only_cookies', false);
ini_set('session.use_cookies', false);
ini_set('session.use_trans_sid', false);
ini_set('session.cache_limiter', null);
session_start();
}
if ($data === false) {
return null;
}

17
libraries/Util.class.php
View File

@ -4237,7 +4237,9 @@ class PMA_Util
)
);
$context = PMA_Util::handleContext($context);
session_write_close();
if (! defined('TESTSUITE')) {
session_write_close();
}
$response = file_get_contents(
$file,
false,
@ -4261,7 +4263,9 @@ class PMA_Util
CURLOPT_TIMEOUT,
$connection_timeout
);
session_write_close();
if (! defined('TESTSUITE')) {
session_write_close();
}
$response = curl_exec($curl_handle);
}
}
@ -4272,13 +4276,18 @@ class PMA_Util
&& strlen($data->date)
&& $save
) {
session_start();
if (! isset($_SESSION) && ! defined('TESTSUITE')) {
ini_set('session.use_only_cookies', false);
ini_set('session.use_cookies', false);
ini_set('session.use_trans_sid', false);
ini_set('session.cache_limiter', null);
session_start();
}
$_SESSION['cache']['version_check'] = array(
'response' => $response,
'timestamp' => time()
);
}
return $data;
}